diff --git a/BMW-Dynatrace-config/CD_VDLM/management-zone/default.json b/BMW-Dynatrace-config/CD_VDLM/management-zone/default.json
index 668f39de..a6c7fd27 100644
--- a/BMW-Dynatrace-config/CD_VDLM/management-zone/default.json
+++ b/BMW-Dynatrace-config/CD_VDLM/management-zone/default.json
@@ -1,128 +1,23 @@
 {
- "dimensionalRules": [],
- "name": "{{.name}}",
- "entitySelectorBasedRules": [
+  "dimensionalRules": [],
+  "name": "{{.name}}",
+  "entitySelectorBasedRules": [
+    {
+      "enabled": true,
+      "entitySelector": "type(Service),tag({{.compassIDs}}),not(entityName.contains(\"HealthResource\")),not(entityName.contains(\"PingResource\")),not(entityName.contains(\"PrometheusResource\"))"
+    },
     {
       "enabled": true,
       "entitySelector": "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag({{.compassIDs}}))"
     },
     {
-        "enabled": true,
-        "entitySelector": "type(PROCESS_GROUP_INSTANCE),tag({{.compassIDs}})"
-       },
-       {
-        "enabled": true,
-        "entitySelector": "type(HOST),tag({{.compassIDs}})"
-       }
-   ],
- "rules": [
-    {
-      "type": "SERVICE",
       "enabled": true,
-      "propagationTypes": [],
-      "conditions": [
-        {
-          "key": {
-            "attribute": "SERVICE_TAGS",
-            "type": "STATIC"
-          },
-          "comparisonInfo": {
-            "type": "TAG",
-            "operator": "EQUALS",
-            "value": {
-              "context": "CONTEXTLESS",
-              "key": "compass-id",
-              "value": "{{.compassIDs}}"
-            },
-            "negate": false
-          }
-        },
-        {
-          "key": {
-            "attribute": "SERVICE_NAME",
-            "type": "STATIC"
-          },
-          "comparisonInfo": {
-            "type": "STRING",
-            "operator": "CONTAINS",
-            "value": "PingResource",
-            "negate": true,
-            "caseSensitive": true
-          }
-        },
-        {
-          "key": {
-            "attribute": "SERVICE_NAME",
-            "type": "STATIC"
-          },
-          "comparisonInfo": {
-            "type": "STRING",
-            "operator": "CONTAINS",
-            "value": "HealthResource",
-            "negate": true,
-            "caseSensitive": true
-          }
-        },
-        {
-          "key": {
-            "attribute": "SERVICE_NAME",
-            "type": "STATIC"
-          },
-          "comparisonInfo": {
-            "type": "STRING",
-            "operator": "CONTAINS",
-            "value": "PrometheusResource",
-            "negate": true,
-            "caseSensitive": true
-          }
-        }
-      ]
+      "entitySelector": "type(PROCESS_GROUP_INSTANCE),tag({{.compassIDs}})"
     },
     {
-      "type": "PROCESS_GROUP",
       "enabled": true,
-      "propagationTypes": [],
-      "conditions": [
-        {
-          "key": {
-            "attribute": "PROCESS_GROUP_TAGS",
-            "type": "STATIC"
-          },
-          "comparisonInfo": {
-            "type": "TAG",
-            "operator": "EQUALS",
-            "value": {
-              "context": "CONTEXTLESS",
-              "key": "compass-id",
-              "value": "{{.compassIDs}}"
-            },
-            "negate": false
-          }
-        }
-      ]
-    },
-    {
-      "type": "HOST",
-      "enabled": true,
-      "propagationTypes": [],
-      "conditions": [
-        {
-          "key": {
-            "attribute": "HOST_TAGS",
-            "type": "STATIC"
-          },
-          "comparisonInfo": {
-            "type": "TAG",
-            "operator": "EQUALS",
-            "value": {
-              "context": "CONTEXTLESS",
-              "key": "compass-id",
-              "value": "{{.compassIDs}}"
-            },
-            "negate": false
-          }
-        }
-      ]
+      "entitySelector": "type(HOST),tag({{.compassIDs}})"
     }
-  ]
-}
\ No newline at end of file
+  ],
+  "rules": []
+}