diff --git a/BMW-Dynatrace-config/CD_tsmb/alerting-profile/alerting-profile.yaml b/BMW-Dynatrace-config/CD_tsmb/alerting-profile/alerting-profile.yaml
index 092aa8ef..394b08ab 100644
--- a/BMW-Dynatrace-config/CD_tsmb/alerting-profile/alerting-profile.yaml
+++ b/BMW-Dynatrace-config/CD_tsmb/alerting-profile/alerting-profile.yaml
@@ -5,19 +5,16 @@ config:
 #Prod alerting profiles for EMEA/NA/CN
 CDtsmb.EMEA-Prod:
 - name: CD_tsmb PROD
-- tag: tsmb
 - mzId: CD_tsmb/management-zone/CDtsmb.id
 - env: PROD
 - skipDeployment: "false"
 CDtsmb.NA-Prod:
 - name: CD_tsmb PROD
-- tag: tsmb
 - mzId: CD_tsmb/management-zone/CDtsmb.id
 - env: PROD
 - skipDeployment: "false"
 CDtsmb.CN-Prod:
 - name: CD_tsmb PROD
-- tag: tsmb
 - mzId: CD_tsmb/management-zone/CDtsmb.id
 - env: PROD
 - skipDeployment: "false"
@@ -25,19 +22,16 @@ CDtsmb.CN-Prod:
 #INT alerting profiles for EMEA/NA/CN
 CDtsmb.EMEA-PreProd:
 - name: CD_tsmb INT
-- tag: tsmb
 - mzId: CD_tsmb/management-zone/CDtsmb.id
 - env: INT
 - skipDeployment: "false"
 CDtsmb.NA-PreProd:
 - name: CD_tsmb INT
-- tag: tsmb
 - mzId: CD_tsmb/management-zone/CDtsmb.id
 - env: INT
 - skipDeployment: "false"
 CDtsmb.CN-PreProd:
 - name: CD_tsmb INT
-- tag: tsmb
 - mzId: CD_tsmb/management-zone/CDtsmb.id
 - env: INT
 - skipDeployment: "false"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsmb/alerting-profile/default.json b/BMW-Dynatrace-config/CD_tsmb/alerting-profile/default.json
index 681a4c64..bb81115c 100644
--- a/BMW-Dynatrace-config/CD_tsmb/alerting-profile/default.json
+++ b/BMW-Dynatrace-config/CD_tsmb/alerting-profile/default.json
@@ -10,11 +10,6 @@
    "tagFilter": {
     "includeMode": "INCLUDE_ALL",
     "tagFilters": [
-     {
-      "context": "CONTEXTLESS",
-      "key": "Component",
-      "value": "{{.tag}}"
-     },
 	 {
       "context": "CONTEXTLESS",
       "key": "Environment",
@@ -29,11 +24,6 @@
    "tagFilter": {
     "includeMode": "INCLUDE_ALL",
     "tagFilters": [
-     {
-      "context": "CONTEXTLESS",
-      "key": "Component",
-      "value": "{{.tag}}"
-     },
 	 {
       "context": "CONTEXTLESS",
       "key": "Environment",
@@ -48,11 +38,6 @@
    "tagFilter": {
     "includeMode": "INCLUDE_ALL",
     "tagFilters": [
-     {
-      "context": "CONTEXTLESS",
-      "key": "Component",
-      "value": "{{.tag}}"
-     },
 	 {
       "context": "CONTEXTLESS",
       "key": "Environment",
@@ -67,11 +52,6 @@
    "tagFilter": {
     "includeMode": "INCLUDE_ALL",
     "tagFilters": [
-     {
-      "context": "CONTEXTLESS",
-      "key": "Component",
-      "value": "{{.tag}}"
-     },
 	 {
       "context": "CONTEXTLESS",
       "key": "Environment",
@@ -86,11 +66,6 @@
    "tagFilter": {
     "includeMode": "INCLUDE_ALL",
     "tagFilters": [
-     {
-      "context": "CONTEXTLESS",
-      "key": "Component",
-      "value": "{{.tag}}"
-     },
 	 {
       "context": "CONTEXTLESS",
       "key": "Environment",
diff --git a/BMW-Dynatrace-config/CD_tsmb/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_tsmb/conditional-naming-processgroup/conditional-naming-processgroup.yaml
index 7f350b36..51c2ca6a 100644
--- a/BMW-Dynatrace-config/CD_tsmb/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ b/BMW-Dynatrace-config/CD_tsmb/conditional-naming-processgroup/conditional-naming-processgroup.yaml
@@ -4,5 +4,4 @@ config:
 CDtsmb:
 - name: MyProcessNamingRule
 - nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: tsmb
 - skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_tsmb/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_tsmb/conditional-naming-service/conditional-naming-service.yaml
index 7f350b36..51c2ca6a 100644
--- a/BMW-Dynatrace-config/CD_tsmb/conditional-naming-service/conditional-naming-service.yaml
+++ b/BMW-Dynatrace-config/CD_tsmb/conditional-naming-service/conditional-naming-service.yaml
@@ -4,5 +4,4 @@ config:
 CDtsmb:
 - name: MyProcessNamingRule
 - nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: tsmb
 - skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_tsmb/dashboard/dashboard.yaml b/BMW-Dynatrace-config/CD_tsmb/dashboard/dashboard.yaml
index 40a06431..a29583ae 100644
--- a/BMW-Dynatrace-config/CD_tsmb/dashboard/dashboard.yaml
+++ b/BMW-Dynatrace-config/CD_tsmb/dashboard/dashboard.yaml
@@ -16,21 +16,18 @@ CDtsmb-PROD.EMEA-Prod:
 - name: CD_tsmb PROD
 - mzName: CD_tsmb/management-zone/CDtsmb.name
 - mzId: CD_tsmb/management-zone/CDtsmb.id
-- tag: tsmb
 - env: PROD
 - skipDeployment: "false"
 CDtsmb-PROD.NA-Prod:
 - name: CD_tsmb PROD
 - mzName: CD_tsmb/management-zone/CDtsmb.name
 - mzId: CD_tsmb/management-zone/CDtsmb.id
-- tag: tsmb
 - env: PROD
 - skipDeployment: "false"
 CDtsmb-PROD.CN-Prod:
 - name: CD_tsmb PROD
 - mzName: CD_tsmb/management-zone/CDtsmb.name
 - mzId: CD_tsmb/management-zone/CDtsmb.id
-- tag: tsmb
 - env: PROD
 - skipDeployment: "false"
 
@@ -39,28 +36,24 @@ CDtsmb-E2E:
 - name: CD_tsmb E2E
 - mzName: CD_tsmb/management-zone/CDtsmb.name
 - mzId: CD_tsmb/management-zone/CDtsmb.id
-- tag: tsmb
 - env: E2E
 - skipDeployment: "true"
 CDtsmb-E2E.EMEA-Prod:
 - name: CD_tsmb E2E
 - mzName: CD_tsmb/management-zone/CDtsmb.name
 - mzId: CD_tsmb/management-zone/CDtsmb.id
-- tag: tsmb
 - env: E2E
 - skipDeployment: "false"
 CDtsmb-E2E.NA-Prod:
 - name: CD_tsmb E2E
 - mzName: CD_tsmb/management-zone/CDtsmb.name
 - mzId: CD_tsmb/management-zone/CDtsmb.id
-- tag: tsmb
 - env: E2E
 - skipDeployment: "false"
 CDtsmb-E2E.CN-Prod:
 - name: CD_tsmb E2E
 - mzName: CD_tsmb/management-zone/CDtsmb.name
 - mzId: CD_tsmb/management-zone/CDtsmb.id
-- tag: tsmb
 - env: E2E
 - skipDeployment: "false"
 
@@ -69,28 +62,24 @@ CDtsmb-INT:
 - name: CD_tsmb INT
 - mzName: CD_tsmb/management-zone/CDtsmb.name
 - mzId: CD_tsmb/management-zone/CDtsmb.id
-- tag: tsmb
 - env: INT
 - skipDeployment: "true"
 CDtsmb-INT.EMEA-PreProd:
 - name: CD_tsmb INT
 - mzName: CD_tsmb/management-zone/CDtsmb.name
 - mzId: CD_tsmb/management-zone/CDtsmb.id
-- tag: tsmb
 - env: INT
 - skipDeployment: "false"
 CDtsmb-INT.NA-PreProd:
 - name: CD_tsmb INT
 - mzName: CD_tsmb/management-zone/CDtsmb.name
 - mzId: CD_tsmb/management-zone/CDtsmb.id
-- tag: tsmb
 - env: INT
 - skipDeployment: "false"
 CDtsmb-INT.CN-PreProd:
 - name: CD_tsmb INT
 - mzName: CD_tsmb/management-zone/CDtsmb.name
 - mzId: CD_tsmb/management-zone/CDtsmb.id
-- tag: tsmb
 - env: INT
 - skipDeployment: "false"
 
@@ -99,27 +88,23 @@ CDtsmb-TEST:
 - name: CD_tsmb TEST
 - mzName: CD_tsmb/management-zone/CDtsmb.name
 - mzId: CD_tsmb/management-zone/CDtsmb.id
-- tag: tsmb
 - env: TEST
 - skipDeployment: "true"
 CDtsmb-TEST.EMEA-PreProd:
 - name: CD_tsmb TEST
 - mzName: CD_tsmb/management-zone/CDtsmb.name
 - mzId: CD_tsmb/management-zone/CDtsmb.id
-- tag: tsmb
 - env: TEST
 - skipDeployment: "false"
 CDtsmb-TEST.NA-PreProd:
 - name: CD_tsmb TEST
 - mzName: CD_tsmb/management-zone/CDtsmb.name
 - mzId: CD_tsmb/management-zone/CDtsmb.id
-- tag: tsmb
 - env: TEST
 - skipDeployment: "false"
 CDtsmb-TEST.CN-PreProd:
 - name: CD_tsmb TEST
 - mzName: CD_tsmb/management-zone/CDtsmb.name
 - mzId: CD_tsmb/management-zone/CDtsmb.id
-- tag: tsmb
 - env: TEST
 - skipDeployment: "false"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsmb/dashboard/default.json b/BMW-Dynatrace-config/CD_tsmb/dashboard/default.json
index 6c685810..189767ed 100644
--- a/BMW-Dynatrace-config/CD_tsmb/dashboard/default.json
+++ b/BMW-Dynatrace-config/CD_tsmb/dashboard/default.json
@@ -13,8 +13,9 @@
       "timeframe": "-24h to now"
     },
     "tags": [
-      "{{.tag}}"
-    ]
+      "{{.mzName}}"
+    ],
+    "preset": true
   },
   "tiles": [
     {
@@ -27,7 +28,12 @@
         "width": 1064,
         "height": 304
       },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
       "filterConfig": {
         "type": "MIXED",
         "customName": "Failure rate (HTTP 4xx/5xx  errors)",
@@ -71,8 +77,7 @@
         "filtersPerEntityType": {
           "SERVICE": {
             "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Environment:{{.env}}"
             ]
           }
         }
@@ -105,7 +110,12 @@
         "width": 1064,
         "height": 38
       },
-      "tileFilter": {}
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      }
     },
     {
       "name": "Markdown",
@@ -130,7 +140,12 @@
         "width": 1064,
         "height": 304
       },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
       "filterConfig": {
         "type": "MIXED",
         "customName": "Response time, Request Count and Number of Errors",
@@ -188,8 +203,7 @@
         "filtersPerEntityType": {
           "SERVICE": {
             "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Environment:{{.env}}"
             ]
           }
         }
@@ -218,7 +232,12 @@
         "width": 190,
         "height": 152
       },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
       "filterConfig": {
         "type": "DATABASE",
         "customName": "Databases",
@@ -232,8 +251,7 @@
         "filtersPerEntityType": {
           "DATABASE": {
             "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Environment:{{.env}}"
             ]
           }
         }
@@ -250,7 +268,12 @@
         "width": 190,
         "height": 152
       },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
       "filterConfig": {
         "type": "SERVICE",
         "customName": "Services",
@@ -264,8 +287,7 @@
         "filtersPerEntityType": {
           "SERVICE": {
             "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Environment:{{.env}}"
             ]
           }
         }
@@ -282,7 +304,12 @@
         "width": 190,
         "height": 152
       },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
       "filterConfig": {
         "type": "HOST",
         "customName": "Hosts",
@@ -296,8 +323,7 @@
         "filtersPerEntityType": {
           "HOST": {
             "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Environment:{{.env}}"
             ]
           }
         }
diff --git a/BMW-Dynatrace-config/CD_tsmb/management-zone/default.json b/BMW-Dynatrace-config/CD_tsmb/management-zone/default.json
index bffa0c3b..fc96de39 100644
--- a/BMW-Dynatrace-config/CD_tsmb/management-zone/default.json
+++ b/BMW-Dynatrace-config/CD_tsmb/management-zone/default.json
@@ -1,114 +1,23 @@
 {
  "dimensionalRules": [],
  "name": "{{.name}}",
- "rules": [
-  {
-   "conditions": [
+ "entitySelectorBasedRules": [
     {
-     "comparisonInfo": {
-      "negate": false,
-      "operator": "EQUALS",
-      "type": "TAG",
-      "value": {
-       "context": "CONTEXTLESS",
-       "key": "Component",
-       "value": "{{.tag}}"
-      }
-     },
-     "key": {
-      "attribute": "SERVICE_TAGS"
-     }
-    }
-   ],
-   "enabled": true,
-   "propagationTypes": [
-    "SERVICE_TO_PROCESS_GROUP_LIKE",
-    "SERVICE_TO_HOST_LIKE"
-   ],
-   "type": "SERVICE"
-  },
-  {
-   "conditions": [
+     "enabled": true,
+     "entitySelector": "type(Service),tag({{.compassIDs}})"
+    },
     {
-     "comparisonInfo": {
-      "negate": false,
-      "operator": "EQUALS",
-      "type": "TAG",
-      "value": {
-       "context": "CONTEXTLESS",
-       "key": "Component",
-       "value": "{{.tag}}"
-      }
-     },
-     "key": {
-      "attribute": "PROCESS_GROUP_TAGS"
-     }
-    }
-   ],
-   "enabled": true,
-   "propagationTypes": [
-    "PROCESS_GROUP_TO_HOST"
-   ],
-   "type": "PROCESS_GROUP"
-  },
-  {
-   "conditions": [
+      "enabled": true,
+      "entitySelector": "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag({{.compassIDs}}))"
+    },
     {
-     "comparisonInfo": {
-      "negate": false,
-      "operator": "EQUALS",
-      "type": "TAG",
-      "value": {
-       "context": "CONTEXTLESS",
-       "key": "Component",
-       "value": "{{.tag}}"
-      }
-     },
-     "key": {
-      "attribute": "HOST_TAGS"
-     }
-    }
+        "enabled": true,
+        "entitySelector": "type(PROCESS_GROUP_INSTANCE),tag({{.compassIDs}})"
+       },
+       {
+        "enabled": true,
+        "entitySelector": "type(HOST),tag({{.compassIDs}})"
+       }
    ],
-   "enabled": true,
-   "type": "HOST"
-  },
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "caseSensitive": true,
-      "negate": false,
-      "operator": "CONTAINS",
-      "type": "STRING",
-      "value": "{{.tag}}"
-     },
-     "key": {
-      "attribute": "CLOUD_APPLICATION_NAMESPACE_NAME"
-     }
-    }
-   ],
-   "enabled": true,
-   "propagationTypes": [],
-   "type": "CLOUD_APPLICATION_NAMESPACE"
-  },
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "caseSensitive": true,
-      "negate": false,
-      "operator": "CONTAINS",
-      "type": "STRING",
-      "value": "{{.tag}}"
-     },
-     "key": {
-      "attribute": "CLOUD_APPLICATION_NAME"
-     }
-    }
-   ],
-   "enabled": true,
-   "propagationTypes": [],
-   "type": "CLOUD_APPLICATION"
-  }
- ]
+ "rules": []
 }
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsmb/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_tsmb/management-zone/management-zone.yaml
index e21ee500..25812540 100644
--- a/BMW-Dynatrace-config/CD_tsmb/management-zone/management-zone.yaml
+++ b/BMW-Dynatrace-config/CD_tsmb/management-zone/management-zone.yaml
@@ -3,4 +3,4 @@ config:
 
 CDtsmb:
 - name: CD_tsmb
-- tag: tsmb
+- compassIDs: \"compass-id:tsmb\"