diff --git a/CN_PREPROD/alerting/cd_vehicle-remote-commands-composite-service_int.tf b/CN_PREPROD/alerting/cd_vehicle-remote-commands-composite-service_int.tf
index ddecbb31..02c05703 100644
--- a/CN_PREPROD/alerting/cd_vehicle-remote-commands-composite-service_int.tf
+++ b/CN_PREPROD/alerting/cd_vehicle-remote-commands-composite-service_int.tf
@@ -8,31 +8,31 @@ resource "dynatrace_alerting" "CD_vehicle-remote-commands-composite-service_INT"
       delay_in_minutes = 0
       include_mode     = "INCLUDE_ALL"
       severity_level   = "AVAILABILITY"
-      tags             = [ "Component:vehicle-remote-commands-composite-service", "Environment:INT" ]
+      tags             = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:INT" ]
     }
     rule {
       delay_in_minutes = 10
       include_mode     = "INCLUDE_ALL"
       severity_level   = "CUSTOM_ALERT"
-      tags             = [ "Component:vehicle-remote-commands-composite-service", "Environment:INT" ]
+      tags             = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:INT" ]
     }
     rule {
       delay_in_minutes = 10
       include_mode     = "INCLUDE_ALL"
       severity_level   = "ERRORS"
-      tags             = [ "Component:vehicle-remote-commands-composite-service", "Environment:INT" ]
+      tags             = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:INT" ]
     }
     rule {
       delay_in_minutes = 30
       include_mode     = "INCLUDE_ALL"
       severity_level   = "PERFORMANCE"
-      tags             = [ "Component:vehicle-remote-commands-composite-service", "Environment:INT" ]
+      tags             = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:INT" ]
     }
     rule {
       delay_in_minutes = 30
       include_mode     = "INCLUDE_ALL"
       severity_level   = "RESOURCE_CONTENTION"
-      tags             = [ "Component:vehicle-remote-commands-composite-service", "Environment:INT" ]
+      tags             = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:INT" ]
     }
   }
 }
\ No newline at end of file
diff --git a/CN_PREPROD/dashboard/cd_vehicle-remote-commands-composite-service_int.tf b/CN_PREPROD/dashboard/cd_vehicle-remote-commands-composite-service_int.tf
index 0d6b24c5..11be6d01 100644
--- a/CN_PREPROD/dashboard/cd_vehicle-remote-commands-composite-service_int.tf
+++ b/CN_PREPROD/dashboard/cd_vehicle-remote-commands-composite-service_int.tf
@@ -64,7 +64,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_INT
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:INT" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:INT" ]
           }
         }
       }
@@ -180,7 +180,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_INT
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:INT" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:INT" ]
           }
         }
       }
@@ -225,7 +225,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_INT
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:INT" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:INT" ]
           }
         }
       }
@@ -255,7 +255,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_INT
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:INT" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:INT" ]
           }
         }
       }
@@ -285,7 +285,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_INT
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:INT" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:INT" ]
           }
         }
       }
diff --git a/CN_PREPROD/dashboard/cd_vehicle-remote-commands-composite-service_test.tf b/CN_PREPROD/dashboard/cd_vehicle-remote-commands-composite-service_test.tf
index 2f42fbf5..149eb20e 100644
--- a/CN_PREPROD/dashboard/cd_vehicle-remote-commands-composite-service_test.tf
+++ b/CN_PREPROD/dashboard/cd_vehicle-remote-commands-composite-service_test.tf
@@ -64,7 +64,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_TES
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:TEST" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:TEST" ]
           }
         }
       }
@@ -180,7 +180,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_TES
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:TEST" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:TEST" ]
           }
         }
       }
@@ -225,7 +225,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_TES
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:TEST" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:TEST" ]
           }
         }
       }
@@ -255,7 +255,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_TES
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:TEST" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:TEST" ]
           }
         }
       }
@@ -285,7 +285,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_TES
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:TEST" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:TEST" ]
           }
         }
       }
diff --git a/CN_PREPROD/management_zone/cd_vehicle-remote-commands-composite-service.tf b/CN_PREPROD/management_zone/cd_vehicle-remote-commands-composite-service.tf
index 51b49066..0bbc646e 100644
--- a/CN_PREPROD/management_zone/cd_vehicle-remote-commands-composite-service.tf
+++ b/CN_PREPROD/management_zone/cd_vehicle-remote-commands-composite-service.tf
@@ -46,7 +46,7 @@ resource "dynatrace_management_zone" "CD_vehicle-remote-commands-composite-servi
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "vehicle-remote-commands-composite-service"
         }
       }
@@ -66,7 +66,7 @@ resource "dynatrace_management_zone" "CD_vehicle-remote-commands-composite-servi
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "vehicle-remote-commands-composite-service"
         }
       }
@@ -86,7 +86,7 @@ resource "dynatrace_management_zone" "CD_vehicle-remote-commands-composite-servi
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "vehicle-remote-commands-composite-service"
         }
       }
diff --git a/CN_PROD/alerting/cd_vehicle-remote-commands-composite-service_e2e.tf b/CN_PROD/alerting/cd_vehicle-remote-commands-composite-service_e2e.tf
index eb35f340..0d8deab4 100644
--- a/CN_PROD/alerting/cd_vehicle-remote-commands-composite-service_e2e.tf
+++ b/CN_PROD/alerting/cd_vehicle-remote-commands-composite-service_e2e.tf
@@ -8,31 +8,31 @@ resource "dynatrace_alerting" "CD_vehicle-remote-commands-composite-service_E2E"
       delay_in_minutes = 0
       include_mode     = "INCLUDE_ALL"
       severity_level   = "AVAILABILITY"
-      tags             = [ "Environment:E2E", "Component:vehicle-remote-commands-composite-service" ]
+      tags             = [ "Environment:E2E", "compass-id:vehicle-remote-commands-composite-service" ]
     }
     rule {
       delay_in_minutes = 10
       include_mode     = "INCLUDE_ALL"
       severity_level   = "CUSTOM_ALERT"
-      tags             = [ "Environment:E2E", "Component:vehicle-remote-commands-composite-service" ]
+      tags             = [ "Environment:E2E", "compass-id:vehicle-remote-commands-composite-service" ]
     }
     rule {
       delay_in_minutes = 10
       include_mode     = "INCLUDE_ALL"
       severity_level   = "ERRORS"
-      tags             = [ "Environment:E2E", "Component:vehicle-remote-commands-composite-service" ]
+      tags             = [ "Environment:E2E", "compass-id:vehicle-remote-commands-composite-service" ]
     }
     rule {
       delay_in_minutes = 30
       include_mode     = "INCLUDE_ALL"
       severity_level   = "PERFORMANCE"
-      tags             = [ "Environment:E2E", "Component:vehicle-remote-commands-composite-service" ]
+      tags             = [ "Environment:E2E", "compass-id:vehicle-remote-commands-composite-service" ]
     }
     rule {
       delay_in_minutes = 30
       include_mode     = "INCLUDE_ALL"
       severity_level   = "RESOURCE_CONTENTION"
-      tags             = [ "Environment:E2E", "Component:vehicle-remote-commands-composite-service" ]
+      tags             = [ "Environment:E2E", "compass-id:vehicle-remote-commands-composite-service" ]
     }
   }
 }
\ No newline at end of file
diff --git a/CN_PROD/alerting/cd_vehicle-remote-commands-composite-service_prod.tf b/CN_PROD/alerting/cd_vehicle-remote-commands-composite-service_prod.tf
index 52c46870..2f5f2057 100644
--- a/CN_PROD/alerting/cd_vehicle-remote-commands-composite-service_prod.tf
+++ b/CN_PROD/alerting/cd_vehicle-remote-commands-composite-service_prod.tf
@@ -8,31 +8,31 @@ resource "dynatrace_alerting" "CD_vehicle-remote-commands-composite-service_PROD
       delay_in_minutes = 0
       include_mode     = "INCLUDE_ALL"
       severity_level   = "AVAILABILITY"
-      tags             = [ "Component:vehicle-remote-commands-composite-service", "Environment:PROD" ]
+      tags             = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:PROD" ]
     }
     rule {
       delay_in_minutes = 10
       include_mode     = "INCLUDE_ALL"
       severity_level   = "CUSTOM_ALERT"
-      tags             = [ "Component:vehicle-remote-commands-composite-service", "Environment:PROD" ]
+      tags             = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:PROD" ]
     }
     rule {
       delay_in_minutes = 10
       include_mode     = "INCLUDE_ALL"
       severity_level   = "ERRORS"
-      tags             = [ "Component:vehicle-remote-commands-composite-service", "Environment:PROD" ]
+      tags             = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:PROD" ]
     }
     rule {
       delay_in_minutes = 30
       include_mode     = "INCLUDE_ALL"
       severity_level   = "PERFORMANCE"
-      tags             = [ "Component:vehicle-remote-commands-composite-service", "Environment:PROD" ]
+      tags             = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:PROD" ]
     }
     rule {
       delay_in_minutes = 30
       include_mode     = "INCLUDE_ALL"
       severity_level   = "RESOURCE_CONTENTION"
-      tags             = [ "Component:vehicle-remote-commands-composite-service", "Environment:PROD" ]
+      tags             = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:PROD" ]
     }
   }
 }
\ No newline at end of file
diff --git a/CN_PROD/dashboard/cd_vehicle-remote-commands-composite-service_prod.tf b/CN_PROD/dashboard/cd_vehicle-remote-commands-composite-service_prod.tf
index 289c9e71..2f167026 100644
--- a/CN_PROD/dashboard/cd_vehicle-remote-commands-composite-service_prod.tf
+++ b/CN_PROD/dashboard/cd_vehicle-remote-commands-composite-service_prod.tf
@@ -64,7 +64,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_PRO
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:PROD" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:PROD" ]
           }
         }
       }
@@ -180,7 +180,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_PRO
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:PROD" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:PROD" ]
           }
         }
       }
@@ -225,7 +225,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_PRO
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:PROD" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:PROD" ]
           }
         }
       }
@@ -255,7 +255,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_PRO
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:PROD" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:PROD" ]
           }
         }
       }
@@ -285,7 +285,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_PRO
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:PROD" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:PROD" ]
           }
         }
       }
diff --git a/CN_PROD/management_zone/cd_vehicle-remote-commands-composite-service.tf b/CN_PROD/management_zone/cd_vehicle-remote-commands-composite-service.tf
index 85bf2040..d0198da0 100644
--- a/CN_PROD/management_zone/cd_vehicle-remote-commands-composite-service.tf
+++ b/CN_PROD/management_zone/cd_vehicle-remote-commands-composite-service.tf
@@ -46,7 +46,7 @@ resource "dynatrace_management_zone" "CD_vehicle-remote-commands-composite-servi
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "vehicle-remote-commands-composite-service"
         }
       }
@@ -66,7 +66,7 @@ resource "dynatrace_management_zone" "CD_vehicle-remote-commands-composite-servi
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "vehicle-remote-commands-composite-service"
         }
       }
@@ -86,7 +86,7 @@ resource "dynatrace_management_zone" "CD_vehicle-remote-commands-composite-servi
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "vehicle-remote-commands-composite-service"
         }
       }
diff --git a/EMEA_PREPROD/management_zone/cd_vehicle-remote-commands-composite-service.tf b/EMEA_PREPROD/management_zone/cd_vehicle-remote-commands-composite-service.tf
index a93b62f6..5333cef7 100644
--- a/EMEA_PREPROD/management_zone/cd_vehicle-remote-commands-composite-service.tf
+++ b/EMEA_PREPROD/management_zone/cd_vehicle-remote-commands-composite-service.tf
@@ -94,7 +94,7 @@ resource "dynatrace_management_zone" "CD_vehicle-remote-commands-composite-servi
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "vehicle-remote-commands-composite-service"
         }
       }
@@ -114,7 +114,7 @@ resource "dynatrace_management_zone" "CD_vehicle-remote-commands-composite-servi
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "vehicle-remote-commands-composite-service"
         }
       }
@@ -134,7 +134,7 @@ resource "dynatrace_management_zone" "CD_vehicle-remote-commands-composite-servi
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "vehicle-remote-commands-composite-service"
         }
       }
diff --git a/EMEA_PROD/dashboard/cd_vehicle-remote-commands-composite-service_e2e.tf b/EMEA_PROD/dashboard/cd_vehicle-remote-commands-composite-service_e2e.tf
index b9c136a1..612d8bb6 100644
--- a/EMEA_PROD/dashboard/cd_vehicle-remote-commands-composite-service_e2e.tf
+++ b/EMEA_PROD/dashboard/cd_vehicle-remote-commands-composite-service_e2e.tf
@@ -70,7 +70,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_E2E
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:vehicle-remote-commands-composite-service" ]
+            values = [ "Environment:E2E", "compass-id:vehicle-remote-commands-composite-service" ]
           }
         }
       }
@@ -198,7 +198,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_E2E
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:vehicle-remote-commands-composite-service" ]
+            values = [ "Environment:E2E", "compass-id:vehicle-remote-commands-composite-service" ]
           }
         }
       }
@@ -249,7 +249,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_E2E
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:vehicle-remote-commands-composite-service" ]
+            values = [ "Environment:E2E", "compass-id:vehicle-remote-commands-composite-service" ]
           }
         }
       }
@@ -282,7 +282,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_E2E
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:vehicle-remote-commands-composite-service" ]
+            values = [ "Environment:E2E", "compass-id:vehicle-remote-commands-composite-service" ]
           }
         }
       }
@@ -315,7 +315,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_E2E
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Environment:E2E", "Component:vehicle-remote-commands-composite-service" ]
+            values = [ "Environment:E2E", "compass-id:vehicle-remote-commands-composite-service" ]
           }
         }
       }
diff --git a/EMEA_PROD/dashboard/cd_vehicle-remote-commands-composite-service_prod.tf b/EMEA_PROD/dashboard/cd_vehicle-remote-commands-composite-service_prod.tf
index df411f2a..ce58c97a 100644
--- a/EMEA_PROD/dashboard/cd_vehicle-remote-commands-composite-service_prod.tf
+++ b/EMEA_PROD/dashboard/cd_vehicle-remote-commands-composite-service_prod.tf
@@ -70,7 +70,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_PRO
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:PROD" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:PROD" ]
           }
         }
       }
@@ -198,7 +198,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_PRO
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:PROD" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:PROD" ]
           }
         }
       }
@@ -249,7 +249,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_PRO
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:PROD" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:PROD" ]
           }
         }
       }
@@ -282,7 +282,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_PRO
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:PROD" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:PROD" ]
           }
         }
       }
@@ -315,7 +315,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_PRO
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:PROD" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:PROD" ]
           }
         }
       }
diff --git a/EMEA_PROD/management_zone/cd_vehicle-remote-commands-composite-service.tf b/EMEA_PROD/management_zone/cd_vehicle-remote-commands-composite-service.tf
index e1c2b51b..38bad902 100644
--- a/EMEA_PROD/management_zone/cd_vehicle-remote-commands-composite-service.tf
+++ b/EMEA_PROD/management_zone/cd_vehicle-remote-commands-composite-service.tf
@@ -46,7 +46,7 @@ resource "dynatrace_management_zone" "CD_vehicle-remote-commands-composite-servi
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "vehicle-remote-commands-composite-service"
         }
       }
@@ -66,7 +66,7 @@ resource "dynatrace_management_zone" "CD_vehicle-remote-commands-composite-servi
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "vehicle-remote-commands-composite-service"
         }
       }
@@ -86,7 +86,7 @@ resource "dynatrace_management_zone" "CD_vehicle-remote-commands-composite-servi
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "vehicle-remote-commands-composite-service"
         }
       }
diff --git a/NA_PREPROD/dashboard/cd_vehicle-remote-commands-composite-service_int.tf b/NA_PREPROD/dashboard/cd_vehicle-remote-commands-composite-service_int.tf
index 41661d7b..29493480 100644
--- a/NA_PREPROD/dashboard/cd_vehicle-remote-commands-composite-service_int.tf
+++ b/NA_PREPROD/dashboard/cd_vehicle-remote-commands-composite-service_int.tf
@@ -67,7 +67,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_INT
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:INT" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:INT" ]
           }
         }
       }
@@ -195,7 +195,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_INT
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:INT" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:INT" ]
           }
         }
       }
@@ -246,7 +246,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_INT
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:INT" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:INT" ]
           }
         }
       }
@@ -279,7 +279,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_INT
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:INT" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:INT" ]
           }
         }
       }
@@ -312,7 +312,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_INT
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:INT" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:INT" ]
           }
         }
       }
diff --git a/NA_PREPROD/dashboard/cd_vehicle-remote-commands-composite-service_test.tf b/NA_PREPROD/dashboard/cd_vehicle-remote-commands-composite-service_test.tf
index 1203961b..5369801d 100644
--- a/NA_PREPROD/dashboard/cd_vehicle-remote-commands-composite-service_test.tf
+++ b/NA_PREPROD/dashboard/cd_vehicle-remote-commands-composite-service_test.tf
@@ -67,7 +67,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_TES
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:TEST" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:TEST" ]
           }
         }
       }
@@ -195,7 +195,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_TES
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:TEST" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:TEST" ]
           }
         }
       }
@@ -246,7 +246,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_TES
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:TEST" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:TEST" ]
           }
         }
       }
@@ -279,7 +279,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_TES
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:TEST" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:TEST" ]
           }
         }
       }
@@ -312,7 +312,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_TES
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:TEST" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:TEST" ]
           }
         }
       }
diff --git a/NA_PREPROD/management_zone/cd_vehicle-remote-commands-composite-service.tf b/NA_PREPROD/management_zone/cd_vehicle-remote-commands-composite-service.tf
index 6af15d58..14936717 100644
--- a/NA_PREPROD/management_zone/cd_vehicle-remote-commands-composite-service.tf
+++ b/NA_PREPROD/management_zone/cd_vehicle-remote-commands-composite-service.tf
@@ -46,7 +46,7 @@ resource "dynatrace_management_zone" "CD_vehicle-remote-commands-composite-servi
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "vehicle-remote-commands-composite-service"
         }
       }
@@ -66,7 +66,7 @@ resource "dynatrace_management_zone" "CD_vehicle-remote-commands-composite-servi
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "vehicle-remote-commands-composite-service"
         }
       }
@@ -86,7 +86,7 @@ resource "dynatrace_management_zone" "CD_vehicle-remote-commands-composite-servi
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "vehicle-remote-commands-composite-service"
         }
       }
diff --git a/NA_PROD/dashboard/cd_vehicle-remote-commands-composite-service_prod.tf b/NA_PROD/dashboard/cd_vehicle-remote-commands-composite-service_prod.tf
index f1a81f24..fc5aa7d5 100644
--- a/NA_PROD/dashboard/cd_vehicle-remote-commands-composite-service_prod.tf
+++ b/NA_PROD/dashboard/cd_vehicle-remote-commands-composite-service_prod.tf
@@ -67,7 +67,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_PRO
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:PROD" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:PROD" ]
           }
         }
       }
@@ -195,7 +195,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_PRO
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:PROD" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:PROD" ]
           }
         }
       }
@@ -246,7 +246,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_PRO
           entity_type = "DATABASE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:PROD" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:PROD" ]
           }
         }
       }
@@ -279,7 +279,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_PRO
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:PROD" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:PROD" ]
           }
         }
       }
@@ -312,7 +312,7 @@ resource "dynatrace_dashboard" "CD_vehicle-remote-commands-composite-service_PRO
           entity_type = "HOST"
           match {
             key    = "AUTO_TAGS"
-            values = [ "Component:vehicle-remote-commands-composite-service", "Environment:PROD" ]
+            values = [ "compass-id:vehicle-remote-commands-composite-service", "Environment:PROD" ]
           }
         }
       }
diff --git a/NA_PROD/management_zone/cd_vehicle-remote-commands-composite-service.tf b/NA_PROD/management_zone/cd_vehicle-remote-commands-composite-service.tf
index 20d10da6..711bb80b 100644
--- a/NA_PROD/management_zone/cd_vehicle-remote-commands-composite-service.tf
+++ b/NA_PROD/management_zone/cd_vehicle-remote-commands-composite-service.tf
@@ -46,7 +46,7 @@ resource "dynatrace_management_zone" "CD_vehicle-remote-commands-composite-servi
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "vehicle-remote-commands-composite-service"
         }
       }
@@ -66,7 +66,7 @@ resource "dynatrace_management_zone" "CD_vehicle-remote-commands-composite-servi
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "vehicle-remote-commands-composite-service"
         }
       }
@@ -86,7 +86,7 @@ resource "dynatrace_management_zone" "CD_vehicle-remote-commands-composite-servi
         operator = "EQUALS"
         value {
           context = "CONTEXTLESS"
-          key     = "Component"
+          key     = "compass-id"
           value   = "vehicle-remote-commands-composite-service"
         }
       }