diff --git a/jenkins_jobs/modules/properties.py b/jenkins_jobs/modules/properties.py
index 96685a5e4..31c2831cf 100644
--- a/jenkins_jobs/modules/properties.py
+++ b/jenkins_jobs/modules/properties.py
@@ -39,6 +39,7 @@ from jenkins_jobs.errors import InvalidAttributeError
 from jenkins_jobs.errors import JenkinsJobsException
 from jenkins_jobs.errors import MissingAttributeError
 import jenkins_jobs.modules.base
+from jenkins_jobs.modules.helpers import convert_mapping_to_xml
 
 
 def builds_chain_fingerprinter(parser, xml_parent, data):
@@ -632,20 +633,28 @@ def delivery_pipeline(parser, xml_parent, data):
     :arg str description: task description template for this job
         (default '')
 
-    Example:
+    Minimal Example:
 
     .. literalinclude::
-        /../../tests/properties/fixtures/delivery-pipeline1.yaml
+       /../../tests/properties/fixtures/delivery-pipeline-minimal.yaml
        :language: yaml
 
+    Full Example:
+
+    .. literalinclude::
+       /../../tests/properties/fixtures/delivery-pipeline-full.yaml
+       :language: yaml
     """
-    pipeline = XML.SubElement(xml_parent,
-                              'se.diabol.jenkins.pipeline.'
-                              'PipelineProperty')
-    XML.SubElement(pipeline, 'stageName').text = data.get('stage', '')
-    XML.SubElement(pipeline, 'taskName').text = data.get('task', '')
-    XML.SubElement(pipeline, 'descriptionTemplate').text = str(
-        data.get('description', ''))
+    pipeline = XML.SubElement(
+        xml_parent, 'se.diabol.jenkins.pipeline.PipelineProperty')
+    pipeline.set('plugin', 'delivery-pipeline-plugin')
+
+    mapping = [
+        ('stage', 'stageName', ''),
+        ('task', 'taskName', ''),
+        ('description', 'descriptionTemplate', ''),
+    ]
+    convert_mapping_to_xml(pipeline, data, mapping, fail_required=True)
 
 
 def zeromq_event(parser, xml_parent, data):
diff --git a/jenkins_jobs/modules/wrappers.py b/jenkins_jobs/modules/wrappers.py
index 53e475053..38fdb0830 100644
--- a/jenkins_jobs/modules/wrappers.py
+++ b/jenkins_jobs/modules/wrappers.py
@@ -1521,18 +1521,27 @@ def delivery_pipeline(parser, xml_parent, data):
     :arg bool set-display-name: Set the generated version as the display name
         for the build (default false)
 
-    Example:
+    Minimal Example:
 
-    .. literalinclude:: /../../tests/wrappers/fixtures/delivery-pipeline1.yaml
+    .. literalinclude::
+       /../../tests/wrappers/fixtures/delivery-pipeline-minimal.yaml
+       :language: yaml
 
+    Full Example:
+
+    .. literalinclude::
+       /../../tests/wrappers/fixtures/delivery-pipeline-full.yaml
+       :language: yaml
     """
-    pvc = XML.SubElement(xml_parent,
-                         'se.diabol.jenkins.pipeline.'
-                         'PipelineVersionContributor')
-    XML.SubElement(pvc, 'versionTemplate').text = data.get(
-        'version-template', '')
-    XML.SubElement(pvc, 'updateDisplayName').text = str(data.get(
-        'set-display-name', False)).lower()
+    pvc = XML.SubElement(
+        xml_parent, 'se.diabol.jenkins.pipeline.PipelineVersionContributor')
+    pvc.set('plugin', 'delivery-pipeline-plugin')
+
+    mapping = [
+        ('version-template', 'versionTemplate', ''),
+        ('set-display-name', 'updateDisplayName', False),
+    ]
+    convert_mapping_to_xml(pvc, data, mapping, fail_required=True)
 
 
 def matrix_tie_parent(parser, xml_parent, data):
diff --git a/tests/properties/fixtures/delivery-pipeline1.xml b/tests/properties/fixtures/delivery-pipeline-full.xml
similarity index 76%
rename from tests/properties/fixtures/delivery-pipeline1.xml
rename to tests/properties/fixtures/delivery-pipeline-full.xml
index c62e23f90..132764e3f 100644
--- a/tests/properties/fixtures/delivery-pipeline1.xml
+++ b/tests/properties/fixtures/delivery-pipeline-full.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project>
   <properties>
-    <se.diabol.jenkins.pipeline.PipelineProperty>
+    <se.diabol.jenkins.pipeline.PipelineProperty plugin="delivery-pipeline-plugin">
       <stageName>Stage</stageName>
       <taskName>Task</taskName>
       <descriptionTemplate>Task-Description</descriptionTemplate>
diff --git a/tests/properties/fixtures/delivery-pipeline1.yaml b/tests/properties/fixtures/delivery-pipeline-full.yaml
similarity index 100%
rename from tests/properties/fixtures/delivery-pipeline1.yaml
rename to tests/properties/fixtures/delivery-pipeline-full.yaml
diff --git a/tests/properties/fixtures/delivery-pipeline2.xml b/tests/properties/fixtures/delivery-pipeline-minimal.xml
similarity index 71%
rename from tests/properties/fixtures/delivery-pipeline2.xml
rename to tests/properties/fixtures/delivery-pipeline-minimal.xml
index f34569ff2..db61340d5 100644
--- a/tests/properties/fixtures/delivery-pipeline2.xml
+++ b/tests/properties/fixtures/delivery-pipeline-minimal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project>
   <properties>
-    <se.diabol.jenkins.pipeline.PipelineProperty>
+    <se.diabol.jenkins.pipeline.PipelineProperty plugin="delivery-pipeline-plugin">
       <stageName/>
       <taskName/>
       <descriptionTemplate/>
diff --git a/tests/properties/fixtures/delivery-pipeline2.yaml b/tests/properties/fixtures/delivery-pipeline-minimal.yaml
similarity index 100%
rename from tests/properties/fixtures/delivery-pipeline2.yaml
rename to tests/properties/fixtures/delivery-pipeline-minimal.yaml
diff --git a/tests/wrappers/fixtures/delivery-pipeline1.xml b/tests/wrappers/fixtures/delivery-pipeline-full.xml
similarity index 74%
rename from tests/wrappers/fixtures/delivery-pipeline1.xml
rename to tests/wrappers/fixtures/delivery-pipeline-full.xml
index 5afab7117..84fa9f227 100644
--- a/tests/wrappers/fixtures/delivery-pipeline1.xml
+++ b/tests/wrappers/fixtures/delivery-pipeline-full.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project>
   <buildWrappers>
-    <se.diabol.jenkins.pipeline.PipelineVersionContributor>
+    <se.diabol.jenkins.pipeline.PipelineVersionContributor plugin="delivery-pipeline-plugin">
       <versionTemplate>1.0.0-${BUILD_NUMBER}</versionTemplate>
       <updateDisplayName>true</updateDisplayName>
     </se.diabol.jenkins.pipeline.PipelineVersionContributor>
diff --git a/tests/wrappers/fixtures/delivery-pipeline1.yaml b/tests/wrappers/fixtures/delivery-pipeline-full.yaml
similarity index 100%
rename from tests/wrappers/fixtures/delivery-pipeline1.yaml
rename to tests/wrappers/fixtures/delivery-pipeline-full.yaml
diff --git a/tests/wrappers/fixtures/delivery-pipeline2.xml b/tests/wrappers/fixtures/delivery-pipeline-minimal.xml
similarity index 71%
rename from tests/wrappers/fixtures/delivery-pipeline2.xml
rename to tests/wrappers/fixtures/delivery-pipeline-minimal.xml
index 8bc3c0dfd..5f5456343 100644
--- a/tests/wrappers/fixtures/delivery-pipeline2.xml
+++ b/tests/wrappers/fixtures/delivery-pipeline-minimal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project>
   <buildWrappers>
-    <se.diabol.jenkins.pipeline.PipelineVersionContributor>
+    <se.diabol.jenkins.pipeline.PipelineVersionContributor plugin="delivery-pipeline-plugin">
       <versionTemplate/>
       <updateDisplayName>false</updateDisplayName>
     </se.diabol.jenkins.pipeline.PipelineVersionContributor>
diff --git a/tests/wrappers/fixtures/delivery-pipeline2.yaml b/tests/wrappers/fixtures/delivery-pipeline-minimal.yaml
similarity index 100%
rename from tests/wrappers/fixtures/delivery-pipeline2.yaml
rename to tests/wrappers/fixtures/delivery-pipeline-minimal.yaml