diff --git a/EMEA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf b/EMEA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
index 870c22e..60663eb 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
@@ -2,10 +2,10 @@ resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-CNR\",\"compass-id:AM-CNS\",\"compass-id:AM-ECS\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-Store\",\"compass-id:AM-SVMS\",\"compass-id:AM-SVMS-EventService\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:AM-VMS\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
+    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-CNS\",\"compass-id:AM-ECS\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-Store\",\"compass-id:AM-SVMS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:AM-VMS\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-CESIM\",\"compass-id:AM-Device\",\"compass-id:AM-EGIM\",\"compass-id:AM-MNO-Manager\",\"compass-id:CESIM Proxy\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\",\"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_VehicleDataCollection.tf b/EMEA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
index fbf9304..126c3e4 100644
--- a/EMEA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
+++ b/EMEA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
@@ -12,10 +12,6 @@ resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDDISP\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\",\"compass-id:XFCDAnonymizer\")" 
   }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:IDS-SVDS\",\"compass-id:IDS-Sync\",\"compass-id:IDS-WS\")" 
-  }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:CSU\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJHWO\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollection\",\"compass-id:vdc-vcs\",\"compass-id:VHCJR\",\"compass-id:VHS\",\"compass-id:VJDS\",\"compass-id:VNS\",\"compass-id:VS-API\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
diff --git a/EMEA_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf b/EMEA_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
new file mode 100644
index 0000000..49c4992
--- /dev/null
+++ b/EMEA_PREPROD/PD_management_zone/PD_eSIMandStaticVehicleDataServices.tf
@@ -0,0 +1,11 @@
+resource "dynatrace_management_zone" "PD_eSIMandStaticVehicleDataServices" {
+  name = "PD_eSIMandStaticVehicleDataServices" 
+  entity_selector_based_rule {
+    enabled = true 
+    selector = "type(Service),tag(\"compass-id:IDS Admin\",\"compass-id:IDS-SVDS\",\"compass-id:IDS-Sync\",\"compass-id:IDS-WS\")" 
+  }
+  entity_selector_based_rule {
+    enabled = true 
+    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\")" 
+  }
+}
diff --git a/EMEA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf b/EMEA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
index 870c22e..60663eb 100644
--- a/EMEA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
+++ b/EMEA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
@@ -2,10 +2,10 @@ resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-CNR\",\"compass-id:AM-CNS\",\"compass-id:AM-ECS\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-Store\",\"compass-id:AM-SVMS\",\"compass-id:AM-SVMS-EventService\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:AM-VMS\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
+    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-CNS\",\"compass-id:AM-ECS\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-Store\",\"compass-id:AM-SVMS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:AM-VMS\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-CESIM\",\"compass-id:AM-Device\",\"compass-id:AM-EGIM\",\"compass-id:AM-MNO-Manager\",\"compass-id:CESIM Proxy\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\",\"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_PROD/PD_management_zone/PD_VehicleDataCollection.tf b/EMEA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
index fbf9304..126c3e4 100644
--- a/EMEA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
+++ b/EMEA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
@@ -12,10 +12,6 @@ resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDDISP\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\",\"compass-id:XFCDAnonymizer\")" 
   }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:IDS-SVDS\",\"compass-id:IDS-Sync\",\"compass-id:IDS-WS\")" 
-  }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:CSU\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJHWO\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollection\",\"compass-id:vdc-vcs\",\"compass-id:VHCJR\",\"compass-id:VHS\",\"compass-id:VJDS\",\"compass-id:VNS\",\"compass-id:VS-API\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
diff --git a/NA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf b/NA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
index 870c22e..60663eb 100644
--- a/NA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
+++ b/NA_PREPROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
@@ -2,10 +2,10 @@ resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-CNR\",\"compass-id:AM-CNS\",\"compass-id:AM-ECS\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-Store\",\"compass-id:AM-SVMS\",\"compass-id:AM-SVMS-EventService\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:AM-VMS\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
+    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-CNS\",\"compass-id:AM-ECS\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-Store\",\"compass-id:AM-SVMS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:AM-VMS\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-CESIM\",\"compass-id:AM-Device\",\"compass-id:AM-EGIM\",\"compass-id:AM-MNO-Manager\",\"compass-id:CESIM Proxy\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\",\"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/NA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf b/NA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
index fbf9304..126c3e4 100644
--- a/NA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
+++ b/NA_PREPROD/PD_management_zone/PD_VehicleDataCollection.tf
@@ -12,10 +12,6 @@ resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDDISP\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\",\"compass-id:XFCDAnonymizer\")" 
   }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:IDS-SVDS\",\"compass-id:IDS-Sync\",\"compass-id:IDS-WS\")" 
-  }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:CSU\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJHWO\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollection\",\"compass-id:vdc-vcs\",\"compass-id:VHCJR\",\"compass-id:VHS\",\"compass-id:VJDS\",\"compass-id:VNS\",\"compass-id:VS-API\",\"compass-id:VSFO\",\"compass-id:VSST\")" 
diff --git a/NA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf b/NA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
index 870c22e..60663eb 100644
--- a/NA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
+++ b/NA_PROD/PD_management_zone/PD_AccountManagementConnectedCar.tf
@@ -2,10 +2,10 @@ resource "dynatrace_management_zone" "PD_AccountManagementConnectedCar" {
   name = "PD_AccountManagementConnectedCar" 
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-CNR\",\"compass-id:AM-CNS\",\"compass-id:AM-ECS\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-Store\",\"compass-id:AM-SVMS\",\"compass-id:AM-SVMS-EventService\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:AM-VMS\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
+    selector = "type(Service),tag(\"compass-id:AM-BPM\",\"compass-id:AM-CASA\",\"compass-id:am-cloud\",\"compass-id:AM-CNS\",\"compass-id:AM-ECS\",\"compass-id:AM-LMCS\",\"compass-id:AM-Proxy\",\"compass-id:AM-Store\",\"compass-id:AM-SVMS\",\"compass-id:AM-USAGE\",\"compass-id:AM-VAS\",\"compass-id:AM-Vehicle\",\"compass-id:AM-VMS\",\"compass-id:Countly\",\"compass-id:TAMSArchive\",\"compass-id:TestdataTool\")" 
   }
   entity_selector_based_rule {
     enabled = true 
-    selector = "type(Service),tag(\"compass-id:AM-CESIM\",\"compass-id:AM-Device\",\"compass-id:AM-EGIM\",\"compass-id:AM-MNO-Manager\",\"compass-id:CESIM Proxy\",\"compass-id:MNOMGR-CU-Jasper\",\"compass-id:MNOMGR-CU-SHA\",\"compass-id:MNOMGR-GD\",\"compass-id:MNOMGR-TMSP\",\"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/NA_PROD/PD_management_zone/PD_VehicleDataCollection.tf b/NA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
index fbf9304..126c3e4 100644
--- a/NA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
+++ b/NA_PROD/PD_management_zone/PD_VehicleDataCollection.tf
@@ -12,10 +12,6 @@ resource "dynatrace_management_zone" "PD_VehicleDataCollection" {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CMCS\",\"compass-id:ERDCDC2FCD\",\"compass-id:ERDDISP\",\"compass-id:ERDFCDUDS\",\"compass-id:ERDMGR\",\"compass-id:ERDPROC\",\"compass-id:ERDXFCDFCD\",\"compass-id:XFCD Cockpit\",\"compass-id:XFCD Configuration\",\"compass-id:XFCDAnonymizer\")" 
   }
-  entity_selector_based_rule {
-    enabled = true 
-    selector = "type(Service),tag(\"compass-id:IDS-SVDS\",\"compass-id:IDS-Sync\",\"compass-id:IDS-WS\")" 
-  }
   entity_selector_based_rule {
     enabled = true 
     selector = "type(Service),tag(\"compass-id:CCG\",\"compass-id:CSI\",\"compass-id:CSU\",\"compass-id:LSCFSU\",\"compass-id:LSCHR\",\"compass-id:LSCJHWO\",\"compass-id:LSCJR\",\"compass-id:LSCKC\",\"compass-id:LSCMM\",\"compass-id:LSCOC\",\"compass-id:LSCOG\",\"compass-id:LSCWO\",\"compass-id:tripCollection\",\"compass-id:vdc-vcs\",\"compass-id:VHCJR\",\"compass-id:VHS\",\"compass-id:VJDS\",\"compass-id:VNS\",\"compass-id:VS-API\",\"compass-id:VSFO\",\"compass-id:VSST\")"