diff --git a/BMW-Dynatrace-config/CD_dpm/management-zone/default.json b/BMW-Dynatrace-config/CD_dpm/management-zone/default.json
index bffa0c3b..b29db6c4 100644
--- a/BMW-Dynatrace-config/CD_dpm/management-zone/default.json
+++ b/BMW-Dynatrace-config/CD_dpm/management-zone/default.json
@@ -109,6 +109,114 @@
    "enabled": true,
    "propagationTypes": [],
    "type": "CLOUD_APPLICATION"
-  }
+  },
+  {
+    "conditions": [
+     {
+      "comparisonInfo": {
+       "negate": false,
+       "operator": "EQUALS",
+       "type": "TAG",
+       "value": {
+        "context": "CONTEXTLESS",
+        "key": "Component",
+        "value": "{{.tagUpper}}"
+       }
+      },
+      "key": {
+       "attribute": "SERVICE_TAGS"
+      }
+     }
+    ],
+    "enabled": true,
+    "propagationTypes": [
+     "SERVICE_TO_PROCESS_GROUP_LIKE",
+     "SERVICE_TO_HOST_LIKE"
+    ],
+    "type": "SERVICE"
+   },
+   {
+    "conditions": [
+     {
+      "comparisonInfo": {
+       "negate": false,
+       "operator": "EQUALS",
+       "type": "TAG",
+       "value": {
+        "context": "CONTEXTLESS",
+        "key": "Component",
+        "value": "{{.tagUpper}}"
+       }
+      },
+      "key": {
+       "attribute": "PROCESS_GROUP_TAGS"
+      }
+     }
+    ],
+    "enabled": true,
+    "propagationTypes": [
+     "PROCESS_GROUP_TO_HOST"
+    ],
+    "type": "PROCESS_GROUP"
+   },
+   {
+    "conditions": [
+     {
+      "comparisonInfo": {
+       "negate": false,
+       "operator": "EQUALS",
+       "type": "TAG",
+       "value": {
+        "context": "CONTEXTLESS",
+        "key": "Component",
+        "value": "{{.tagUpper}}"
+       }
+      },
+      "key": {
+       "attribute": "HOST_TAGS"
+      }
+     }
+    ],
+    "enabled": true,
+    "type": "HOST"
+   },
+   {
+    "conditions": [
+     {
+      "comparisonInfo": {
+       "caseSensitive": true,
+       "negate": false,
+       "operator": "CONTAINS",
+       "type": "STRING",
+       "value": "{{.tagUpper}}"
+      },
+      "key": {
+       "attribute": "CLOUD_APPLICATION_NAMESPACE_NAME"
+      }
+     }
+    ],
+    "enabled": true,
+    "propagationTypes": [],
+    "type": "CLOUD_APPLICATION_NAMESPACE"
+   },
+   {
+    "conditions": [
+     {
+      "comparisonInfo": {
+       "caseSensitive": true,
+       "negate": false,
+       "operator": "CONTAINS",
+       "type": "STRING",
+       "value": "{{.tagUpper}}"
+      },
+      "key": {
+       "attribute": "CLOUD_APPLICATION_NAME"
+      }
+     }
+    ],
+    "enabled": true,
+    "propagationTypes": [],
+    "type": "CLOUD_APPLICATION"
+   }
  ]
 }
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dpm/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_dpm/management-zone/management-zone.yaml
index 3bc5fdee..07c7a282 100644
--- a/BMW-Dynatrace-config/CD_dpm/management-zone/management-zone.yaml
+++ b/BMW-Dynatrace-config/CD_dpm/management-zone/management-zone.yaml
@@ -4,3 +4,4 @@ config:
 CDdpm:
 - name: CD_dpm
 - tag: dpm
+- tagUpper: DPM