diff --git a/BMW-Dynatrace-config/CD_wus/dashboard/dashboard.yaml b/BMW-Dynatrace-config/CD_wus/dashboard/dashboard.yaml
index 22c0ddab..1790a198 100644
--- a/BMW-Dynatrace-config/CD_wus/dashboard/dashboard.yaml
+++ b/BMW-Dynatrace-config/CD_wus/dashboard/dashboard.yaml
@@ -11,6 +11,7 @@ CDwus-PROD:
 - mzId: CD_wus/management-zone/CDwus.id
 - tag: wus
 - env: PROD
+- msid: WUS
 - skipDeployment: "true"
 CDwus-PROD.EMEA-Prod:
 - name: CD_wus PROD
@@ -18,6 +19,7 @@ CDwus-PROD.EMEA-Prod:
 - mzId: CD_wus/management-zone/CDwus.id
 - tag: wus
 - env: PROD
+- msid: WUS
 - skipDeployment: "false"
 CDwus-PROD.NA-Prod:
 - name: CD_wus PROD
@@ -25,6 +27,7 @@ CDwus-PROD.NA-Prod:
 - mzId: CD_wus/management-zone/CDwus.id
 - tag: wus
 - env: PROD
+- msid: WUS
 - skipDeployment: "false"
 CDwus-PROD.CN-Prod:
 - name: CD_wus PROD
@@ -32,6 +35,7 @@ CDwus-PROD.CN-Prod:
 - mzId: CD_wus/management-zone/CDwus.id
 - tag: wus
 - env: PROD
+- msid: WUS
 - skipDeployment: "false"
 
 #E2E dashboards for EMEA/NA/CN Prod
@@ -41,6 +45,7 @@ CDwus-E2E:
 - mzId: CD_wus/management-zone/CDwus.id
 - tag: wus
 - env: E2E
+- msid: WUS
 - skipDeployment: "true"
 CDwus-E2E.EMEA-Prod:
 - name: CD_wus E2E
@@ -48,6 +53,7 @@ CDwus-E2E.EMEA-Prod:
 - mzId: CD_wus/management-zone/CDwus.id
 - tag: wus
 - env: E2E
+- msid: WUS
 - skipDeployment: "false"
 CDwus-E2E.NA-Prod:
 - name: CD_wus E2E
@@ -55,6 +61,7 @@ CDwus-E2E.NA-Prod:
 - mzId: CD_wus/management-zone/CDwus.id
 - tag: wus
 - env: E2E
+- msid: WUS
 - skipDeployment: "false"
 CDwus-E2E.CN-Prod:
 - name: CD_wus E2E
@@ -62,6 +69,7 @@ CDwus-E2E.CN-Prod:
 - mzId: CD_wus/management-zone/CDwus.id
 - tag: wus
 - env: E2E
+- msid: WUS
 - skipDeployment: "false"
 
 #INT dashboards for EMEA/NA/CN PreProd
@@ -71,6 +79,7 @@ CDwus-INT:
 - mzId: CD_wus/management-zone/CDwus.id
 - tag: wus
 - env: INT
+- msid: WUS
 - skipDeployment: "true"
 CDwus-INT.EMEA-PreProd:
 - name: CD_wus INT
@@ -78,6 +87,7 @@ CDwus-INT.EMEA-PreProd:
 - mzId: CD_wus/management-zone/CDwus.id
 - tag: wus
 - env: INT
+- msid: WUS
 - skipDeployment: "false"
 CDwus-INT.NA-PreProd:
 - name: CD_wus INT
@@ -85,6 +95,7 @@ CDwus-INT.NA-PreProd:
 - mzId: CD_wus/management-zone/CDwus.id
 - tag: wus
 - env: INT
+- msid: WUS
 - skipDeployment: "false"
 CDwus-INT.CN-PreProd:
 - name: CD_wus INT
@@ -92,6 +103,7 @@ CDwus-INT.CN-PreProd:
 - mzId: CD_wus/management-zone/CDwus.id
 - tag: wus
 - env: INT
+- msid: WUS
 - skipDeployment: "false"
 
 #TEST dashboards for EMEA/NA/CN PreProd
@@ -101,6 +113,7 @@ CDwus-TEST:
 - mzId: CD_wus/management-zone/CDwus.id
 - tag: wus
 - env: TEST
+- msid: WUS
 - skipDeployment: "true"
 CDwus-TEST.EMEA-PreProd:
 - name: CD_wus TEST
@@ -108,6 +121,7 @@ CDwus-TEST.EMEA-PreProd:
 - mzId: CD_wus/management-zone/CDwus.id
 - tag: wus
 - env: TEST
+- msid: WUS
 - skipDeployment: "false"
 CDwus-TEST.NA-PreProd:
 - name: CD_wus TEST
@@ -115,6 +129,7 @@ CDwus-TEST.NA-PreProd:
 - mzId: CD_wus/management-zone/CDwus.id
 - tag: wus
 - env: TEST
+- msid: WUS
 - skipDeployment: "false"
 CDwus-TEST.CN-PreProd:
 - name: CD_wus TEST
@@ -122,4 +137,5 @@ CDwus-TEST.CN-PreProd:
 - mzId: CD_wus/management-zone/CDwus.id
 - tag: wus
 - env: TEST
+- msid: WUS
 - skipDeployment: "false"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_wus/dashboard/default.json b/BMW-Dynatrace-config/CD_wus/dashboard/default.json
index 6c685810..8121b678 100644
--- a/BMW-Dynatrace-config/CD_wus/dashboard/default.json
+++ b/BMW-Dynatrace-config/CD_wus/dashboard/default.json
@@ -14,7 +14,8 @@
     },
     "tags": [
       "{{.tag}}"
-    ]
+    ],
+    "preset": true
   },
   "tiles": [
     {
@@ -72,7 +73,7 @@
           "SERVICE": {
             "AUTO_TAGS": [
               "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "ms-id:{{.msid}}"
             ]
           }
         }
@@ -189,7 +190,7 @@
           "SERVICE": {
             "AUTO_TAGS": [
               "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "ms-id:{{.msid}}"
             ]
           }
         }
@@ -233,7 +234,7 @@
           "DATABASE": {
             "AUTO_TAGS": [
               "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "ms-id:{{.msid}}"
             ]
           }
         }
@@ -265,7 +266,7 @@
           "SERVICE": {
             "AUTO_TAGS": [
               "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "ms-id:{{.msid}}"
             ]
           }
         }
@@ -297,7 +298,7 @@
           "HOST": {
             "AUTO_TAGS": [
               "Environment:{{.env}}",
-              "Component:{{.tag}}"
+              "ms-id:{{.msid}}"
             ]
           }
         }