diff --git a/BMW-Dynatrace-config/CD_LSCFSU/dashboard/default.json b/BMW-Dynatrace-config/CD_LSCFSU/dashboard/default.json
index ef07d18c..d0e02c8e 100644
--- a/BMW-Dynatrace-config/CD_LSCFSU/dashboard/default.json
+++ b/BMW-Dynatrace-config/CD_LSCFSU/dashboard/default.json
@@ -28,7 +28,12 @@
         "width": 1064,
         "height": 304
       },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
       "filterConfig": {
         "type": "MIXED",
         "customName": "Failure rate (HTTP 4xx/5xx  errors)",
@@ -72,8 +77,7 @@
         "filtersPerEntityType": {
           "SERVICE": {
             "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Environment:{{.env}}" 
             ]
           }
         }
@@ -118,7 +122,12 @@
         "width": 1064,
         "height": 38
       },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
       "markdown": "---\n"
     },
     {
@@ -131,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",
@@ -189,8 +203,7 @@
         "filtersPerEntityType": {
           "SERVICE": {
             "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Environment:{{.env}}"           
             ]
           }
         }
@@ -206,7 +219,12 @@
         "width": 1064,
         "height": 38
       },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
       "markdown": "---\n"
     },
     {
@@ -219,7 +237,12 @@
         "width": 190,
         "height": 152
       },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
       "filterConfig": {
         "type": "DATABASE",
         "customName": "Databases",
@@ -233,8 +256,7 @@
         "filtersPerEntityType": {
           "DATABASE": {
             "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Environment:{{.env}}"
             ]
           }
         }
@@ -251,7 +273,12 @@
         "width": 190,
         "height": 152
       },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
       "filterConfig": {
         "type": "SERVICE",
         "customName": "Services",
@@ -265,8 +292,7 @@
         "filtersPerEntityType": {
           "SERVICE": {
             "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Environment:{{.env}}"
             ]
           }
         }
@@ -283,7 +309,12 @@
         "width": 190,
         "height": 152
       },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
       "filterConfig": {
         "type": "HOST",
         "customName": "Hosts",
@@ -297,8 +328,7 @@
         "filtersPerEntityType": {
           "HOST": {
             "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Environment:{{.env}}"
             ]
           }
         }
diff --git a/BMW-Dynatrace-config/CD_LSCFSU/management-zone/default.json b/BMW-Dynatrace-config/CD_LSCFSU/management-zone/default.json
index bffa0c3b..1ade3f13 100644
--- a/BMW-Dynatrace-config/CD_LSCFSU/management-zone/default.json
+++ b/BMW-Dynatrace-config/CD_LSCFSU/management-zone/default.json
@@ -1,6 +1,28 @@
 {
  "dimensionalRules": [],
  "name": "{{.name}}",
+ "entitySelectorBasedRules": [
+    {
+     "enabled": true,
+     "entitySelector": "type(Service),tag(\"compass-id:{{.compassid}}\")"
+    },
+    {
+     "enabled": true,
+     "entitySelector": "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:{{.compassid}}\"))"
+    },
+    {
+     "enabled": true,
+     "entitySelector": "type(PROCESS_GROUP),tag(\"compass-id:{{.compassid}}\")"
+    },
+    {
+     "enabled": true,
+     "entitySelector": "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:{{.compassid}}\")"
+    },
+    {
+        "enabled": true,
+        "entitySelector": "type(HOST),tag(\"compass-id:{{.compassid}}\")"
+    }
+],
  "rules": [
   {
    "conditions": [
diff --git a/BMW-Dynatrace-config/CD_LSCFSU/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_LSCFSU/management-zone/management-zone.yaml
index d7cde97a..27bb5bf1 100644
--- a/BMW-Dynatrace-config/CD_LSCFSU/management-zone/management-zone.yaml
+++ b/BMW-Dynatrace-config/CD_LSCFSU/management-zone/management-zone.yaml
@@ -4,3 +4,4 @@ config:
 CDLSCFSU:
 - name: CD_LSCFSU
 - tag: LSCFSU
+- compassid: lscfsu
diff --git a/BMW-Dynatrace-config/CD_TripCollection/dashboard/default.json b/BMW-Dynatrace-config/CD_TripCollection/dashboard/default.json
index ef07d18c..e95d5bf8 100644
--- a/BMW-Dynatrace-config/CD_TripCollection/dashboard/default.json
+++ b/BMW-Dynatrace-config/CD_TripCollection/dashboard/default.json
@@ -28,7 +28,12 @@
         "width": 1064,
         "height": 304
       },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
       "filterConfig": {
         "type": "MIXED",
         "customName": "Failure rate (HTTP 4xx/5xx  errors)",
@@ -72,8 +77,7 @@
         "filtersPerEntityType": {
           "SERVICE": {
             "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Environment:{{.env}}"
             ]
           }
         }
@@ -106,7 +110,12 @@
         "width": 1064,
         "height": 38
       },
-      "tileFilter": {}
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      }
     },
     {
       "name": "Markdown",
@@ -118,7 +127,12 @@
         "width": 1064,
         "height": 38
       },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
       "markdown": "---\n"
     },
     {
@@ -131,7 +145,12 @@
         "width": 1064,
         "height": 304
       },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
       "filterConfig": {
         "type": "MIXED",
         "customName": "Response time, Request Count and Number of Errors",
@@ -189,8 +208,7 @@
         "filtersPerEntityType": {
           "SERVICE": {
             "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Environment:{{.env}}"
             ]
           }
         }
@@ -206,7 +224,12 @@
         "width": 1064,
         "height": 38
       },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
       "markdown": "---\n"
     },
     {
@@ -219,7 +242,12 @@
         "width": 190,
         "height": 152
       },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
       "filterConfig": {
         "type": "DATABASE",
         "customName": "Databases",
@@ -233,8 +261,7 @@
         "filtersPerEntityType": {
           "DATABASE": {
             "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Environment:{{.env}}"
             ]
           }
         }
@@ -251,7 +278,12 @@
         "width": 190,
         "height": 152
       },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
       "filterConfig": {
         "type": "SERVICE",
         "customName": "Services",
@@ -265,8 +297,7 @@
         "filtersPerEntityType": {
           "SERVICE": {
             "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Environment:{{.env}}"
             ]
           }
         }
@@ -283,7 +314,12 @@
         "width": 190,
         "height": 152
       },
-      "tileFilter": {},
+      "tileFilter": {
+        "managementZone": {
+          "id": "{{.mzId}}",
+          "name": "{{.mzName}}"
+        }
+      },
       "filterConfig": {
         "type": "HOST",
         "customName": "Hosts",
@@ -297,8 +333,7 @@
         "filtersPerEntityType": {
           "HOST": {
             "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "Environment:{{.env}}"
             ]
           }
         }
diff --git a/BMW-Dynatrace-config/CD_TripCollection/management-zone/default.json b/BMW-Dynatrace-config/CD_TripCollection/management-zone/default.json
index bffa0c3b..1ade3f13 100644
--- a/BMW-Dynatrace-config/CD_TripCollection/management-zone/default.json
+++ b/BMW-Dynatrace-config/CD_TripCollection/management-zone/default.json
@@ -1,6 +1,28 @@
 {
  "dimensionalRules": [],
  "name": "{{.name}}",
+ "entitySelectorBasedRules": [
+    {
+     "enabled": true,
+     "entitySelector": "type(Service),tag(\"compass-id:{{.compassid}}\")"
+    },
+    {
+     "enabled": true,
+     "entitySelector": "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag(\"compass-id:{{.compassid}}\"))"
+    },
+    {
+     "enabled": true,
+     "entitySelector": "type(PROCESS_GROUP),tag(\"compass-id:{{.compassid}}\")"
+    },
+    {
+     "enabled": true,
+     "entitySelector": "type(PROCESS_GROUP_INSTANCE),tag(\"compass-id:{{.compassid}}\")"
+    },
+    {
+        "enabled": true,
+        "entitySelector": "type(HOST),tag(\"compass-id:{{.compassid}}\")"
+    }
+],
  "rules": [
   {
    "conditions": [
diff --git a/BMW-Dynatrace-config/CD_TripCollection/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_TripCollection/management-zone/management-zone.yaml
index 535fa951..640ab6cf 100644
--- a/BMW-Dynatrace-config/CD_TripCollection/management-zone/management-zone.yaml
+++ b/BMW-Dynatrace-config/CD_TripCollection/management-zone/management-zone.yaml
@@ -4,3 +4,4 @@ config:
 CDTripCollection:
 - name: CD_TripCollection
 - tag: TripCollection
+- compassid: tripCollectionApi