diff --git a/EMEA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf b/EMEA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
index f9f685f..60663eb 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
@@ -6,6 +6,6 @@ resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-CESIM\",\"compass-id:AM-Device\",\"compass-id:AM-EGIM\",\"compass-id:CESIM Proxy\",\"compass-id:AM-LPS\", \"compass-id:AM-TACS\", \"compass-id:AM-UI\", \"compass-id:rsu-adapter\")" 
+    selector = "type(Service),tag(\"compass-id:AM-LPS\", \"compass-id:AM-TACS\", \"compass-id:AM-UI\", \"compass-id:rsu-adapter\")" 
   }
 }
diff --git a/EMEA_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf b/EMEA_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
index 7d8d0fd..49c4992 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
@@ -6,6 +6,6 @@ resource "dynatrace_management_zone" "PD_eSIMandStaticVehicleDataServices" {
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:MNO-Manager\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
+    selector = "type(Service),tag(\"compass-id:AM-Device\",\"compass-id:CESIM\",\"compass-id:AM-CESIM\",\"compass-id:CESIM Proxy\",\"compass-id:CESIM-TP\",\"compass-id:CESIM-UI\",\"compass-id:EGIM\",\"compass-id:AM-EGIM\",\"compass-id:ESIM-UI\",\"compass-id:MNO-Manager\",\"compass-id:AM-MNO-MANAGER\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\")" 
   }
 }