diff --git a/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeEMEAPROD.json b/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeEMEAPROD.json
index 33b37a0a..c2e479b3 100644
--- a/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeEMEAPROD.json
+++ b/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeEMEAPROD.json
@@ -30,8 +30,8 @@
       },
       "tileFilter": {
         "managementZone": {
-          "id": "-5651984742855815750",
-          "name": "CD_b2v-com-fe"
+          "id": "{{.mzId}}",
+          "name": "{{.name}}"
         }
       }
     },
@@ -97,8 +97,8 @@
         "filtersPerEntityType": {
           "DATABASE": {
             "AUTO_TAGS": [
-              "Component:b2v-com-fe",
-              "Environment:PROD"
+              "Environment:{{.tag}}",
+              "Component:{{.env}}"
             ]
           }
         }
@@ -129,8 +129,8 @@
         "filtersPerEntityType": {
           "SERVICE": {
             "AUTO_TAGS": [
-              "Component:b2v-com-fe",
-              "Environment:PROD"
+              "Environment:{{.tag}}",
+              "Component:{{.env}}"
             ]
           }
         }
@@ -161,8 +161,8 @@
         "filtersPerEntityType": {
           "HOST": {
             "AUTO_TAGS": [
-              "Component:b2v-com-fe",
-              "Environment:PROD"
+              "Environment:{{.tag}}",
+              "Component:{{.env}}"
             ]
           }
         }
@@ -181,8 +181,8 @@
       },
       "tileFilter": {
         "managementZone": {
-          "id": "-5651984742855815750",
-          "name": "CD_b2v-com-fe"
+          "id": "{{.mzId}}",
+          "name": "{{.name}}"
         }
       },
       "customName": "Response time, Request Count and Number of Errors",
@@ -324,8 +324,8 @@
       },
       "tileFilter": {
         "managementZone": {
-          "id": "-5651984742855815750",
-          "name": "CD_b2v-com-fe"
+          "id": "{{.mzId}}",
+          "name": "{{.name}}"
         }
       },
       "customName": "Failure rate (HTTP 4xx/5xx  errors)",