diff --git a/BMW-Dynatrace-config/CD_AFW/notification/notification.yaml b/BMW-Dynatrace-config/CD_AFW/notification/notification.yaml
index bce03188..6a9460af 100644
--- a/BMW-Dynatrace-config/CD_AFW/notification/notification.yaml
+++ b/BMW-Dynatrace-config/CD_AFW/notification/notification.yaml
@@ -73,11 +73,11 @@ CDnewComponentTagITSM.EMEA-PreProd:
 - name: CD_AFW ITSM INT
 - alertingProfile: CD_AFW/alerting-profile/CDnewComponentTag.id
 - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1
-- contractid: "10APP11906401"
-- appdid: "TEST123"
+- contractid: "10APP11863401"
+- appdid: "APP-24654"
 - mzName: CD_AFW/management-zone/CDnewComponentTag.id
-- DTEnvironment: https://xxu26128.live.dynatrace.com
-- skipDeployment: "true"
+- DTEnvironment: https://qqk70169.live.dynatrace.com
+- skipDeployment: "false"
 
 CDnewComponentTagITSM.NA-PreProd:
 - name: CD_AFW ITSM INT
diff --git a/BMW-Dynatrace-config/CD_AudioVideoServices/notification/notification.yaml b/BMW-Dynatrace-config/CD_AudioVideoServices/notification/notification.yaml
index 00a76888..a72a2d6c 100644
--- a/BMW-Dynatrace-config/CD_AudioVideoServices/notification/notification.yaml
+++ b/BMW-Dynatrace-config/CD_AudioVideoServices/notification/notification.yaml
@@ -43,7 +43,7 @@ CDAudioVideoServicesPRODITSM.EMEA-Prod:
 - name: CD_AudioVideoServices ITSM PROD
 - alertingProfile: CD_AudioVideoServices/alerting-profile/CDAudioVideoServices.id
 - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1
-- contractid: "10APP10900711"
+- contractid: "10APP10900712"
 - appdid: "188900"
 - mzName: CD_AudioVideoServices/management-zone/CDAudioVideoServices.id
 - DTEnvironment: https://xxu26128.live.dynatrace.com
@@ -53,7 +53,7 @@ CDAudioVideoServicesPRODITSM.NA-Prod:
 - name: CD_AudioVideoServices ITSM PROD
 - alertingProfile: CD_AudioVideoServices/alerting-profile/CDAudioVideoServices.id
 - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1
-- contractid: "20APP10900702"
+- contractid: "20APP10900703"
 - appdid: "188900"
 - mzName: CD_AudioVideoServices/management-zone/CDAudioVideoServices.id
 - DTEnvironment: https://wgv50241.live.dynatrace.com
@@ -64,7 +64,7 @@ CDAudioVideoServicesPRODITSM.CN-Prod:
 - name: CD_AudioVideoServices ITSM PROD
 - alertingProfile: CD_AudioVideoServices/alerting-profile/CDAudioVideoServices.id
 - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1
-- contractid: "30APP10900706"
+- contractid: "30APP10900707"
 - appdid: "189125"
 - mzName: CD_AudioVideoServices/management-zone/CDAudioVideoServices.id
 - DTEnvironment: https://dynatracemgd-tsp.bmwgroup.net/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b
diff --git a/BMW-Dynatrace-config/CD_Countly/notification/notification.yaml b/BMW-Dynatrace-config/CD_Countly/notification/notification.yaml
index 5e10c682..55342304 100644
--- a/BMW-Dynatrace-config/CD_Countly/notification/notification.yaml
+++ b/BMW-Dynatrace-config/CD_Countly/notification/notification.yaml
@@ -42,21 +42,21 @@ CDnewComponentTagITSM.EMEA-Prod:
 - name: CD_Countly ITSM PROD
 - alertingProfile: CD_Countly/alerting-profile/CDnewComponentTag.id
 - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1
-- contractid: "10APP11906401"
-- appdid: "TEST123"
+- contractid: "10APP11899700"
+- appdid: "APPD-253917"
 - mzName: CD_Countly/management-zone/CDnewComponentTag.id
 - DTEnvironment: https://xxu26128.live.dynatrace.com
-- skipDeployment: "true"
+- skipDeployment: "false"
 
 CDnewComponentTagITSM.NA-Prod:
 - name: CD_Countly ITSM PROD
 - alertingProfile: CD_Countly/alerting-profile/CDnewComponentTag.id
 - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1
-- contractid: "10APP11906401"
-- appdid: "TEST123"
+- contractid: "20APP11899700"
+- appdid: "APPD-253917"
 - mzName: CD_Countly/management-zone/CDnewComponentTag.id
-- DTEnvironment: https://xxu26128.live.dynatrace.com
-- skipDeployment: "true"
+- DTEnvironment: https://wgv50241.live.dynatrace.com
+- skipDeployment: "false"
 
 
 CDnewComponentTagITSM.CN-Prod:
diff --git a/BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest copy 2.json b/BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest copy 2.json
new file mode 100644
index 00000000..a4f0a2c1
--- /dev/null
+++ b/BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest copy 2.json	
@@ -0,0 +1,29 @@
+{
+    "enabled": true,
+    "metadata": {
+     "clusterVersion": "1.211.111.20210222-093946",
+     "configurationVersions": [
+      0
+     ]
+    },
+    "name": "{{.name}}",
+    "processGroups": [],
+    "queueEntryPoint": false,
+    "queueEntryPointType": null,
+    "rules": [
+     {
+      "annotations": [],
+      "className": "com.bmw.cc.smc2.dkey.api.vehicle.v1.boundary.VehicleInboundBCI",
+      "enabled": true,
+      "fileName": "",
+      "matcher": "EQUALS",
+      "methodRules": [
+       {
+        "argumentTypes":["{{.argumentTypes}}"],
+        "methodName": "sendKeyListToBackend",
+        "returnType": "void"
+       }
+      ]
+     }
+    ]
+   }
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest copy.json b/BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest copy.json
new file mode 100644
index 00000000..73619c10
--- /dev/null
+++ b/BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest copy.json	
@@ -0,0 +1,32 @@
+{
+    "enabled": true,
+    "metadata": {
+     "clusterVersion": "1.211.111.20210222-093946",
+     "configurationVersions": [
+      0
+     ]
+    },
+    "name": "{{.name}}",
+    "processGroups": [],
+    "queueEntryPoint": false,
+    "queueEntryPointType": null,
+    "rules": [
+     {
+      "annotations": [],
+      "className": "com.bmw.cc.smc2.dkey.api.vehicle.v1.boundary.VehicleInboundBCI",
+      "enabled": true,
+      "fileName": "",
+      "matcher": "EQUALS",
+      "methodRules": [
+       {
+        "argumentTypes": [
+         "java.lang.String",
+         "java.lang.Byte[]"
+        ],
+        "methodName": "sendKeyListToBackend",
+        "returnType": "void"
+       }
+      ]
+     }
+    ]
+   }
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest.json b/BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest.json
new file mode 100644
index 00000000..a4f0a2c1
--- /dev/null
+++ b/BMW-Dynatrace-config/ew_test/custom-service-java/TemplateTest.json
@@ -0,0 +1,29 @@
+{
+    "enabled": true,
+    "metadata": {
+     "clusterVersion": "1.211.111.20210222-093946",
+     "configurationVersions": [
+      0
+     ]
+    },
+    "name": "{{.name}}",
+    "processGroups": [],
+    "queueEntryPoint": false,
+    "queueEntryPointType": null,
+    "rules": [
+     {
+      "annotations": [],
+      "className": "com.bmw.cc.smc2.dkey.api.vehicle.v1.boundary.VehicleInboundBCI",
+      "enabled": true,
+      "fileName": "",
+      "matcher": "EQUALS",
+      "methodRules": [
+       {
+        "argumentTypes":["{{.argumentTypes}}"],
+        "methodName": "sendKeyListToBackend",
+        "returnType": "void"
+       }
+      ]
+     }
+    ]
+   }
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/ew_test/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/ew_test/custom-service-java/custom-service-java.yaml
new file mode 100644
index 00000000..ea55785f
--- /dev/null
+++ b/BMW-Dynatrace-config/ew_test/custom-service-java/custom-service-java.yaml
@@ -0,0 +1,11 @@
+config:
+- TemplateTest: TemplateTest.json
+
+TemplateTest:
+- name: EW_TEMPLATE_TEST
+- skipDeployment: "true"
+TemplateTest.EMEA-PreProd:
+- name: EW_TEMPLATE_TEST
+- argumentTypes: ""
+- skipDeployment: "false"
+