diff --git a/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/custom-service-java.yaml
index 9b7ac25c..a4714387 100644
--- a/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/custom-service-java.yaml
@@ -1,6 +1,6 @@
 config:
-- customService1: template-1-1.json
-- customService2: template-1-1.json
+- customService1: template-2-1.json
+- customService2: template-2-1.json
 
 customService1:
 - name: "ifs-007 (JOYNR) requestDiagResult/notifyDiagResult - IN/OUT"
@@ -22,6 +22,6 @@ customService2:
 - returnType1: void
 - className2: com.bmw.cc.ts.diagservice.joynr.consumer.boundary.DiagServiceBackendServiceInterface
 - methodName2: notifyPdmResultStatus
-- methodArgs2:joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId,joynr.de.bmw.infotainment.telematic.teleservice.TeleserviceTypes.AppInfo,joynr.de.bmw.infotainment.telematic.teleservice.TeleserviceTypes.TeleserviceInfo,java.lang.String,java.lang.String,java.lang.String,joynr.de.bmw.infotainment.telematic.common.CommonTypes.ResultCode
+- methodArgs2: joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId,joynr.de.bmw.infotainment.telematic.teleservice.TeleserviceTypes.AppInfo,joynr.de.bmw.infotainment.telematic.teleservice.TeleserviceTypes.TeleserviceInfo,java.lang.String,java.lang.String,java.lang.String,joynr.de.bmw.infotainment.telematic.common.CommonTypes.ResultCode
 - returnType2: void
 - skipDeployment: "false"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/template-2-1.json
similarity index 100%
rename from BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/template-1-1.json
rename to BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/template-2-1.json
diff --git a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml
index e4484106..2c090151 100644
--- a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml
@@ -15,10 +15,10 @@ customService1:
 
 
 customService2:
-  - name: "ifs-002 (JOYNR) notifyMaintenanceStatus - IN"
-  - className: com.bmw.cc.ts.scallservice.bm.maintenance.boundary.MaintenanceConfirmBF
-  - methodName: notifyMaintenanceStatus
-  - methodArgs: com.bmw.cc.ts.joynr.consumer.entity.NotifyMaintenanceVehicleResponse
-  - returnType: void
-  - skipDeployment: "false"
+- name: "ifs-002 (JOYNR) notifyMaintenanceStatus - IN"
+- className: com.bmw.cc.ts.scallservice.bm.maintenance.boundary.MaintenanceConfirmBF
+- methodName: notifyMaintenanceStatus
+- methodArgs: com.bmw.cc.ts.joynr.consumer.entity.NotifyMaintenanceVehicleResponse
+- returnType: void
+- skipDeployment: "false"
 
diff --git a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/template-1-2.json b/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/template-1-2.json
index f0077b0c..1e4f1928 100644
--- a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/template-1-2.json
+++ b/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/template-1-2.json
@@ -7,7 +7,7 @@
   "rules": [
     {
       "annotations": [],
-      "className": "{{.className1}}",
+      "className": "{{.className}}",
       "enabled": true,
       "fileName": "",
       "matcher": "EQUALS",
@@ -16,21 +16,12 @@
           "argumentTypes": ["{{.methodArgs1}}"],
           "methodName": "{{.methodName1}}",
           "returnType": "{{.returnType1}}"
-        }]
-    },
-    {
-      "annotations": [],
-      "className": "{{.className2}}",
-      "enabled": true,
-      "fileName": "",
-      "matcher": "EQUALS",
-      "methodRules": [
+        },
         {
           "argumentTypes": ["{{.methodArgs2}}"],
           "methodName": "{{.methodName2}}",
           "returnType": "{{.returnType2}}"
-        }
-      ]
+        }]
     }
   ]
 }
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml
index c65de3f8..510c321c 100644
--- a/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_tsrd/custom-service-java/custom-service-java.yaml
@@ -20,19 +20,19 @@ customService1:
 
 customService2:
 - name: "(MQS) CallTopic - OUT"
-- className1: com.bmw.cc.ts.tsrd.bm.jms.calltopic.boundary.CallTopicJmsPublisherBA
-- methodName1: publishCallToCallTopic
-- methodArgs1: com.bmw.cc.ts.tsrd.bm.jms.calltopic.entity.CallStorageCallDO
-- returnType1: void
+- className: com.bmw.cc.ts.tsrd.bm.jms.calltopic.boundary.CallTopicJmsPublisherBA
+- methodName: publishCallToCallTopic
+- methodArgs: com.bmw.cc.ts.tsrd.bm.jms.calltopic.entity.CallStorageCallDO
+- returnType: void
 
 customService3:
 - name: "ifs-007 (SQS) odfUpdateStatus - IN"
-- className1: com.bmw.cc.ts.tsrd.bm.odfupdatestatus.boundary.OdfUpdateStatusSqsMF
-- methodName1: processMessage
-- methodArgs1: software.amazon.awssdk.services.sqs.model.Message
-- returnType1: void
+- className: com.bmw.cc.ts.tsrd.bm.odfupdatestatus.boundary.OdfUpdateStatusSqsMF
+- methodName: processMessage
+- methodArgs: software.amazon.awssdk.services.sqs.model.Message
+- returnType: void
 
-- customService4: 
+customService4:
 - name: "(Timer) deletion/timeout"
 - className1: com.bmw.cc.ts.tsrd.bm.timer.DatabaseCleanerTimerService
 - methodName1: timeout
@@ -46,14 +46,14 @@ customService3:
 
 customService5:
 - name: "ifs-009 (SQS) QuitDiagnosisMessage - IN"
-- className1: com.bmw.cc.ts.tsrd.bm.remotediagnosis.boundary.DiagServiceSqsListener
-- methodName1: processMessage
-- methodArgs1: com.bmw.cd.logging.CdllLoggingContext,software.amazon.awssdk.services.sqs.model.Message
-- returnType1: void
+- className: com.bmw.cc.ts.tsrd.bm.remotediagnosis.boundary.DiagServiceSqsListener
+- methodName: processMessage
+- methodArgs: com.bmw.cd.logging.CdllLoggingContext,software.amazon.awssdk.services.sqs.model.Message
+- returnType: void
 
 customService6:
 - name: "(SQS) CallTopic - OUT"
-- className1: com.bmw.cc.ts.tsrd.integration.aws.calltopic.CallTopicNotificationESI
-- methodName1: publishNotification
-- methodArgs1: com.bmw.cc.ts.tsrd.integration.aws.calltopic.CallStorageCallDO
-- returnType1: void
+- className: com.bmw.cc.ts.tsrd.integration.aws.calltopic.CallTopicNotificationESI
+- methodName: publishNotification
+- methodArgs: com.bmw.cc.ts.tsrd.integration.aws.calltopic.CallStorageCallDO
+- returnType: void
diff --git a/BMW-Dynatrace-config/CD_VDLM_wlupdater/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_wlupdater/custom-service-java/custom-service-java.yaml
index 80c3aa27..71224f4f 100644
--- a/BMW-Dynatrace-config/CD_VDLM_wlupdater/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_wlupdater/custom-service-java/custom-service-java.yaml
@@ -1,7 +1,7 @@
 config:
-- customService1: template-1-1.json
-- customService2: template-1-1.json
-- customService3: template-1-2.json
+- customService1: template-2-1.json
+- customService2: template-2-1.json
+- customService3: template-3-1.json
 
 customService1:
 - name: "ifs-003 (JOYNR) triggerWhitelistUpdate/notifyWhitelistStatus - IN/OUT"
@@ -23,7 +23,7 @@ customService2:
 - returnType1: void
 - className2: com.bmw.cc.ts.wlupdater.joynr.consumer.boundary.OdfVehicle2BackendService
 - methodName2: notifyOdfStatus
-- methodArgs2:joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId,joynr.de.bmw.infotainment.telematic.teleservice.TeleserviceTypes.VehicleInfo,joynr.de.bmw.infotainment.telematic.teleservice.TeleserviceTypes.AppInfo,java.lang.String,java.lang.String,joynr.de.bmw.infotainment.telematic.common.CommonTypes.ResultCode
+- methodArgs2: joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId,joynr.de.bmw.infotainment.telematic.teleservice.TeleserviceTypes.VehicleInfo,joynr.de.bmw.infotainment.telematic.teleservice.TeleserviceTypes.AppInfo,java.lang.String,java.lang.String,joynr.de.bmw.infotainment.telematic.common.CommonTypes.ResultCode
 - returnType2: void
 - skipDeployment: "false"
 
diff --git a/BMW-Dynatrace-config/CD_VDLM_wlupdater/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_wlupdater/custom-service-java/template-2-1.json
similarity index 100%
rename from BMW-Dynatrace-config/CD_VDLM_wlupdater/custom-service-java/template-1-1.json
rename to BMW-Dynatrace-config/CD_VDLM_wlupdater/custom-service-java/template-2-1.json
diff --git a/BMW-Dynatrace-config/CD_VDLM_wlupdater/custom-service-java/template-1-2.json b/BMW-Dynatrace-config/CD_VDLM_wlupdater/custom-service-java/template-3-1.json
similarity index 100%
rename from BMW-Dynatrace-config/CD_VDLM_wlupdater/custom-service-java/template-1-2.json
rename to BMW-Dynatrace-config/CD_VDLM_wlupdater/custom-service-java/template-3-1.json