diff --git a/BMW-Dynatrace-config/CD_MSGSVC/management-zone/default.json b/BMW-Dynatrace-config/CD_MSGSVC/management-zone/default.json
index fc96de39..6c7b3c41 100644
--- a/BMW-Dynatrace-config/CD_MSGSVC/management-zone/default.json
+++ b/BMW-Dynatrace-config/CD_MSGSVC/management-zone/default.json
@@ -11,13 +11,29 @@
       "entitySelector": "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag({{.compassIDs}}))"
     },
     {
-        "enabled": true,
-        "entitySelector": "type(PROCESS_GROUP_INSTANCE),tag({{.compassIDs}})"
-       },
-       {
-        "enabled": true,
-        "entitySelector": "type(HOST),tag({{.compassIDs}})"
-       }
+      "enabled": true,
+      "entitySelector": "type(PROCESS_GROUP_INSTANCE),tag({{.compassIDs}})"
+    },
+    {
+      "enabled": true,
+      "entitySelector": "type(HOST),tag({{.compassIDs}})"
+    },
+    {
+      "enabled": true,
+      "entitySelector": "type(Service),tag({{.appIDs}})"
+    },
+    {
+      "enabled": true,
+      "entitySelector": "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag({{.appIDs}}))"
+    },
+    {
+      "enabled": true,
+      "entitySelector": "type(PROCESS_GROUP_INSTANCE),tag({{.appIDs}})"
+    },
+    {
+      "enabled": true,
+      "entitySelector": "type(HOST),tag({{.appIDs}})"
+    }
    ],
  "rules": []
 }
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_MSGSVC/management-zone/management-zone.yaml
index 3c737c2e..47383f01 100644
--- a/BMW-Dynatrace-config/CD_MSGSVC/management-zone/management-zone.yaml
+++ b/BMW-Dynatrace-config/CD_MSGSVC/management-zone/management-zone.yaml
@@ -3,4 +3,5 @@ config:
 
 CDnewComponentTag:
 - name: CD_MSGSVC
-- compassIDs: \"compass-id:msgsvc\"
+- compassIDs: \"compass-id:msgsvc\",\"compass-id:msgsvc-vcs\"
+- appIDs: \"app-id:APP-18544\"
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/alerting-profile/alerting-profile.yaml b/BMW-Dynatrace-config/CD_MSGSVC_old/alerting-profile/alerting-profile.yaml
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/alerting-profile/alerting-profile.yaml
rename to BMW-Dynatrace-config/CD_MSGSVC_old/alerting-profile/alerting-profile.yaml
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/alerting-profile/default.json b/BMW-Dynatrace-config/CD_MSGSVC_old/alerting-profile/default.json
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/alerting-profile/default.json
rename to BMW-Dynatrace-config/CD_MSGSVC_old/alerting-profile/default.json
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/calculated-metrics-service/README.md b/BMW-Dynatrace-config/CD_MSGSVC_old/calculated-metrics-service/README.md
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/calculated-metrics-service/README.md
rename to BMW-Dynatrace-config/CD_MSGSVC_old/calculated-metrics-service/README.md
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_MSGSVC_old/conditional-naming-processgroup/README.md
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/conditional-naming-processgroup/README.md
rename to BMW-Dynatrace-config/CD_MSGSVC_old/conditional-naming-processgroup/README.md
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_MSGSVC_old/conditional-naming-processgroup/conditional-naming-processgroup.yaml
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/conditional-naming-processgroup/conditional-naming-processgroup.yaml
rename to BMW-Dynatrace-config/CD_MSGSVC_old/conditional-naming-processgroup/conditional-naming-processgroup.yaml
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_MSGSVC_old/conditional-naming-processgroup/template.json
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/conditional-naming-processgroup/template.json
rename to BMW-Dynatrace-config/CD_MSGSVC_old/conditional-naming-processgroup/template.json
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_MSGSVC_old/conditional-naming-service/README.md
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/conditional-naming-service/README.md
rename to BMW-Dynatrace-config/CD_MSGSVC_old/conditional-naming-service/README.md
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_MSGSVC_old/conditional-naming-service/conditional-naming-service.yaml
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/conditional-naming-service/conditional-naming-service.yaml
rename to BMW-Dynatrace-config/CD_MSGSVC_old/conditional-naming-service/conditional-naming-service.yaml
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_MSGSVC_old/conditional-naming-service/template.json
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/conditional-naming-service/template.json
rename to BMW-Dynatrace-config/CD_MSGSVC_old/conditional-naming-service/template.json
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/custom-service-java/README.md b/BMW-Dynatrace-config/CD_MSGSVC_old/custom-service-java/README.md
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/custom-service-java/README.md
rename to BMW-Dynatrace-config/CD_MSGSVC_old/custom-service-java/README.md
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_MSGSVC_old/custom-service-java/custom-service-java.yaml
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/custom-service-java/custom-service-java.yaml
rename to BMW-Dynatrace-config/CD_MSGSVC_old/custom-service-java/custom-service-java.yaml
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_MSGSVC_old/custom-service-java/template-1-1.json
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/custom-service-java/template-1-1.json
rename to BMW-Dynatrace-config/CD_MSGSVC_old/custom-service-java/template-1-1.json
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/dashboard/README.md b/BMW-Dynatrace-config/CD_MSGSVC_old/dashboard/README.md
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/dashboard/README.md
rename to BMW-Dynatrace-config/CD_MSGSVC_old/dashboard/README.md
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/dashboard/dashboard.yaml b/BMW-Dynatrace-config/CD_MSGSVC_old/dashboard/dashboard.yaml
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/dashboard/dashboard.yaml
rename to BMW-Dynatrace-config/CD_MSGSVC_old/dashboard/dashboard.yaml
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/dashboard/default.json b/BMW-Dynatrace-config/CD_MSGSVC_old/dashboard/default.json
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/dashboard/default.json
rename to BMW-Dynatrace-config/CD_MSGSVC_old/dashboard/default.json
diff --git a/BMW-Dynatrace-config/CD_MSGSVC_old/management-zone/README.md b/BMW-Dynatrace-config/CD_MSGSVC_old/management-zone/README.md
new file mode 100644
index 00000000..ffe9d6e3
--- /dev/null
+++ b/BMW-Dynatrace-config/CD_MSGSVC_old/management-zone/README.md
@@ -0,0 +1,4 @@
+
+### How to configure management zones?
+
+Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Management+Zones) page to configure your management zones.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_MSGSVC_old/management-zone/default.json b/BMW-Dynatrace-config/CD_MSGSVC_old/management-zone/default.json
new file mode 100644
index 00000000..fc96de39
--- /dev/null
+++ b/BMW-Dynatrace-config/CD_MSGSVC_old/management-zone/default.json
@@ -0,0 +1,23 @@
+{
+ "dimensionalRules": [],
+ "name": "{{.name}}",
+ "entitySelectorBasedRules": [
+    {
+     "enabled": true,
+     "entitySelector": "type(Service),tag({{.compassIDs}})"
+    },
+    {
+      "enabled": true,
+      "entitySelector": "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag({{.compassIDs}}))"
+    },
+    {
+        "enabled": true,
+        "entitySelector": "type(PROCESS_GROUP_INSTANCE),tag({{.compassIDs}})"
+       },
+       {
+        "enabled": true,
+        "entitySelector": "type(HOST),tag({{.compassIDs}})"
+       }
+   ],
+ "rules": []
+}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_MSGSVC_old/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_MSGSVC_old/management-zone/management-zone.yaml
new file mode 100644
index 00000000..3c737c2e
--- /dev/null
+++ b/BMW-Dynatrace-config/CD_MSGSVC_old/management-zone/management-zone.yaml
@@ -0,0 +1,6 @@
+config:
+- CDnewComponentTag: default.json
+
+CDnewComponentTag:
+- name: CD_MSGSVC
+- compassIDs: \"compass-id:msgsvc\"
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/notification/README.md b/BMW-Dynatrace-config/CD_MSGSVC_old/notification/README.md
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/notification/README.md
rename to BMW-Dynatrace-config/CD_MSGSVC_old/notification/README.md
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/notification/email.json b/BMW-Dynatrace-config/CD_MSGSVC_old/notification/email.json
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/notification/email.json
rename to BMW-Dynatrace-config/CD_MSGSVC_old/notification/email.json
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/notification/itsm.json b/BMW-Dynatrace-config/CD_MSGSVC_old/notification/itsm.json
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/notification/itsm.json
rename to BMW-Dynatrace-config/CD_MSGSVC_old/notification/itsm.json
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/notification/msTeams.json b/BMW-Dynatrace-config/CD_MSGSVC_old/notification/msTeams.json
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/notification/msTeams.json
rename to BMW-Dynatrace-config/CD_MSGSVC_old/notification/msTeams.json
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/notification/notification.yaml b/BMW-Dynatrace-config/CD_MSGSVC_old/notification/notification.yaml
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/notification/notification.yaml
rename to BMW-Dynatrace-config/CD_MSGSVC_old/notification/notification.yaml
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/synthetic-monitor/README.md b/BMW-Dynatrace-config/CD_MSGSVC_old/synthetic-monitor/README.md
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/synthetic-monitor/README.md
rename to BMW-Dynatrace-config/CD_MSGSVC_old/synthetic-monitor/README.md
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/synthetic-monitor/default.json b/BMW-Dynatrace-config/CD_MSGSVC_old/synthetic-monitor/default.json
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/synthetic-monitor/default.json
rename to BMW-Dynatrace-config/CD_MSGSVC_old/synthetic-monitor/default.json
diff --git a/BMW-Dynatrace-config/CD_MSGSVC/synthetic-monitor/synthetic-monitor.yaml b/BMW-Dynatrace-config/CD_MSGSVC_old/synthetic-monitor/synthetic-monitor.yaml
similarity index 100%
rename from BMW-Dynatrace-config/CD_MSGSVC/synthetic-monitor/synthetic-monitor.yaml
rename to BMW-Dynatrace-config/CD_MSGSVC_old/synthetic-monitor/synthetic-monitor.yaml