diff --git a/BMW-Dynatrace-config/CD_comfy/management-zone/default.json b/BMW-Dynatrace-config/CD_comfy/management-zone/default.json
index f4281407..dfb0016f 100644
--- a/BMW-Dynatrace-config/CD_comfy/management-zone/default.json
+++ b/BMW-Dynatrace-config/CD_comfy/management-zone/default.json
@@ -11,8 +11,8 @@
       "type": "TAG",
       "value": {
        "context": "CONTEXTLESS",
-       "key": "Namespace",
-       "value": "{{.tag}}"
+       "key": "app-id",
+       "value": "{{.appId}}"
       }
      },
      "key": {
@@ -36,8 +36,8 @@
       "type": "TAG",
       "value": {
        "context": "CONTEXTLESS",
-       "key": "Namespace",
-       "value": "{{.tag}}"
+       "key": "app-id",
+       "value": "{{.appId}}"
       }
      },
      "key": {
@@ -51,27 +51,6 @@
    ],
    "type": "PROCESS_GROUP"
   },
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "negate": false,
-      "operator": "EQUALS",
-      "type": "TAG",
-      "value": {
-       "context": "CONTEXTLESS",
-       "key": "Namespace",
-       "value": "{{.tag}}"
-      }
-     },
-     "key": {
-      "attribute": "HOST_TAGS"
-     }
-    }
-   ],
-   "enabled": true,
-   "type": "HOST"
-  },
   {
    "conditions": [
     {
diff --git a/BMW-Dynatrace-config/CD_comfy/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_comfy/management-zone/management-zone.yaml
index 4a54d554..ed51d968 100644
--- a/BMW-Dynatrace-config/CD_comfy/management-zone/management-zone.yaml
+++ b/BMW-Dynatrace-config/CD_comfy/management-zone/management-zone.yaml
@@ -4,3 +4,4 @@ config:
 CDcomfy:
 - name: CD_comfy
 - tag: comfy
+- appId: APP-29681
\ No newline at end of file