diff --git a/EMEA_PROD/dashboard/cd_am-svms_e2e.tf b/EMEA_PROD/dashboard/cd_am-svms_e2e.tf
index f14c8c96..76090c8b 100644
--- a/EMEA_PROD/dashboard/cd_am-svms_e2e.tf
+++ b/EMEA_PROD/dashboard/cd_am-svms_e2e.tf
@@ -70,7 +70,7 @@ resource "dynatrace_dashboard" "CD_am-svms_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "app-name:svms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -198,7 +198,7 @@ resource "dynatrace_dashboard" "CD_am-svms_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "app-name:svms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -251,10 +251,6 @@ resource "dynatrace_dashboard" "CD_am-svms_E2E" {
             key    = "AUTO_TAGS"
             values = [ "Environment:E2E" ]
           }
-          match {
-            key    = "NAME"
-            values = [ "svms" ]
-          }
         }
       }
     }
@@ -286,7 +282,7 @@ resource "dynatrace_dashboard" "CD_am-svms_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "app-name:svms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -319,10 +315,10 @@ resource "dynatrace_dashboard" "CD_am-svms_E2E" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Namespace:svms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/EMEA_PROD/dashboard/cd_am-svms_prod.tf b/EMEA_PROD/dashboard/cd_am-svms_prod.tf
index db0ada42..a1122567 100644
--- a/EMEA_PROD/dashboard/cd_am-svms_prod.tf
+++ b/EMEA_PROD/dashboard/cd_am-svms_prod.tf
@@ -70,7 +70,7 @@ resource "dynatrace_dashboard" "CD_am-svms_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-svms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -198,7 +198,7 @@ resource "dynatrace_dashboard" "CD_am-svms_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-svms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -249,7 +249,7 @@ resource "dynatrace_dashboard" "CD_am-svms_PROD" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-svms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -282,7 +282,7 @@ resource "dynatrace_dashboard" "CD_am-svms_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-svms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -315,10 +315,10 @@ resource "dynatrace_dashboard" "CD_am-svms_PROD" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-svms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/NA_PROD/dashboard/cd_am-svms_e2e.tf b/NA_PROD/dashboard/cd_am-svms_e2e.tf
index 6d3bf120..4f2bf404 100644
--- a/NA_PROD/dashboard/cd_am-svms_e2e.tf
+++ b/NA_PROD/dashboard/cd_am-svms_e2e.tf
@@ -70,7 +70,7 @@ resource "dynatrace_dashboard" "CD_am-svms_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "app-name:svms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -198,7 +198,7 @@ resource "dynatrace_dashboard" "CD_am-svms_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "app-name:svms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -251,10 +251,6 @@ resource "dynatrace_dashboard" "CD_am-svms_E2E" {
             key    = "AUTO_TAGS"
             values = [ "Environment:E2E" ]
           }
-          match {
-            key    = "NAME"
-            values = [ "svms" ]
-          }
         }
       }
     }
@@ -286,7 +282,7 @@ resource "dynatrace_dashboard" "CD_am-svms_E2E" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "app-name:svms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
@@ -319,10 +315,10 @@ resource "dynatrace_dashboard" "CD_am-svms_E2E" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Namespace:svms" ]
+            values = [ "Environment:E2E" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/NA_PROD/dashboard/cd_am-svms_prod.tf b/NA_PROD/dashboard/cd_am-svms_prod.tf
index bc9b9d3c..b750494c 100644
--- a/NA_PROD/dashboard/cd_am-svms_prod.tf
+++ b/NA_PROD/dashboard/cd_am-svms_prod.tf
@@ -70,7 +70,7 @@ resource "dynatrace_dashboard" "CD_am-svms_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-svms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -198,7 +198,7 @@ resource "dynatrace_dashboard" "CD_am-svms_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-svms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -249,7 +249,7 @@ resource "dynatrace_dashboard" "CD_am-svms_PROD" {
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-svms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -282,7 +282,7 @@ resource "dynatrace_dashboard" "CD_am-svms_PROD" {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-svms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
@@ -315,10 +315,10 @@ resource "dynatrace_dashboard" "CD_am-svms_PROD" {
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:am-svms", "Environment:PROD" ]
+            values = [ "Environment:PROD" ]
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}