diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/custom-service-java.yaml
index 5915766e..1722cda0 100644
--- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/custom-service-java.yaml
+++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/custom-service-java.yaml
@@ -1,17 +1,19 @@
 config:
-- customService1: template-2-1a.json
-- customService2: template-2-1b.json
-- customService3: template-1-1a.json
-- customService4: template-1-1b.json
-- customService5: template-1-1c.json
+- customService1: template-2-1.json
+- customService2: template-2-1.json
+- customService3: template-1-1.json
+- customService4: template-1-1.json
+- customService5: template-1-1.json
 
 customService1:
 - name: "ifs-010 (SQS) RtcTeleXIn/Out - IN/OUT"
 - className1: com.bmw.cc.ts.rtchandler.bm.message.MessageServiceRTCBF
 - methodName1: processMessage
+- methodArgs1: java.lang.String,java.util.Map,com.bmw.cc.ts.rtchandler.bm.common.util.RequestContext
 - returnType1: void
 - className2: com.bmw.cc.ts.rtchandler.integration.tsmb.boundary.TeleXSqsESI
 - methodName2: sendMessage
+- methodArgs2: java.lang.String,java.util.Map,com.bmw.cc.ts.rtchandler.bm.common.util.RequestContext
 - returnType2: void
 - skipDeployment: "false"
 
@@ -19,9 +21,11 @@ customService2:
 - name: "ifs-008 (SQS) NgtpRtcHandlerIn/Out - IN/OUT"
 - className1: com.bmw.cc.ts.rtchandler.api.ngtp.v1.boundary.NgtpSqsListener
 - methodName1: processMessage
+- methodArgs1: com.bmw.cd.logging.CdllLoggingContext, software.amazon.awssdk.services.sqs.model.Message
 - returnType1: void
 - className2: com.bmw.cc.ts.rtchandler.integration.ngtp.v1.boundary.NgtpSqsESI
 - methodName2: sendMessage
+- methodArgs2: java.lang.String,java.lang.String,com.bmw.cc.ts.rtchandler.bm.diag.entity.RTCTriggerType
 - returnType2: void
 - skipDeployment: "false"
 
@@ -29,6 +33,7 @@ customService3:
 - name: "ifs-009 (MQS) RtcHandlerIstaOut - OUT"
 - className: com.bmw.cc.ts.rtchandler.bm.common.control.classificationrequest.ClassificationRequestQueueSender
 - methodName: sendClassificationRequestMessage
+- methodArgs: com.bmw.cc.ts.rtchandler.bm.common.model.classificationrequest.ClassificationRequest
 - returnType: void
 - skipDeployment: "false"
 
@@ -36,6 +41,7 @@ customService4:
 - name: "(Timer) timeout"
 - className: com.bmw.cc.ts.rtchandler.bm.common.timer.CallTimeoutTimerService
 - methodName: handleTimer
+- methodArgs: 
 - returnType: void
 - skipDeployment: "false"
 
@@ -43,5 +49,6 @@ customService5:
 - name: "(Timer) deletion"
 - className: com.bmw.cc.ts.rtchandler.bm.common.control.cleanup.DbCleanUpBA
 - methodName: cleanUp
+- methodArgs: 
 - returnType: void
 - skipDeployment: "false"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1b.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1.json
similarity index 89%
rename from BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1b.json
rename to BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1.json
index 1fd760ba..ebe95097 100644
--- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1b.json
+++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1.json
@@ -13,7 +13,7 @@
    "matcher": "EQUALS",
    "methodRules": [
     {
-     "argumentTypes": [ ],
+     "argumentTypes": ["{{.methodArgs}}"],
      "methodName": "{{.methodName}}",
      "returnType": "{{.returnType}}"
     }
diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1a.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1a.json
deleted file mode 100644
index fb870862..00000000
--- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1a.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "enabled": true,
- "name": "{{.name}}",
- "processGroups": [],
- "queueEntryPoint": false,
- "queueEntryPointType": null,
- "rules": [
-  {
-   "annotations": [],
-   "className": "{{.className}}",
-   "enabled": true,
-   "fileName": "",
-   "matcher": "EQUALS",
-   "methodRules": [
-    {
-     "argumentTypes": [
-      "com.bmw.cc.ts.rtchandler.bm.common.model.classificationrequest.ClassificationRequest"
-     ],
-     "methodName": "{{.methodName}}",
-     "returnType": "{{.returnType}}"
-    }
-   ]
-  }
- ]
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1c.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1c.json
deleted file mode 100644
index 1fd760ba..00000000
--- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-1-1c.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "enabled": true,
- "name": "{{.name}}",
- "processGroups": [],
- "queueEntryPoint": false,
- "queueEntryPointType": null,
- "rules": [
-  {
-   "annotations": [],
-   "className": "{{.className}}",
-   "enabled": true,
-   "fileName": "",
-   "matcher": "EQUALS",
-   "methodRules": [
-    {
-     "argumentTypes": [ ],
-     "methodName": "{{.methodName}}",
-     "returnType": "{{.returnType}}"
-    }
-   ]
-  }
- ]
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1b.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json
similarity index 67%
rename from BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1b.json
rename to BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json
index f6873db3..f0077b0c 100644
--- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1b.json
+++ b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1.json
@@ -13,10 +13,7 @@
       "matcher": "EQUALS",
       "methodRules": [
         {
-          "argumentTypes": [
-            "com.bmw.cd.logging.CdllLoggingContext",
-            "software.amazon.awssdk.services.sqs.model.Message"
-          ],
+          "argumentTypes": ["{{.methodArgs1}}"],
           "methodName": "{{.methodName1}}",
           "returnType": "{{.returnType1}}"
         }]
@@ -29,11 +26,7 @@
       "matcher": "EQUALS",
       "methodRules": [
         {
-          "argumentTypes": [
-            "java.lang.String",
-            "java.lang.String",
-            "com.bmw.cc.ts.rtchandler.bm.diag.entity.RTCTriggerType"
-          ],
+          "argumentTypes": ["{{.methodArgs2}}"],
           "methodName": "{{.methodName2}}",
           "returnType": "{{.returnType2}}"
         }
diff --git a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1a.json b/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1a.json
deleted file mode 100644
index 62c8d7a4..00000000
--- a/BMW-Dynatrace-config/CD_VDLM_rtchandler/custom-service-java/template-2-1a.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "enabled": true,
-  "name": "{{.name}}",
-  "processGroups": [],
-  "queueEntryPoint": false,
-  "queueEntryPointType": null,
-  "rules": [
-    {
-      "annotations": [],
-      "className": "{{.className1}}",
-      "enabled": true,
-      "fileName": "",
-      "matcher": "EQUALS",
-      "methodRules": [
-        {
-          "argumentTypes": [
-            "java.lang.String",
-            "java.util.Map",
-            "com.bmw.cc.ts.rtchandler.bm.common.util.RequestContext"
-          ],
-          "methodName": "{{.methodName1}}",
-          "returnType": "{{.returnType1}}"
-        }]
-    },
-    {
-      "annotations": [],
-      "className": "{{.className2}}",
-      "enabled": true,
-      "fileName": "",
-      "matcher": "EQUALS",
-      "methodRules": [
-        {
-          "argumentTypes": [
-            "java.lang.String",
-            "java.util.Map",
-            "com.bmw.cc.ts.rtchandler.bm.common.util.RequestContext"
-          ],
-          "methodName": "{{.methodName2}}",
-          "returnType": "{{.returnType2}}"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file