From 5b0d56add7f4bb1dcc7640f6fc300b6b2def2e66 Mon Sep 17 00:00:00 2001
From: rforstner <r.reneforstner@gmail.com>
Date: Mon, 14 Jun 2021 11:04:08 +0200
Subject: [PATCH] Removed custom-service-java config

---
 .../CD_APIGW/custom-service-java/README.md    |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_APIM/custom-service-java/README.md     |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_ASBC-HAL/custom-service-java/README.md |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_ASBC-RSU/custom-service-java/README.md |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_CCG/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_CSI/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_DPP_DPM/custom-service-java/README.md  |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_GCDM/custom-service-java/README.md     |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_LSC-FSU/custom-service-java/README.md  |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_LSC/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_Mobile_2/custom-service-java/README.md |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_PISA/custom-service-java/README.md     |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_Perseus/custom-service-java/README.md  |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_Speech/custom-service-java/README.md   |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_aluis/custom-service-java/README.md    |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_am-casa/custom-service-java/README.md  |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_am-cesim/custom-service-java/README.md |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_am-cns/custom-service-java/README.md   |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_am-ecs/custom-service-java/README.md   |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_am-egim/custom-service-java/README.md  |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_am-lmcs/custom-service-java/README.md  |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_am-proxy/custom-service-java/README.md |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_am-store/custom-service-java/README.md |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_am-svms/custom-service-java/README.md  |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_am-ui/custom-service-java/README.md    |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_am-usage/custom-service-java/README.md |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_am-vms/custom-service-java/README.md   |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_asbc-sts/custom-service-java/README.md |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_asbctvp/custom-service-java/README.md  |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_b2v-nots/custom-service-java/README.md |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_cac/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_cdc/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_cm/custom-service-java/README.md       |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_csu/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_delivery/custom-service-java/README.md |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_dsd/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_eadb/custom-service-java/README.md     |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_ercaf/custom-service-java/README.md    |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_ercr/custom-service-java/README.md     |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_erd/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_esh/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_fmc/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_hpauth/custom-service-java/README.md   |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_ids-svds/custom-service-java/README.md |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_ids-sync/custom-service-java/README.md |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_ids-ws/custom-service-java/README.md   |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_jdssp21/custom-service-java/README.md  |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_lsc-hr/custom-service-java/README.md   | 30 -------------------
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_lsc-jr/custom-service-java/README.md   | 30 -------------------
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_lsc-kc/custom-service-java/README.md   |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_lsc-mm/custom-service-java/README.md   |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_lsc-oc/custom-service-java/README.md   |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_lsc-og/custom-service-java/README.md   |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_lsc-wo/custom-service-java/README.md   | 30 -------------------
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_mds/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_mlc/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_mrp/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_oclisc2v/custom-service-java/README.md |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_omg/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_rsu/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_sbr/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_scb/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_scc/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_scm-scm/custom-service-java/README.md  |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_sfa-fre/custom-service-java/README.md  |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_sfa-ota/custom-service-java/README.md  |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_sfa-vs/custom-service-java/README.md   |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_sfa/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_stm/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_svcinfo/custom-service-java/README.md  |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_tol-mgu/custom-service-java/README.md  |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_tol-tssb/custom-service-java/README.md |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_tol/custom-service-java/README.md      |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_ts-bt/custom-service-java/README.md    |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_ts-bti/custom-service-java/README.md   |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_ts-eshad/custom-service-java/README.md |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_ts-tsp/custom-service-java/README.md   |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_tscs/custom-service-java/README.md     |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_tsmb/custom-service-java/README.md     |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_tsr-cmr/custom-service-java/README.md  |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_tsr-dd/custom-service-java/README.md   |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_tsr-vu/custom-service-java/README.md   |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_vps-prov/custom-service-java/README.md |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_vs-api/custom-service-java/README.md   |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_webapi/custom-service-java/README.md   |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../custom-service-java/README.md             |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 .../CD_xfcd/custom-service-java/README.md     |  4 ---
 .../custom-service-java.yaml                  |  9 ------
 .../custom-service-java/template-1-1.json     | 23 --------------
 813 files changed, 9834 deletions(-)
 delete mode 100644 BMW-Dynatrace-config/CD_APIGW/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_APIGW/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_APIGW/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_APIM/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_APIM/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_APIM/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ASBC-HAL/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ASBC-HAL/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ASBC-HAL/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ASBC-RSU/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ASBC-RSU/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ASBC-RSU/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ASBC-SMACC/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ASBC-SMACC/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ASBC-SMACC/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_App-Repository/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_App-Repository/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_App-Repository/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_BMWPoints/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_BMWPoints/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_BMWPoints/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_Billing_Buffet/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_Billing_Buffet/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_Billing_Buffet/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_CCG/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_CCG/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_CCG/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_CSI/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_CSI/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_CSI/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_Call-Handling-Backends/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_Call-Handling-Backends/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_Call-Handling-Backends/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_CallCenterClient/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_CallCenterClient/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_CallCenterClient/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_Connected-Backend-Services/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_Connected-Backend-Services/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_Connected-Backend-Services/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_Connected-User-Behaviour/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_Connected-User-Behaviour/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_Connected-User-Behaviour/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ContentProvider/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ContentProvider/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ContentProvider/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_DPP_DPM/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_DPP_DPM/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_DPP_DPM/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_GCDM/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_GCDM/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_GCDM/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_LSC-FSU/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_LSC-FSU/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_LSC-FSU/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_LSC/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_LSC/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_LSC/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_Location-Services/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_Location-Services/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_Location-Services/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_Messaging-Services/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_Messaging-Services/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_Messaging-Services/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_Mobile_2/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_Mobile_2/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_Mobile_2/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_Navigation-Information-Services/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_Navigation-Information-Services/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_Navigation-Information-Services/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_PISA/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_PISA/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_PISA/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_Perseus/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_Perseus/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_Perseus/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_RemoteServices/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_RemoteServices/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_RemoteServices/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_Service-Bus/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_Service-Bus/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_Service-Bus/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_Service-Gateway/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_Service-Gateway/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_Service-Gateway/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_Speech/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_Speech/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_Speech/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_Voice-Services/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_Voice-Services/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_Voice-Services/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_agent-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_agent-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_agent-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_aluis/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_aluis/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_aluis/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_am-casa/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_am-casa/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_am-casa/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_am-cesim/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_am-cesim/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_am-cesim/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_am-cns/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_am-cns/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_am-cns/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_am-device/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_am-device/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_am-device/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_am-ecs/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_am-ecs/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_am-ecs/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_am-egim/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_am-egim/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_am-egim/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_am-esim-ui/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_am-esim-ui/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_am-esim-ui/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_am-lmcs/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_am-lmcs/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_am-lmcs/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_am-mno-manager/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_am-mno-manager/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_am-mno-manager/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_am-proxy/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_am-proxy/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_am-proxy/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_am-store/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_am-store/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_am-store/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_am-svms/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_am-svms/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_am-svms/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_am-ui/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_am-ui/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_am-ui/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_am-usage/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_am-usage/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_am-usage/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_am-vehicle-activation/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_am-vehicle-activation/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_am-vehicle-activation/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_am-vms/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_am-vms/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_am-vms/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_analytics-user-data-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_analytics-user-data-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_analytics-user-data-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_asbc-sfa-oh/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_asbc-sfa-oh/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_asbc-sfa-oh/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_asbc-sts/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_asbc-sts/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_asbc-sts/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_asbctvp/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_asbctvp/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_asbctvp/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_avs-client-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_avs-client-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_avs-client-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_avs-proxy-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_avs-proxy-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_avs-proxy-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-com-be/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-com-be/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-com-be/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-com-echo/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-com-echo/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-com-echo/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-com-fe/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-com-fe/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-com-fe/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-com-gcdm-client/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-com-gcdm-client/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-com-gcdm-client/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-com-hello/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-com-hello/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-com-hello/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-nots/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-nots/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-nots/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-sms-statistics/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-sms-statistics/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_b2v-sms-statistics/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_bsi-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_bsi-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_bsi-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_cac/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_cac/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_cac/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_casa-event-processor/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_casa-event-processor/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_casa-event-processor/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_cdc/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_cdc/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_cdc/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_cdcicd-jenkins/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_cdcicd-jenkins/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_cdcicd-jenkins/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_chargenow-enabler-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_chargenow-enabler-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_chargenow-enabler-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_charging-data-privacy-composite/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_charging-data-privacy-composite/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_charging-data-privacy-composite/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_charging-data-privacy/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_charging-data-privacy/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_charging-data-privacy/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_charging-events-push-notification-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_charging-events-push-notification-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_charging-events-push-notification-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_charging-events-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_charging-events-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_charging-events-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_charging-plan-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_charging-plan-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_charging-plan-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_charging-push-notifications-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_charging-push-notifications-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_charging-push-notifications-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_charging-sessions-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_charging-sessions-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_charging-sessions-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_charging-stations-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_charging-stations-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_charging-stations-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_client-agent-telemetry-processor/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_client-agent-telemetry-processor/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_client-agent-telemetry-processor/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_cm/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_cm/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_cm/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_commute-notification-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_commute-notification-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_commute-notification-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_commute-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_commute-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_commute-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_connected-oauth-service-apim/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_connected-oauth-service-apim/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_connected-oauth-service-apim/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_connected-oauth-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_connected-oauth-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_connected-oauth-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_connected-onboard-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_connected-onboard-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_connected-onboard-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_csu/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_csu/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_csu/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ctns-event-origin/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ctns-event-origin/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ctns-event-origin/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ctns-marketing-api/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ctns-marketing-api/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ctns-marketing-api/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ctns-vehicle-api/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ctns-vehicle-api/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ctns-vehicle-api/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_current-driver-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_current-driver-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_current-driver-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_data-deletion-processor/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_data-deletion-processor/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_data-deletion-processor/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-comms-provider-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-comms-provider-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-comms-provider-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-data-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-data-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-data-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-payments-invoice-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-payments-invoice-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-payments-invoice-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-payments-notification-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-payments-notification-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-payments-notification-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-payments-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-payments-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-payments-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-search-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-search-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-search-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-services-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-services-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_dealer-services-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_dealercockpit/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_dealercockpit/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_dealercockpit/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_delivery/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_delivery/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_delivery/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_destination-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_destination-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_destination-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_digital-key-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_digital-key-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_digital-key-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_discover-bmw-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_discover-bmw-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_discover-bmw-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_dsd/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_dsd/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_dsd/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_eadb/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_eadb/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_eadb/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ercaf/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ercaf/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ercaf/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ercr/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ercr/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ercr/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_erd/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_erd/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_erd/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_esh/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_esh/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_esh/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_esim-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_esim-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_esim-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_explore-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_explore-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_explore-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_feature-toggles-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_feature-toggles-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_feature-toggles-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_fmc/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_fmc/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_fmc/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_fuel-search-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_fuel-search-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_fuel-search-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_hpauth/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_hpauth/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_hpauth/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_hubtab-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_hubtab-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_hubtab-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_id-lookup-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_id-lookup-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_id-lookup-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ids-admin/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ids-admin/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ids-admin/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ids-svds/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ids-svds/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ids-svds/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ids-sync/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ids-sync/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ids-sync/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ids-ws/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ids-ws/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ids-ws/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_image-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_image-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_image-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_imiles-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_imiles-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_imiles-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ipa-gateway/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ipa-gateway/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ipa-gateway/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_jdssp21/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_jdssp21/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_jdssp21/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_legacy-deletion-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_legacy-deletion-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_legacy-deletion-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_legacy-sar-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_legacy-sar-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_legacy-sar-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_legal-document-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_legal-document-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_legal-document-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_log-data-deletion-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_log-data-deletion-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_log-data-deletion-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-hr/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-hr/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-hr/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-jr/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-jr/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-jr/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-kc/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-kc/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-kc/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-mm/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-mm/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-mm/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-oc/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-oc/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-oc/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-og/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-og/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-og/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-wo/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-wo/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_lsc-wo/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_mds/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_mds/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_mds/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ml-ingestion-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ml-ingestion-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ml-ingestion-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_mlc/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_mlc/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_mlc/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_mrp/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_mrp/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_mrp/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_mrpspringboot/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_mrpspringboot/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_mrpspringboot/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_nop-admin/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_nop-admin/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_nop-admin/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_nop-archive/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_nop-archive/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_nop-archive/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_nop-provisioning/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_nop-provisioning/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_nop-provisioning/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_nop-trigger/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_nop-trigger/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_nop-trigger/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_notification-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_notification-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_notification-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_notification-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_notification-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_notification-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_oas-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_oas-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_oas-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_oclisc2v/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_oclisc2v/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_oclisc2v/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_oclisocsp/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_oclisocsp/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_oclisocsp/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_omc-cd-services/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_omc-cd-services/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_omc-cd-services/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_omg/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_omg/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_omg/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_onboard-navigation-sync-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_onboard-navigation-sync-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_onboard-navigation-sync-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_online-appointment-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_online-appointment-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_online-appointment-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_online-entertainment/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_online-entertainment/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_online-entertainment/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_pdmmanager/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_pdmmanager/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_pdmmanager/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_personal-data-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_personal-data-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_personal-data-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_pmuimapper-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_pmuimapper-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_pmuimapper-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_private-charging-tariffs-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_private-charging-tariffs-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_private-charging-tariffs-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_push-notification-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_push-notification-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_push-notification-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_push-notification-settings-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_push-notification-settings-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_push-notification-settings-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_recall-analytics-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_recall-analytics-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_recall-analytics-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_recall-client-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_recall-client-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_recall-client-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_recall-handler-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_recall-handler-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_recall-handler-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_recall-notification-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_recall-notification-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_recall-notification-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_recall-scheduler-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_recall-scheduler-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_recall-scheduler-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_recall-tcn-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_recall-tcn-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_recall-tcn-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_remote-360-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_remote-360-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_remote-360-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_remote-service-event-processor/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_remote-service-event-processor/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_remote-service-event-processor/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_remote-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_remote-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_remote-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_remote-software-upgrade/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_remote-software-upgrade/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_remote-software-upgrade/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_roadside-assistance-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_roadside-assistance-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_roadside-assistance-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_roadside-assistance/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_roadside-assistance/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_roadside-assistance/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_rsu-adapter/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_rsu-adapter/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_rsu-adapter/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_rsu/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_rsu/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_rsu/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_sbr/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_sbr/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_sbr/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_scb/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_scb/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_scb/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_scc/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_scc/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_scc/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_scm-agentreg/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_scm-agentreg/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_scm-agentreg/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_scm-scm/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_scm-scm/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_scm-scm/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_scma-backend/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_scma-backend/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_scma-backend/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_seam-event-consumer/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_seam-event-consumer/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_seam-event-consumer/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_seam-event-producer/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_seam-event-producer/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_seam-event-producer/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_search-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_search-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_search-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_send-to-car-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_send-to-car-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_send-to-car-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_service-manager/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_service-manager/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_service-manager/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_service-notification-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_service-notification-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_service-notification-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_sfa-fre/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_sfa-fre/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_sfa-fre/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_sfa-ota/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_sfa-ota/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_sfa-ota/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_sfa-vs/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_sfa-vs/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_sfa-vs/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_sfa/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_sfa/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_sfa/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_smart-access-order-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_smart-access-order-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_smart-access-order-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_sms-email-adapter-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_sms-email-adapter-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_sms-email-adapter-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_srmanager/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_srmanager/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_srmanager/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_stm/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_stm/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_stm/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_svcinfo/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_svcinfo/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_svcinfo/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_timer-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_timer-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_timer-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_timers-processor/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_timers-processor/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_timers-processor/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_token-exchanger-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_token-exchanger-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_token-exchanger-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_tol-mgu/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_tol-mgu/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_tol-mgu/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_tol-tssb/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_tol-tssb/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_tol-tssb/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_tol/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_tol/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_tol/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_trip-change-processor/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_trip-change-processor/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_trip-change-processor/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_trip-cleanup-app-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_trip-cleanup-app-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_trip-cleanup-app-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_trip-monitor-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_trip-monitor-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_trip-monitor-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_trip-reminder-processor/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_trip-reminder-processor/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_trip-reminder-processor/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_trip-route-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_trip-route-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_trip-route-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_trip-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_trip-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_trip-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-bcallservice/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-bcallservice/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-bcallservice/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-bt/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-bt/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-bt/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-bti/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-bti/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-bti/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-cas-spm/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-cas-spm/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-cas-spm/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-cas-stm/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-cas-stm/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-cas-stm/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-datadispatcher/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-datadispatcher/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-datadispatcher/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-diagservice/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-diagservice/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-diagservice/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-eshad/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-eshad/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-eshad/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-message-receiver/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-message-receiver/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-message-receiver/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-pdmupdater/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-pdmupdater/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-pdmupdater/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-pservice/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-pservice/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-pservice/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-remotediagnosis/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-remotediagnosis/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-remotediagnosis/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-rsurservice/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-rsurservice/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-rsurservice/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-rtcadapter/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-rtcadapter/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-rtcadapter/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-rtchandler/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-rtchandler/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-rtchandler/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-rtcservice/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-rtcservice/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-rtcservice/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-scallservice/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-scallservice/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-scallservice/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-tsbgam/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-tsbgam/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-tsbgam/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-tsbgservice/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-tsbgservice/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-tsbgservice/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-tsp/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-tsp/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-tsp/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_ts-wlupdater/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_ts-wlupdater/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_ts-wlupdater/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_tscs/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_tscs/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_tscs/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_tsmb/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_tsmb/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_tsmb/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_tsr-cmr/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_tsr-cmr/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_tsr-cmr/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_tsr-dd/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_tsr-dd/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_tsr-dd/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_tsr-vu/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_tsr-vu/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_tsr-vu/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_tsrservice/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_tsrservice/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_tsrservice/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_user-activity-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_user-activity-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_user-activity-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_user-attributes-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_user-attributes-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_user-attributes-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_user-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_user-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_user-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_user-delete-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_user-delete-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_user-delete-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_user-position-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_user-position-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_user-position-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_user-profile-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_user-profile-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_user-profile-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_usid-filter-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_usid-filter-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_usid-filter-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-features-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-features-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-features-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-list-proxy-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-list-proxy-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-list-proxy-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-mapping-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-mapping-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-mapping-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-service-alert/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-service-alert/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-service-alert/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-service-background/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-service-background/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-service-background/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-service-staging/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-service-staging/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-service-staging/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-status-proxy-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-status-proxy-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-status-proxy-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-user-relationship-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-user-relationship-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_vehicle-user-relationship-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_vin-list-generator-service/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_vin-list-generator-service/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_vin-list-generator-service/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_vps-admin/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_vps-admin/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_vps-admin/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_vps-archive/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_vps-archive/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_vps-archive/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_vps-monitor/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_vps-monitor/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_vps-monitor/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_vps-prov/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_vps-prov/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_vps-prov/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_vps-trigger/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_vps-trigger/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_vps-trigger/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_vs-api/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_vs-api/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_vs-api/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_webapi/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_webapi/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_webapi/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_wlmanager/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_wlmanager/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_wlmanager/custom-service-java/template-1-1.json
 delete mode 100644 BMW-Dynatrace-config/CD_xfcd/custom-service-java/README.md
 delete mode 100644 BMW-Dynatrace-config/CD_xfcd/custom-service-java/custom-service-java.yaml
 delete mode 100644 BMW-Dynatrace-config/CD_xfcd/custom-service-java/template-1-1.json

diff --git a/BMW-Dynatrace-config/CD_APIGW/custom-service-java/README.md b/BMW-Dynatrace-config/CD_APIGW/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_APIGW/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_APIGW/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_APIGW/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_APIGW/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_APIGW/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_APIGW/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_APIGW/custom-service-java/template-1-1.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_APIM/custom-service-java/README.md b/BMW-Dynatrace-config/CD_APIM/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_APIM/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_APIM/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_APIM/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_APIM/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_APIM/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_APIM/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_APIM/custom-service-java/template-1-1.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_ASBC-HAL/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ASBC-HAL/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-HAL/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ASBC-HAL/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ASBC-HAL/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-HAL/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ASBC-HAL/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ASBC-HAL/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-HAL/custom-service-java/template-1-1.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_ASBC-RSU/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ASBC-RSU/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-RSU/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ASBC-RSU/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ASBC-RSU/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-RSU/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ASBC-RSU/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ASBC-RSU/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-RSU/custom-service-java/template-1-1.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_ASBC-SMACC/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ASBC-SMACC/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-SMACC/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ASBC-SMACC/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ASBC-SMACC/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-SMACC/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ASBC-SMACC/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ASBC-SMACC/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-SMACC/custom-service-java/template-1-1.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_App-Repository/custom-service-java/README.md b/BMW-Dynatrace-config/CD_App-Repository/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_App-Repository/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_App-Repository/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_App-Repository/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_App-Repository/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_App-Repository/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_App-Repository/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_App-Repository/custom-service-java/template-1-1.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_BMWPoints/custom-service-java/README.md b/BMW-Dynatrace-config/CD_BMWPoints/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_BMWPoints/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_BMWPoints/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_BMWPoints/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_BMWPoints/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_BMWPoints/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_BMWPoints/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_BMWPoints/custom-service-java/template-1-1.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_Billing_Buffet/custom-service-java/README.md b/BMW-Dynatrace-config/CD_Billing_Buffet/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_Billing_Buffet/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Billing_Buffet/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_Billing_Buffet/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_Billing_Buffet/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Billing_Buffet/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_Billing_Buffet/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_Billing_Buffet/custom-service-java/template-1-1.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_CCG/custom-service-java/README.md b/BMW-Dynatrace-config/CD_CCG/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_CCG/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_CCG/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_CCG/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_CCG/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_CCG/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_CCG/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_CCG/custom-service-java/template-1-1.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_CSI/custom-service-java/README.md b/BMW-Dynatrace-config/CD_CSI/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_CSI/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_CSI/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_CSI/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_CSI/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_CSI/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_CSI/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_CSI/custom-service-java/template-1-1.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_Call-Handling-Backends/custom-service-java/README.md b/BMW-Dynatrace-config/CD_Call-Handling-Backends/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_Call-Handling-Backends/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Call-Handling-Backends/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_Call-Handling-Backends/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_Call-Handling-Backends/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Call-Handling-Backends/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_Call-Handling-Backends/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_Call-Handling-Backends/custom-service-java/template-1-1.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_CallCenterClient/custom-service-java/README.md b/BMW-Dynatrace-config/CD_CallCenterClient/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_CallCenterClient/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_CallCenterClient/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_CallCenterClient/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_CallCenterClient/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_CallCenterClient/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_CallCenterClient/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_CallCenterClient/custom-service-java/template-1-1.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_Connected-Backend-Services/custom-service-java/README.md b/BMW-Dynatrace-config/CD_Connected-Backend-Services/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_Connected-Backend-Services/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Connected-Backend-Services/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_Connected-Backend-Services/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_Connected-Backend-Services/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Connected-Backend-Services/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_Connected-Backend-Services/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_Connected-Backend-Services/custom-service-java/template-1-1.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_Connected-User-Behaviour/custom-service-java/README.md b/BMW-Dynatrace-config/CD_Connected-User-Behaviour/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_Connected-User-Behaviour/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Connected-User-Behaviour/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_Connected-User-Behaviour/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_Connected-User-Behaviour/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Connected-User-Behaviour/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_Connected-User-Behaviour/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_Connected-User-Behaviour/custom-service-java/template-1-1.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_ConnectedDrive-Internet-Portal/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/custom-service-java/template-1-1.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_ContentProvider/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ContentProvider/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ContentProvider/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ContentProvider/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ContentProvider/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ContentProvider/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ContentProvider/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ContentProvider/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ContentProvider/custom-service-java/template-1-1.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_DPP_DPM/custom-service-java/README.md b/BMW-Dynatrace-config/CD_DPP_DPM/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_DPP_DPM/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_DPP_DPM/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_DPP_DPM/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_DPP_DPM/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_DPP_DPM/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_DPP_DPM/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_DPP_DPM/custom-service-java/template-1-1.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_GCDM/custom-service-java/README.md b/BMW-Dynatrace-config/CD_GCDM/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_GCDM/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_GCDM/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_GCDM/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_GCDM/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_GCDM/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_GCDM/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_GCDM/custom-service-java/template-1-1.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_Infotainment-In-Car-Experience-Services/custom-service-java/README.md b/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/custom-service-java/template-1-1.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_LSC-FSU/custom-service-java/README.md b/BMW-Dynatrace-config/CD_LSC-FSU/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_LSC-FSU/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_LSC-FSU/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_LSC-FSU/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_LSC-FSU/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_LSC-FSU/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_LSC-FSU/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_LSC-FSU/custom-service-java/template-1-1.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_LSC/custom-service-java/README.md b/BMW-Dynatrace-config/CD_LSC/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_LSC/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_LSC/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_LSC/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_LSC/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_LSC/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_LSC/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_LSC/custom-service-java/template-1-1.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_Location-Services/custom-service-java/README.md b/BMW-Dynatrace-config/CD_Location-Services/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_Location-Services/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Location-Services/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_Location-Services/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_Location-Services/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Location-Services/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_Location-Services/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_Location-Services/custom-service-java/template-1-1.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_Messaging-Services/custom-service-java/README.md b/BMW-Dynatrace-config/CD_Messaging-Services/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_Messaging-Services/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Messaging-Services/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_Messaging-Services/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_Messaging-Services/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Messaging-Services/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_Messaging-Services/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_Messaging-Services/custom-service-java/template-1-1.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_Mobile_2/custom-service-java/README.md b/BMW-Dynatrace-config/CD_Mobile_2/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_Mobile_2/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Mobile_2/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_Mobile_2/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_Mobile_2/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Mobile_2/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_Mobile_2/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_Mobile_2/custom-service-java/template-1-1.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_Navigation-Information-Services/custom-service-java/README.md b/BMW-Dynatrace-config/CD_Navigation-Information-Services/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_Navigation-Information-Services/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Navigation-Information-Services/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_Navigation-Information-Services/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_Navigation-Information-Services/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Navigation-Information-Services/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_Navigation-Information-Services/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_Navigation-Information-Services/custom-service-java/template-1-1.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_PISA/custom-service-java/README.md b/BMW-Dynatrace-config/CD_PISA/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_PISA/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_PISA/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_PISA/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_PISA/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_PISA/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_PISA/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_PISA/custom-service-java/template-1-1.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_Perseus/custom-service-java/README.md b/BMW-Dynatrace-config/CD_Perseus/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_Perseus/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Perseus/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_Perseus/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_Perseus/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Perseus/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_Perseus/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_Perseus/custom-service-java/template-1-1.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_RemoteServices/custom-service-java/README.md b/BMW-Dynatrace-config/CD_RemoteServices/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_RemoteServices/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_RemoteServices/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_RemoteServices/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_RemoteServices/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_RemoteServices/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_RemoteServices/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_RemoteServices/custom-service-java/template-1-1.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_Service-Bus/custom-service-java/README.md b/BMW-Dynatrace-config/CD_Service-Bus/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_Service-Bus/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Service-Bus/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_Service-Bus/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_Service-Bus/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Service-Bus/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_Service-Bus/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_Service-Bus/custom-service-java/template-1-1.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_Service-Gateway/custom-service-java/README.md b/BMW-Dynatrace-config/CD_Service-Gateway/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_Service-Gateway/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Service-Gateway/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_Service-Gateway/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_Service-Gateway/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Service-Gateway/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_Service-Gateway/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_Service-Gateway/custom-service-java/template-1-1.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_Speech/custom-service-java/README.md b/BMW-Dynatrace-config/CD_Speech/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_Speech/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Speech/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_Speech/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_Speech/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Speech/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_Speech/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_Speech/custom-service-java/template-1-1.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_Voice-Services/custom-service-java/README.md b/BMW-Dynatrace-config/CD_Voice-Services/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_Voice-Services/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Voice-Services/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_Voice-Services/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_Voice-Services/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Voice-Services/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_Voice-Services/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_Voice-Services/custom-service-java/template-1-1.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_agent-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_agent-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_agent-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_agent-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_agent-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_agent-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_agent-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_agent-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_agent-service/custom-service-java/template-1-1.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_aluis/custom-service-java/README.md b/BMW-Dynatrace-config/CD_aluis/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_aluis/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_aluis/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_aluis/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_aluis/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_aluis/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_aluis/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_aluis/custom-service-java/template-1-1.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_am-casa/custom-service-java/README.md b/BMW-Dynatrace-config/CD_am-casa/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_am-casa/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-casa/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_am-casa/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_am-casa/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-casa/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_am-casa/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_am-casa/custom-service-java/template-1-1.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_am-cesim/custom-service-java/README.md b/BMW-Dynatrace-config/CD_am-cesim/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_am-cesim/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-cesim/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_am-cesim/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_am-cesim/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-cesim/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_am-cesim/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_am-cesim/custom-service-java/template-1-1.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_am-cns/custom-service-java/README.md b/BMW-Dynatrace-config/CD_am-cns/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_am-cns/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-cns/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_am-cns/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_am-cns/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-cns/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_am-cns/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_am-cns/custom-service-java/template-1-1.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_am-device/custom-service-java/README.md b/BMW-Dynatrace-config/CD_am-device/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_am-device/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-device/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_am-device/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_am-device/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-device/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_am-device/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_am-device/custom-service-java/template-1-1.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_am-ecs/custom-service-java/README.md b/BMW-Dynatrace-config/CD_am-ecs/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_am-ecs/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-ecs/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_am-ecs/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_am-ecs/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-ecs/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_am-ecs/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_am-ecs/custom-service-java/template-1-1.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_am-egim/custom-service-java/README.md b/BMW-Dynatrace-config/CD_am-egim/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_am-egim/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-egim/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_am-egim/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_am-egim/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-egim/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_am-egim/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_am-egim/custom-service-java/template-1-1.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_am-esim-ui/custom-service-java/README.md b/BMW-Dynatrace-config/CD_am-esim-ui/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_am-esim-ui/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-esim-ui/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_am-esim-ui/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_am-esim-ui/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-esim-ui/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_am-esim-ui/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_am-esim-ui/custom-service-java/template-1-1.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_am-lmcs/custom-service-java/README.md b/BMW-Dynatrace-config/CD_am-lmcs/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_am-lmcs/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-lmcs/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_am-lmcs/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_am-lmcs/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-lmcs/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_am-lmcs/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_am-lmcs/custom-service-java/template-1-1.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_am-mno-manager/custom-service-java/README.md b/BMW-Dynatrace-config/CD_am-mno-manager/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_am-mno-manager/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-mno-manager/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_am-mno-manager/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_am-mno-manager/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-mno-manager/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_am-mno-manager/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_am-mno-manager/custom-service-java/template-1-1.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_am-proxy/custom-service-java/README.md b/BMW-Dynatrace-config/CD_am-proxy/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_am-proxy/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-proxy/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_am-proxy/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_am-proxy/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-proxy/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_am-proxy/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_am-proxy/custom-service-java/template-1-1.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_am-store/custom-service-java/README.md b/BMW-Dynatrace-config/CD_am-store/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_am-store/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-store/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_am-store/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_am-store/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-store/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_am-store/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_am-store/custom-service-java/template-1-1.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_am-svms/custom-service-java/README.md b/BMW-Dynatrace-config/CD_am-svms/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_am-svms/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-svms/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_am-svms/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_am-svms/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-svms/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_am-svms/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_am-svms/custom-service-java/template-1-1.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_am-ui/custom-service-java/README.md b/BMW-Dynatrace-config/CD_am-ui/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_am-ui/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-ui/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_am-ui/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_am-ui/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-ui/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_am-ui/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_am-ui/custom-service-java/template-1-1.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_am-usage/custom-service-java/README.md b/BMW-Dynatrace-config/CD_am-usage/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_am-usage/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-usage/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_am-usage/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_am-usage/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-usage/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_am-usage/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_am-usage/custom-service-java/template-1-1.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_am-vehicle-activation/custom-service-java/README.md b/BMW-Dynatrace-config/CD_am-vehicle-activation/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_am-vehicle-activation/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-vehicle-activation/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_am-vehicle-activation/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_am-vehicle-activation/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-vehicle-activation/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_am-vehicle-activation/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_am-vehicle-activation/custom-service-java/template-1-1.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_am-vms/custom-service-java/README.md b/BMW-Dynatrace-config/CD_am-vms/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_am-vms/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-vms/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_am-vms/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_am-vms/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-vms/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_am-vms/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_am-vms/custom-service-java/template-1-1.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_analytics-user-data-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_analytics-user-data-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_analytics-user-data-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_analytics-user-data-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_analytics-user-data-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_analytics-user-data-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_analytics-user-data-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_analytics-user-data-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_analytics-user-data-service/custom-service-java/template-1-1.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_asbc-pki-oclisc2v/custom-service-java/README.md b/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/custom-service-java/template-1-1.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_asbc-pki-oclisocsp/custom-service-java/README.md b/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/custom-service-java/template-1-1.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_asbc-sfa-oh/custom-service-java/README.md b/BMW-Dynatrace-config/CD_asbc-sfa-oh/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_asbc-sfa-oh/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-sfa-oh/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_asbc-sfa-oh/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_asbc-sfa-oh/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-sfa-oh/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_asbc-sfa-oh/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_asbc-sfa-oh/custom-service-java/template-1-1.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_asbc-sts/custom-service-java/README.md b/BMW-Dynatrace-config/CD_asbc-sts/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_asbc-sts/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-sts/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_asbc-sts/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_asbc-sts/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-sts/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_asbc-sts/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_asbc-sts/custom-service-java/template-1-1.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_asbctvp/custom-service-java/README.md b/BMW-Dynatrace-config/CD_asbctvp/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_asbctvp/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbctvp/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_asbctvp/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_asbctvp/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbctvp/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_asbctvp/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_asbctvp/custom-service-java/template-1-1.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_avs-client-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_avs-client-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_avs-client-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_avs-client-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_avs-client-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_avs-client-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_avs-client-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_avs-client-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_avs-client-service/custom-service-java/template-1-1.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_avs-proxy-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_avs-proxy-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_avs-proxy-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_avs-proxy-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_avs-proxy-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_avs-proxy-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_avs-proxy-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_avs-proxy-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_avs-proxy-composite-service/custom-service-java/template-1-1.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_b2v-com-be/custom-service-java/README.md b/BMW-Dynatrace-config/CD_b2v-com-be/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-be/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-be/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_b2v-com-be/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-be/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-be/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_b2v-com-be/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-be/custom-service-java/template-1-1.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_b2v-com-echo/custom-service-java/README.md b/BMW-Dynatrace-config/CD_b2v-com-echo/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-echo/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-echo/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_b2v-com-echo/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-echo/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-echo/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_b2v-com-echo/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-echo/custom-service-java/template-1-1.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_b2v-com-fe/custom-service-java/README.md b/BMW-Dynatrace-config/CD_b2v-com-fe/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-fe/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-fe/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_b2v-com-fe/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-fe/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-fe/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_b2v-com-fe/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-fe/custom-service-java/template-1-1.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_b2v-com-gcdm-client/custom-service-java/README.md b/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/custom-service-java/template-1-1.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_b2v-com-hello/custom-service-java/README.md b/BMW-Dynatrace-config/CD_b2v-com-hello/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-hello/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-hello/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_b2v-com-hello/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-hello/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-hello/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_b2v-com-hello/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-hello/custom-service-java/template-1-1.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_b2v-nots/custom-service-java/README.md b/BMW-Dynatrace-config/CD_b2v-nots/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_b2v-nots/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-nots/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_b2v-nots/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_b2v-nots/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-nots/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_b2v-nots/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_b2v-nots/custom-service-java/template-1-1.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_b2v-sms-statistics/custom-service-java/README.md b/BMW-Dynatrace-config/CD_b2v-sms-statistics/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_b2v-sms-statistics/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-sms-statistics/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_b2v-sms-statistics/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_b2v-sms-statistics/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-sms-statistics/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_b2v-sms-statistics/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_b2v-sms-statistics/custom-service-java/template-1-1.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_bmw-points-push-notifications-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/custom-service-java/template-1-1.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_bsi-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_bsi-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_bsi-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_bsi-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_bsi-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_bsi-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_bsi-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_bsi-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_bsi-service/custom-service-java/template-1-1.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_cac/custom-service-java/README.md b/BMW-Dynatrace-config/CD_cac/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_cac/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cac/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_cac/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_cac/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cac/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_cac/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_cac/custom-service-java/template-1-1.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_casa-event-processor/custom-service-java/README.md b/BMW-Dynatrace-config/CD_casa-event-processor/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_casa-event-processor/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_casa-event-processor/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_casa-event-processor/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_casa-event-processor/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_casa-event-processor/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_casa-event-processor/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_casa-event-processor/custom-service-java/template-1-1.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_cdc/custom-service-java/README.md b/BMW-Dynatrace-config/CD_cdc/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_cdc/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cdc/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_cdc/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_cdc/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cdc/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_cdc/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_cdc/custom-service-java/template-1-1.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_cdcicd-jenkins/custom-service-java/README.md b/BMW-Dynatrace-config/CD_cdcicd-jenkins/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_cdcicd-jenkins/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cdcicd-jenkins/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_cdcicd-jenkins/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_cdcicd-jenkins/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cdcicd-jenkins/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_cdcicd-jenkins/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_cdcicd-jenkins/custom-service-java/template-1-1.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_chargenow-enabler-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_chargenow-enabler-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_chargenow-enabler-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_chargenow-enabler-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_chargenow-enabler-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_chargenow-enabler-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_chargenow-enabler-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_chargenow-enabler-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_chargenow-enabler-service/custom-service-java/template-1-1.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_charging-data-privacy-composite/custom-service-java/README.md b/BMW-Dynatrace-config/CD_charging-data-privacy-composite/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_charging-data-privacy-composite/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-data-privacy-composite/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_charging-data-privacy-composite/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_charging-data-privacy-composite/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-data-privacy-composite/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_charging-data-privacy-composite/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_charging-data-privacy-composite/custom-service-java/template-1-1.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_charging-data-privacy/custom-service-java/README.md b/BMW-Dynatrace-config/CD_charging-data-privacy/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_charging-data-privacy/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-data-privacy/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_charging-data-privacy/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_charging-data-privacy/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-data-privacy/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_charging-data-privacy/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_charging-data-privacy/custom-service-java/template-1-1.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_charging-events-push-notification-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_charging-events-push-notification-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_charging-events-push-notification-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-events-push-notification-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_charging-events-push-notification-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_charging-events-push-notification-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-events-push-notification-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_charging-events-push-notification-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_charging-events-push-notification-service/custom-service-java/template-1-1.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_charging-events-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_charging-events-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_charging-events-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-events-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_charging-events-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_charging-events-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-events-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_charging-events-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_charging-events-service/custom-service-java/template-1-1.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_charging-history-gdpr-proxy-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/custom-service-java/template-1-1.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_charging-plan-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_charging-plan-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_charging-plan-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-plan-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_charging-plan-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_charging-plan-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-plan-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_charging-plan-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_charging-plan-composite-service/custom-service-java/template-1-1.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_charging-push-notifications-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_charging-push-notifications-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_charging-push-notifications-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-push-notifications-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_charging-push-notifications-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_charging-push-notifications-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-push-notifications-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_charging-push-notifications-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_charging-push-notifications-service/custom-service-java/template-1-1.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_charging-remote-commands-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/custom-service-java/template-1-1.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_charging-sessions-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_charging-sessions-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-sessions-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_charging-sessions-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-sessions-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_charging-sessions-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/custom-service-java/template-1-1.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_charging-stations-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_charging-stations-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_charging-stations-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-stations-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_charging-stations-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_charging-stations-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-stations-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_charging-stations-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_charging-stations-service/custom-service-java/template-1-1.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_client-agent-telemetry-processor/custom-service-java/README.md b/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/custom-service-java/template-1-1.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_client-vehicle-telemetry-processor/custom-service-java/README.md b/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/custom-service-java/template-1-1.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_cm/custom-service-java/README.md b/BMW-Dynatrace-config/CD_cm/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_cm/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cm/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_cm/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_cm/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cm/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_cm/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_cm/custom-service-java/template-1-1.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_commute-notification-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_commute-notification-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_commute-notification-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_commute-notification-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_commute-notification-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_commute-notification-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_commute-notification-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_commute-notification-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_commute-notification-service/custom-service-java/template-1-1.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_commute-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_commute-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_commute-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_commute-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_commute-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_commute-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_commute-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_commute-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_commute-service/custom-service-java/template-1-1.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_connected-oauth-service-apim/custom-service-java/README.md b/BMW-Dynatrace-config/CD_connected-oauth-service-apim/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_connected-oauth-service-apim/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_connected-oauth-service-apim/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_connected-oauth-service-apim/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_connected-oauth-service-apim/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_connected-oauth-service-apim/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_connected-oauth-service-apim/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_connected-oauth-service-apim/custom-service-java/template-1-1.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_connected-oauth-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_connected-oauth-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_connected-oauth-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_connected-oauth-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_connected-oauth-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_connected-oauth-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_connected-oauth-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_connected-oauth-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_connected-oauth-service/custom-service-java/template-1-1.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_connected-onboard-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_connected-onboard-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_connected-onboard-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_connected-onboard-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_connected-onboard-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_connected-onboard-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_connected-onboard-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_connected-onboard-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_connected-onboard-composite-service/custom-service-java/template-1-1.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_csu/custom-service-java/README.md b/BMW-Dynatrace-config/CD_csu/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_csu/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_csu/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_csu/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_csu/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_csu/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_csu/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_csu/custom-service-java/template-1-1.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_ctns-event-origin/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ctns-event-origin/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ctns-event-origin/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ctns-event-origin/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ctns-event-origin/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ctns-event-origin/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ctns-event-origin/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ctns-event-origin/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ctns-event-origin/custom-service-java/template-1-1.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_ctns-marketing-api/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ctns-marketing-api/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ctns-marketing-api/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ctns-marketing-api/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ctns-marketing-api/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ctns-marketing-api/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ctns-marketing-api/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ctns-marketing-api/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ctns-marketing-api/custom-service-java/template-1-1.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_ctns-vehicle-api/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ctns-vehicle-api/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ctns-vehicle-api/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ctns-vehicle-api/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ctns-vehicle-api/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ctns-vehicle-api/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ctns-vehicle-api/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ctns-vehicle-api/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ctns-vehicle-api/custom-service-java/template-1-1.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_current-driver-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_current-driver-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_current-driver-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_current-driver-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_current-driver-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_current-driver-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_current-driver-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_current-driver-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_current-driver-service/custom-service-java/template-1-1.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_data-deletion-processor/custom-service-java/README.md b/BMW-Dynatrace-config/CD_data-deletion-processor/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_data-deletion-processor/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_data-deletion-processor/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_data-deletion-processor/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_data-deletion-processor/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_data-deletion-processor/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_data-deletion-processor/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_data-deletion-processor/custom-service-java/template-1-1.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_dealer-comms-provider-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_dealer-comms-provider-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_dealer-comms-provider-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-comms-provider-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_dealer-comms-provider-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_dealer-comms-provider-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-comms-provider-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_dealer-comms-provider-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_dealer-comms-provider-service/custom-service-java/template-1-1.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_dealer-data-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_dealer-data-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_dealer-data-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-data-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_dealer-data-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_dealer-data-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-data-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_dealer-data-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_dealer-data-service/custom-service-java/template-1-1.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_dealer-payments-invoice-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/custom-service-java/template-1-1.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_dealer-payments-notification-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_dealer-payments-notification-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-notification-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-notification-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_dealer-payments-notification-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-notification-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-notification-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_dealer-payments-notification-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-notification-service/custom-service-java/template-1-1.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_dealer-payments-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_dealer-payments-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_dealer-payments-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_dealer-payments-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-service/custom-service-java/template-1-1.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_dealer-search-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_dealer-search-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_dealer-search-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-search-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_dealer-search-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_dealer-search-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-search-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_dealer-search-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_dealer-search-service/custom-service-java/template-1-1.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_dealer-services-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_dealer-services-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_dealer-services-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-services-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_dealer-services-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_dealer-services-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-services-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_dealer-services-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_dealer-services-composite-service/custom-service-java/template-1-1.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_dealercockpit/custom-service-java/README.md b/BMW-Dynatrace-config/CD_dealercockpit/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_dealercockpit/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealercockpit/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_dealercockpit/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_dealercockpit/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealercockpit/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_dealercockpit/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_dealercockpit/custom-service-java/template-1-1.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_delivery/custom-service-java/README.md b/BMW-Dynatrace-config/CD_delivery/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_delivery/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_delivery/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_delivery/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_delivery/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_delivery/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_delivery/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_delivery/custom-service-java/template-1-1.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_destination-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_destination-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_destination-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_destination-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_destination-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_destination-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_destination-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_destination-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_destination-composite-service/custom-service-java/template-1-1.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_digital-key-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_digital-key-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_digital-key-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_digital-key-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_digital-key-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_digital-key-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_digital-key-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_digital-key-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_digital-key-composite-service/custom-service-java/template-1-1.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_discover-bmw-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_discover-bmw-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_discover-bmw-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_discover-bmw-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_discover-bmw-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_discover-bmw-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_discover-bmw-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_discover-bmw-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_discover-bmw-composite-service/custom-service-java/template-1-1.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_dsd/custom-service-java/README.md b/BMW-Dynatrace-config/CD_dsd/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_dsd/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dsd/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_dsd/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_dsd/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dsd/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_dsd/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_dsd/custom-service-java/template-1-1.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_eadb/custom-service-java/README.md b/BMW-Dynatrace-config/CD_eadb/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_eadb/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_eadb/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_eadb/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_eadb/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_eadb/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_eadb/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_eadb/custom-service-java/template-1-1.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_ercaf/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ercaf/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ercaf/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ercaf/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ercaf/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ercaf/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ercaf/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ercaf/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ercaf/custom-service-java/template-1-1.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_ercr/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ercr/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ercr/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ercr/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ercr/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ercr/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ercr/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ercr/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ercr/custom-service-java/template-1-1.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_erd/custom-service-java/README.md b/BMW-Dynatrace-config/CD_erd/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_erd/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_erd/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_erd/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_erd/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_erd/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_erd/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_erd/custom-service-java/template-1-1.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_esh/custom-service-java/README.md b/BMW-Dynatrace-config/CD_esh/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_esh/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_esh/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_esh/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_esh/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_esh/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_esh/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_esh/custom-service-java/template-1-1.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_esim-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_esim-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_esim-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_esim-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_esim-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_esim-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_esim-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_esim-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_esim-composite-service/custom-service-java/template-1-1.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_explore-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_explore-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_explore-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_explore-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_explore-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_explore-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_explore-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_explore-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_explore-composite-service/custom-service-java/template-1-1.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_feature-toggles-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_feature-toggles-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_feature-toggles-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_feature-toggles-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_feature-toggles-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_feature-toggles-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_feature-toggles-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_feature-toggles-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_feature-toggles-service/custom-service-java/template-1-1.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_fmc/custom-service-java/README.md b/BMW-Dynatrace-config/CD_fmc/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_fmc/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_fmc/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_fmc/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_fmc/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_fmc/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_fmc/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_fmc/custom-service-java/template-1-1.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_fuel-search-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_fuel-search-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_fuel-search-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_fuel-search-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_fuel-search-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_fuel-search-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_fuel-search-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_fuel-search-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_fuel-search-service/custom-service-java/template-1-1.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_hpauth/custom-service-java/README.md b/BMW-Dynatrace-config/CD_hpauth/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_hpauth/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_hpauth/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_hpauth/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_hpauth/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_hpauth/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_hpauth/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_hpauth/custom-service-java/template-1-1.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_hubtab-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_hubtab-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_hubtab-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_hubtab-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_hubtab-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_hubtab-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_hubtab-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_hubtab-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_hubtab-service/custom-service-java/template-1-1.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_id-lookup-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_id-lookup-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_id-lookup-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_id-lookup-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_id-lookup-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_id-lookup-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_id-lookup-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_id-lookup-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_id-lookup-service/custom-service-java/template-1-1.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_ids-admin/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ids-admin/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ids-admin/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-admin/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ids-admin/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ids-admin/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-admin/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ids-admin/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ids-admin/custom-service-java/template-1-1.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_ids-svds/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ids-svds/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ids-svds/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-svds/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ids-svds/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ids-svds/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-svds/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ids-svds/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ids-svds/custom-service-java/template-1-1.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_ids-sync/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ids-sync/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ids-sync/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-sync/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ids-sync/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ids-sync/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-sync/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ids-sync/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ids-sync/custom-service-java/template-1-1.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_ids-ws/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ids-ws/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ids-ws/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-ws/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ids-ws/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ids-ws/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-ws/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ids-ws/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ids-ws/custom-service-java/template-1-1.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_image-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_image-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_image-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_image-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_image-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_image-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_image-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_image-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_image-composite-service/custom-service-java/template-1-1.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_imiles-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_imiles-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_imiles-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_imiles-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_imiles-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_imiles-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_imiles-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_imiles-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_imiles-service/custom-service-java/template-1-1.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_ipa-gateway/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ipa-gateway/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ipa-gateway/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ipa-gateway/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ipa-gateway/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ipa-gateway/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ipa-gateway/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ipa-gateway/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ipa-gateway/custom-service-java/template-1-1.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_jdssp21/custom-service-java/README.md b/BMW-Dynatrace-config/CD_jdssp21/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_jdssp21/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_jdssp21/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_jdssp21/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_jdssp21/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_jdssp21/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_jdssp21/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_jdssp21/custom-service-java/template-1-1.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_legacy-deletion-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_legacy-deletion-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_legacy-deletion-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_legacy-deletion-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_legacy-deletion-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_legacy-deletion-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_legacy-deletion-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_legacy-deletion-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_legacy-deletion-service/custom-service-java/template-1-1.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_legacy-sar-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_legacy-sar-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_legacy-sar-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_legacy-sar-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_legacy-sar-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_legacy-sar-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_legacy-sar-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_legacy-sar-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_legacy-sar-service/custom-service-java/template-1-1.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_legal-document-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_legal-document-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_legal-document-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_legal-document-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_legal-document-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_legal-document-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_legal-document-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_legal-document-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_legal-document-composite-service/custom-service-java/template-1-1.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_log-data-deletion-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_log-data-deletion-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_log-data-deletion-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_log-data-deletion-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_log-data-deletion-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_log-data-deletion-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_log-data-deletion-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_log-data-deletion-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_log-data-deletion-service/custom-service-java/template-1-1.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_lsc-hr/custom-service-java/README.md b/BMW-Dynatrace-config/CD_lsc-hr/custom-service-java/README.md
deleted file mode 100644
index 08702d88..00000000
--- a/BMW-Dynatrace-config/CD_lsc-hr/custom-service-java/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-
-## What is a custom service in Dynatrace?
-- *If your application's services aren't built on standard technologies, they may not be recognized out-of-the box.* 
-- *You can monitor these technologies, but you'll need to define them as custom services with specific service entry points.* 
-- *Another use case for custom services are microservices that are used by a larger application that aren't exposed via communication technologies.*
-
-## How to create a custom service?
-1. Open the file *custom-service-java.yaml* under your *CD_<app_name>/custom-service-java* configuration folder. 
-2. Use customService1 as a template. Copy and paste it below, changing the skipDeployment to "false".
-3. Fill up all the remaining inputs with the details of the endpoint you're interested to monitor. (className, methodName, etc...)
-4. Commit and pull request to merge the branch to the master:
-    `git add <changes>`
-    `git commit -m "<app_name> configuration changes"`
-	`git push -u origin <branch>`
-5. Restart the application where the custom service has been created.
-6. Check if the custom service appears in Dynatrace.
-
-Notes: 
-	- As this configuration needs a restart, it's better to create it in a non-Prod application.
-	- The custom service will appear in Dynatrace iff there's traffic going through. 
-
-## What if i have multiple classes?
-1. Clone *template-1-1.json* to a new one called *template-2-1.json*.
-2. Edit *template-2-1.json* adding a 2nd rule separated with a coma.
-3. For the 2nd rule, change the name of the {{.values}} to {{.values2}} i.e. 
-4. The template is ready to be used in the YAML file.
-
-## What if i have multiple methods?
-1. Same process as before, just call it template-1-2.json
-2. In this way you can extend to a custom service with n classes and k methods: template-n-k.json
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-hr/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_lsc-hr/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_lsc-hr/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-hr/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_lsc-hr/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_lsc-hr/custom-service-java/template-1-1.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_lsc-jr/custom-service-java/README.md b/BMW-Dynatrace-config/CD_lsc-jr/custom-service-java/README.md
deleted file mode 100644
index 08702d88..00000000
--- a/BMW-Dynatrace-config/CD_lsc-jr/custom-service-java/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-
-## What is a custom service in Dynatrace?
-- *If your application's services aren't built on standard technologies, they may not be recognized out-of-the box.* 
-- *You can monitor these technologies, but you'll need to define them as custom services with specific service entry points.* 
-- *Another use case for custom services are microservices that are used by a larger application that aren't exposed via communication technologies.*
-
-## How to create a custom service?
-1. Open the file *custom-service-java.yaml* under your *CD_<app_name>/custom-service-java* configuration folder. 
-2. Use customService1 as a template. Copy and paste it below, changing the skipDeployment to "false".
-3. Fill up all the remaining inputs with the details of the endpoint you're interested to monitor. (className, methodName, etc...)
-4. Commit and pull request to merge the branch to the master:
-    `git add <changes>`
-    `git commit -m "<app_name> configuration changes"`
-	`git push -u origin <branch>`
-5. Restart the application where the custom service has been created.
-6. Check if the custom service appears in Dynatrace.
-
-Notes: 
-	- As this configuration needs a restart, it's better to create it in a non-Prod application.
-	- The custom service will appear in Dynatrace iff there's traffic going through. 
-
-## What if i have multiple classes?
-1. Clone *template-1-1.json* to a new one called *template-2-1.json*.
-2. Edit *template-2-1.json* adding a 2nd rule separated with a coma.
-3. For the 2nd rule, change the name of the {{.values}} to {{.values2}} i.e. 
-4. The template is ready to be used in the YAML file.
-
-## What if i have multiple methods?
-1. Same process as before, just call it template-1-2.json
-2. In this way you can extend to a custom service with n classes and k methods: template-n-k.json
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-jr/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_lsc-jr/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_lsc-jr/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-jr/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_lsc-jr/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_lsc-jr/custom-service-java/template-1-1.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_lsc-kc/custom-service-java/README.md b/BMW-Dynatrace-config/CD_lsc-kc/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_lsc-kc/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-kc/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_lsc-kc/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_lsc-kc/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-kc/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_lsc-kc/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_lsc-kc/custom-service-java/template-1-1.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_lsc-mm/custom-service-java/README.md b/BMW-Dynatrace-config/CD_lsc-mm/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_lsc-mm/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-mm/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_lsc-mm/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_lsc-mm/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-mm/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_lsc-mm/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_lsc-mm/custom-service-java/template-1-1.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_lsc-oc/custom-service-java/README.md b/BMW-Dynatrace-config/CD_lsc-oc/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_lsc-oc/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-oc/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_lsc-oc/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_lsc-oc/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-oc/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_lsc-oc/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_lsc-oc/custom-service-java/template-1-1.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_lsc-og/custom-service-java/README.md b/BMW-Dynatrace-config/CD_lsc-og/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_lsc-og/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-og/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_lsc-og/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_lsc-og/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-og/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_lsc-og/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_lsc-og/custom-service-java/template-1-1.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_lsc-wo/custom-service-java/README.md b/BMW-Dynatrace-config/CD_lsc-wo/custom-service-java/README.md
deleted file mode 100644
index 08702d88..00000000
--- a/BMW-Dynatrace-config/CD_lsc-wo/custom-service-java/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-
-## What is a custom service in Dynatrace?
-- *If your application's services aren't built on standard technologies, they may not be recognized out-of-the box.* 
-- *You can monitor these technologies, but you'll need to define them as custom services with specific service entry points.* 
-- *Another use case for custom services are microservices that are used by a larger application that aren't exposed via communication technologies.*
-
-## How to create a custom service?
-1. Open the file *custom-service-java.yaml* under your *CD_<app_name>/custom-service-java* configuration folder. 
-2. Use customService1 as a template. Copy and paste it below, changing the skipDeployment to "false".
-3. Fill up all the remaining inputs with the details of the endpoint you're interested to monitor. (className, methodName, etc...)
-4. Commit and pull request to merge the branch to the master:
-    `git add <changes>`
-    `git commit -m "<app_name> configuration changes"`
-	`git push -u origin <branch>`
-5. Restart the application where the custom service has been created.
-6. Check if the custom service appears in Dynatrace.
-
-Notes: 
-	- As this configuration needs a restart, it's better to create it in a non-Prod application.
-	- The custom service will appear in Dynatrace iff there's traffic going through. 
-
-## What if i have multiple classes?
-1. Clone *template-1-1.json* to a new one called *template-2-1.json*.
-2. Edit *template-2-1.json* adding a 2nd rule separated with a coma.
-3. For the 2nd rule, change the name of the {{.values}} to {{.values2}} i.e. 
-4. The template is ready to be used in the YAML file.
-
-## What if i have multiple methods?
-1. Same process as before, just call it template-1-2.json
-2. In this way you can extend to a custom service with n classes and k methods: template-n-k.json
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-wo/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_lsc-wo/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_lsc-wo/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-wo/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_lsc-wo/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_lsc-wo/custom-service-java/template-1-1.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_mds/custom-service-java/README.md b/BMW-Dynatrace-config/CD_mds/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_mds/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mds/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_mds/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_mds/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mds/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_mds/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_mds/custom-service-java/template-1-1.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_ml-ingestion-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ml-ingestion-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ml-ingestion-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ml-ingestion-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ml-ingestion-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ml-ingestion-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ml-ingestion-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ml-ingestion-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ml-ingestion-service/custom-service-java/template-1-1.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_mlc/custom-service-java/README.md b/BMW-Dynatrace-config/CD_mlc/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_mlc/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mlc/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_mlc/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_mlc/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mlc/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_mlc/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_mlc/custom-service-java/template-1-1.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_mrp/custom-service-java/README.md b/BMW-Dynatrace-config/CD_mrp/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_mrp/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mrp/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_mrp/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_mrp/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mrp/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_mrp/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_mrp/custom-service-java/template-1-1.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_mrpspringboot/custom-service-java/README.md b/BMW-Dynatrace-config/CD_mrpspringboot/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_mrpspringboot/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mrpspringboot/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_mrpspringboot/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_mrpspringboot/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mrpspringboot/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_mrpspringboot/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_mrpspringboot/custom-service-java/template-1-1.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_nop-admin/custom-service-java/README.md b/BMW-Dynatrace-config/CD_nop-admin/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_nop-admin/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-admin/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_nop-admin/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_nop-admin/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-admin/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_nop-admin/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_nop-admin/custom-service-java/template-1-1.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_nop-archive/custom-service-java/README.md b/BMW-Dynatrace-config/CD_nop-archive/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_nop-archive/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-archive/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_nop-archive/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_nop-archive/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-archive/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_nop-archive/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_nop-archive/custom-service-java/template-1-1.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_nop-provisioning/custom-service-java/README.md b/BMW-Dynatrace-config/CD_nop-provisioning/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_nop-provisioning/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-provisioning/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_nop-provisioning/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_nop-provisioning/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-provisioning/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_nop-provisioning/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_nop-provisioning/custom-service-java/template-1-1.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_nop-trigger/custom-service-java/README.md b/BMW-Dynatrace-config/CD_nop-trigger/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_nop-trigger/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-trigger/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_nop-trigger/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_nop-trigger/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-trigger/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_nop-trigger/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_nop-trigger/custom-service-java/template-1-1.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_notification-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_notification-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_notification-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_notification-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_notification-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_notification-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_notification-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_notification-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_notification-composite-service/custom-service-java/template-1-1.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_notification-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_notification-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_notification-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_notification-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_notification-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_notification-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_notification-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_notification-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_notification-service/custom-service-java/template-1-1.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_oas-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_oas-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_oas-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_oas-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_oas-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_oas-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_oas-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_oas-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_oas-composite-service/custom-service-java/template-1-1.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_oclisc2v/custom-service-java/README.md b/BMW-Dynatrace-config/CD_oclisc2v/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_oclisc2v/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_oclisc2v/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_oclisc2v/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_oclisc2v/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_oclisc2v/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_oclisc2v/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_oclisc2v/custom-service-java/template-1-1.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_oclisocsp/custom-service-java/README.md b/BMW-Dynatrace-config/CD_oclisocsp/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_oclisocsp/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_oclisocsp/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_oclisocsp/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_oclisocsp/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_oclisocsp/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_oclisocsp/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_oclisocsp/custom-service-java/template-1-1.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_omc-cd-services/custom-service-java/README.md b/BMW-Dynatrace-config/CD_omc-cd-services/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_omc-cd-services/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_omc-cd-services/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_omc-cd-services/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_omc-cd-services/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_omc-cd-services/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_omc-cd-services/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_omc-cd-services/custom-service-java/template-1-1.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_omg/custom-service-java/README.md b/BMW-Dynatrace-config/CD_omg/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_omg/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_omg/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_omg/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_omg/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_omg/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_omg/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_omg/custom-service-java/template-1-1.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_onboard-navigation-sync-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/custom-service-java/template-1-1.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_online-appointment-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_online-appointment-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_online-appointment-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_online-appointment-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_online-appointment-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_online-appointment-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_online-appointment-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_online-appointment-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_online-appointment-service/custom-service-java/template-1-1.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_online-entertainment/custom-service-java/README.md b/BMW-Dynatrace-config/CD_online-entertainment/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_online-entertainment/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_online-entertainment/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_online-entertainment/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_online-entertainment/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_online-entertainment/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_online-entertainment/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_online-entertainment/custom-service-java/template-1-1.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_pdmmanager/custom-service-java/README.md b/BMW-Dynatrace-config/CD_pdmmanager/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_pdmmanager/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_pdmmanager/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_pdmmanager/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_pdmmanager/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_pdmmanager/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_pdmmanager/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_pdmmanager/custom-service-java/template-1-1.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_personal-data-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_personal-data-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_personal-data-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_personal-data-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_personal-data-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_personal-data-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_personal-data-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_personal-data-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_personal-data-service/custom-service-java/template-1-1.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_pmuimapper-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_pmuimapper-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_pmuimapper-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_pmuimapper-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_pmuimapper-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_pmuimapper-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_pmuimapper-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_pmuimapper-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_pmuimapper-service/custom-service-java/template-1-1.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_private-charging-tariffs-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/custom-service-java/template-1-1.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_private-charging-tariffs-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_private-charging-tariffs-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_private-charging-tariffs-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_private-charging-tariffs-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_private-charging-tariffs-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_private-charging-tariffs-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_private-charging-tariffs-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_private-charging-tariffs-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_private-charging-tariffs-service/custom-service-java/template-1-1.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_push-notification-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_push-notification-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_push-notification-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_push-notification-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_push-notification-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_push-notification-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_push-notification-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_push-notification-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_push-notification-service/custom-service-java/template-1-1.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_push-notification-settings-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/custom-service-java/template-1-1.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_recall-analytics-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_recall-analytics-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_recall-analytics-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-analytics-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_recall-analytics-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_recall-analytics-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-analytics-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_recall-analytics-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_recall-analytics-service/custom-service-java/template-1-1.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_recall-client-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_recall-client-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_recall-client-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-client-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_recall-client-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_recall-client-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-client-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_recall-client-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_recall-client-service/custom-service-java/template-1-1.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_recall-handler-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_recall-handler-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_recall-handler-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-handler-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_recall-handler-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_recall-handler-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-handler-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_recall-handler-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_recall-handler-service/custom-service-java/template-1-1.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_recall-notification-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_recall-notification-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_recall-notification-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-notification-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_recall-notification-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_recall-notification-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-notification-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_recall-notification-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_recall-notification-service/custom-service-java/template-1-1.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_recall-scheduler-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_recall-scheduler-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_recall-scheduler-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-scheduler-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_recall-scheduler-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_recall-scheduler-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-scheduler-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_recall-scheduler-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_recall-scheduler-service/custom-service-java/template-1-1.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_recall-tcn-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_recall-tcn-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_recall-tcn-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-tcn-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_recall-tcn-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_recall-tcn-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-tcn-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_recall-tcn-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_recall-tcn-service/custom-service-java/template-1-1.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_remote-360-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_remote-360-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_remote-360-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-360-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_remote-360-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_remote-360-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-360-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_remote-360-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_remote-360-composite-service/custom-service-java/template-1-1.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_remote-service-event-processor/custom-service-java/README.md b/BMW-Dynatrace-config/CD_remote-service-event-processor/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_remote-service-event-processor/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-service-event-processor/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_remote-service-event-processor/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_remote-service-event-processor/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-service-event-processor/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_remote-service-event-processor/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_remote-service-event-processor/custom-service-java/template-1-1.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_remote-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_remote-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_remote-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_remote-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_remote-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_remote-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_remote-service/custom-service-java/template-1-1.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_remote-software-upgrade/custom-service-java/README.md b/BMW-Dynatrace-config/CD_remote-software-upgrade/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_remote-software-upgrade/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-software-upgrade/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_remote-software-upgrade/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_remote-software-upgrade/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-software-upgrade/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_remote-software-upgrade/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_remote-software-upgrade/custom-service-java/template-1-1.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_roadside-assistance-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/custom-service-java/template-1-1.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_roadside-assistance/custom-service-java/README.md b/BMW-Dynatrace-config/CD_roadside-assistance/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_roadside-assistance/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_roadside-assistance/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_roadside-assistance/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_roadside-assistance/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_roadside-assistance/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_roadside-assistance/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_roadside-assistance/custom-service-java/template-1-1.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_rsu-adapter/custom-service-java/README.md b/BMW-Dynatrace-config/CD_rsu-adapter/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_rsu-adapter/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_rsu-adapter/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_rsu-adapter/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_rsu-adapter/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_rsu-adapter/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_rsu-adapter/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_rsu-adapter/custom-service-java/template-1-1.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_rsu/custom-service-java/README.md b/BMW-Dynatrace-config/CD_rsu/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_rsu/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_rsu/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_rsu/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_rsu/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_rsu/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_rsu/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_rsu/custom-service-java/template-1-1.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_sbr/custom-service-java/README.md b/BMW-Dynatrace-config/CD_sbr/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_sbr/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sbr/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_sbr/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_sbr/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sbr/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_sbr/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_sbr/custom-service-java/template-1-1.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_scb/custom-service-java/README.md b/BMW-Dynatrace-config/CD_scb/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_scb/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scb/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_scb/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_scb/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scb/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_scb/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_scb/custom-service-java/template-1-1.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_scc/custom-service-java/README.md b/BMW-Dynatrace-config/CD_scc/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_scc/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scc/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_scc/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_scc/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scc/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_scc/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_scc/custom-service-java/template-1-1.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_scm-agentreg/custom-service-java/README.md b/BMW-Dynatrace-config/CD_scm-agentreg/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_scm-agentreg/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scm-agentreg/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_scm-agentreg/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_scm-agentreg/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scm-agentreg/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_scm-agentreg/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_scm-agentreg/custom-service-java/template-1-1.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_scm-scm/custom-service-java/README.md b/BMW-Dynatrace-config/CD_scm-scm/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_scm-scm/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scm-scm/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_scm-scm/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_scm-scm/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scm-scm/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_scm-scm/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_scm-scm/custom-service-java/template-1-1.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_scma-backend/custom-service-java/README.md b/BMW-Dynatrace-config/CD_scma-backend/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_scma-backend/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scma-backend/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_scma-backend/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_scma-backend/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scma-backend/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_scma-backend/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_scma-backend/custom-service-java/template-1-1.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_seam-event-consumer/custom-service-java/README.md b/BMW-Dynatrace-config/CD_seam-event-consumer/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_seam-event-consumer/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_seam-event-consumer/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_seam-event-consumer/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_seam-event-consumer/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_seam-event-consumer/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_seam-event-consumer/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_seam-event-consumer/custom-service-java/template-1-1.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_seam-event-producer/custom-service-java/README.md b/BMW-Dynatrace-config/CD_seam-event-producer/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_seam-event-producer/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_seam-event-producer/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_seam-event-producer/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_seam-event-producer/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_seam-event-producer/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_seam-event-producer/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_seam-event-producer/custom-service-java/template-1-1.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_search-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_search-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_search-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_search-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_search-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_search-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_search-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_search-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_search-composite-service/custom-service-java/template-1-1.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_send-to-car-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_send-to-car-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_send-to-car-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_send-to-car-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_send-to-car-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_send-to-car-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_send-to-car-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_send-to-car-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_send-to-car-service/custom-service-java/template-1-1.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_service-manager/custom-service-java/README.md b/BMW-Dynatrace-config/CD_service-manager/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_service-manager/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_service-manager/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_service-manager/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_service-manager/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_service-manager/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_service-manager/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_service-manager/custom-service-java/template-1-1.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_service-notification-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_service-notification-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_service-notification-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_service-notification-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_service-notification-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_service-notification-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_service-notification-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_service-notification-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_service-notification-service/custom-service-java/template-1-1.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_sfa-fre/custom-service-java/README.md b/BMW-Dynatrace-config/CD_sfa-fre/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_sfa-fre/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa-fre/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_sfa-fre/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_sfa-fre/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa-fre/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_sfa-fre/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_sfa-fre/custom-service-java/template-1-1.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_sfa-ota/custom-service-java/README.md b/BMW-Dynatrace-config/CD_sfa-ota/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_sfa-ota/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa-ota/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_sfa-ota/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_sfa-ota/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa-ota/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_sfa-ota/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_sfa-ota/custom-service-java/template-1-1.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_sfa-vs/custom-service-java/README.md b/BMW-Dynatrace-config/CD_sfa-vs/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_sfa-vs/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa-vs/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_sfa-vs/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_sfa-vs/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa-vs/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_sfa-vs/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_sfa-vs/custom-service-java/template-1-1.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_sfa/custom-service-java/README.md b/BMW-Dynatrace-config/CD_sfa/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_sfa/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_sfa/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_sfa/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_sfa/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_sfa/custom-service-java/template-1-1.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_smart-access-order-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_smart-access-order-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_smart-access-order-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_smart-access-order-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_smart-access-order-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_smart-access-order-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_smart-access-order-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_smart-access-order-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_smart-access-order-service/custom-service-java/template-1-1.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_sms-email-adapter-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_sms-email-adapter-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_sms-email-adapter-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sms-email-adapter-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_sms-email-adapter-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_sms-email-adapter-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sms-email-adapter-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_sms-email-adapter-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_sms-email-adapter-service/custom-service-java/template-1-1.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_srmanager/custom-service-java/README.md b/BMW-Dynatrace-config/CD_srmanager/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_srmanager/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_srmanager/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_srmanager/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_srmanager/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_srmanager/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_srmanager/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_srmanager/custom-service-java/template-1-1.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_stm/custom-service-java/README.md b/BMW-Dynatrace-config/CD_stm/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_stm/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_stm/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_stm/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_stm/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_stm/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_stm/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_stm/custom-service-java/template-1-1.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_svcinfo/custom-service-java/README.md b/BMW-Dynatrace-config/CD_svcinfo/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_svcinfo/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_svcinfo/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_svcinfo/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_svcinfo/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_svcinfo/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_svcinfo/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_svcinfo/custom-service-java/template-1-1.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_timer-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_timer-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_timer-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_timer-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_timer-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_timer-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_timer-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_timer-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_timer-service/custom-service-java/template-1-1.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_timers-processor/custom-service-java/README.md b/BMW-Dynatrace-config/CD_timers-processor/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_timers-processor/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_timers-processor/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_timers-processor/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_timers-processor/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_timers-processor/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_timers-processor/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_timers-processor/custom-service-java/template-1-1.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_token-exchanger-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_token-exchanger-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_token-exchanger-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_token-exchanger-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_token-exchanger-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_token-exchanger-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_token-exchanger-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_token-exchanger-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_token-exchanger-service/custom-service-java/template-1-1.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_tol-mgu/custom-service-java/README.md b/BMW-Dynatrace-config/CD_tol-mgu/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_tol-mgu/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tol-mgu/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_tol-mgu/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_tol-mgu/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tol-mgu/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_tol-mgu/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_tol-mgu/custom-service-java/template-1-1.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_tol-tssb/custom-service-java/README.md b/BMW-Dynatrace-config/CD_tol-tssb/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_tol-tssb/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tol-tssb/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_tol-tssb/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_tol-tssb/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tol-tssb/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_tol-tssb/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_tol-tssb/custom-service-java/template-1-1.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_tol/custom-service-java/README.md b/BMW-Dynatrace-config/CD_tol/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_tol/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tol/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_tol/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_tol/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tol/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_tol/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_tol/custom-service-java/template-1-1.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_trip-change-processor/custom-service-java/README.md b/BMW-Dynatrace-config/CD_trip-change-processor/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_trip-change-processor/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-change-processor/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_trip-change-processor/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_trip-change-processor/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-change-processor/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_trip-change-processor/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_trip-change-processor/custom-service-java/template-1-1.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_trip-cleanup-app-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_trip-cleanup-app-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_trip-cleanup-app-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-cleanup-app-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_trip-cleanup-app-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_trip-cleanup-app-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-cleanup-app-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_trip-cleanup-app-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_trip-cleanup-app-service/custom-service-java/template-1-1.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_trip-monitor-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_trip-monitor-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_trip-monitor-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-monitor-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_trip-monitor-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_trip-monitor-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-monitor-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_trip-monitor-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_trip-monitor-service/custom-service-java/template-1-1.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_trip-reminder-processor/custom-service-java/README.md b/BMW-Dynatrace-config/CD_trip-reminder-processor/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_trip-reminder-processor/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-reminder-processor/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_trip-reminder-processor/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_trip-reminder-processor/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-reminder-processor/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_trip-reminder-processor/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_trip-reminder-processor/custom-service-java/template-1-1.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_trip-route-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_trip-route-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_trip-route-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-route-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_trip-route-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_trip-route-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-route-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_trip-route-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_trip-route-service/custom-service-java/template-1-1.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_trip-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_trip-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_trip-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_trip-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_trip-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_trip-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_trip-service/custom-service-java/template-1-1.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_ts-bcallservice/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-bcallservice/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-bcallservice/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bcallservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-bcallservice/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-bcallservice/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bcallservice/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-bcallservice/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-bcallservice/custom-service-java/template-1-1.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_ts-bt/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-bt/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-bt/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bt/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-bt/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-bt/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bt/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-bt/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-bt/custom-service-java/template-1-1.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_ts-bti/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-bti/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-bti/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bti/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-bti/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-bti/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bti/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-bti/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-bti/custom-service-java/template-1-1.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_ts-cas-spm/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-cas-spm/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-cas-spm/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-cas-spm/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-cas-spm/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-cas-spm/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-cas-spm/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-cas-spm/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-cas-spm/custom-service-java/template-1-1.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_ts-cas-stm/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-cas-stm/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-cas-stm/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-cas-stm/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-cas-stm/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-cas-stm/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-cas-stm/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-cas-stm/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-cas-stm/custom-service-java/template-1-1.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_ts-datadispatcher/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-datadispatcher/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-datadispatcher/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-datadispatcher/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-datadispatcher/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-datadispatcher/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-datadispatcher/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-datadispatcher/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-datadispatcher/custom-service-java/template-1-1.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_ts-diagservice/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-diagservice/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-diagservice/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-diagservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-diagservice/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-diagservice/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-diagservice/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-diagservice/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-diagservice/custom-service-java/template-1-1.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_ts-eshad/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-eshad/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-eshad/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-eshad/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-eshad/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-eshad/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-eshad/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-eshad/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-eshad/custom-service-java/template-1-1.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_ts-message-receiver/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-message-receiver/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-message-receiver/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-message-receiver/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-message-receiver/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-message-receiver/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-message-receiver/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-message-receiver/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-message-receiver/custom-service-java/template-1-1.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_ts-pdmupdater/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-pdmupdater/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-pdmupdater/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-pdmupdater/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-pdmupdater/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-pdmupdater/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-pdmupdater/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-pdmupdater/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-pdmupdater/custom-service-java/template-1-1.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_ts-pservice/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-pservice/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-pservice/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-pservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-pservice/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-pservice/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-pservice/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-pservice/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-pservice/custom-service-java/template-1-1.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_ts-remotediagnosis/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-remotediagnosis/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-remotediagnosis/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-remotediagnosis/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-remotediagnosis/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-remotediagnosis/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-remotediagnosis/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-remotediagnosis/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-remotediagnosis/custom-service-java/template-1-1.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_ts-rsurservice/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-rsurservice/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-rsurservice/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rsurservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-rsurservice/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-rsurservice/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rsurservice/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-rsurservice/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-rsurservice/custom-service-java/template-1-1.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_ts-rtcadapter/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-rtcadapter/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtcadapter/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rtcadapter/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-rtcadapter/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtcadapter/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rtcadapter/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-rtcadapter/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtcadapter/custom-service-java/template-1-1.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_ts-rtchandler/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-rtchandler/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtchandler/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rtchandler/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-rtchandler/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtchandler/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rtchandler/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-rtchandler/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtchandler/custom-service-java/template-1-1.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_ts-rtcservice/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-rtcservice/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtcservice/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rtcservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-rtcservice/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtcservice/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rtcservice/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-rtcservice/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtcservice/custom-service-java/template-1-1.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_ts-scallservice/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-scallservice/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-scallservice/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-scallservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-scallservice/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-scallservice/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-scallservice/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-scallservice/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-scallservice/custom-service-java/template-1-1.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_ts-tsbgam/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-tsbgam/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsbgam/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsbgam/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-tsbgam/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsbgam/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsbgam/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-tsbgam/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsbgam/custom-service-java/template-1-1.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_ts-tsbgservice/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-tsbgservice/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsbgservice/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsbgservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-tsbgservice/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsbgservice/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsbgservice/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-tsbgservice/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsbgservice/custom-service-java/template-1-1.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_ts-tsp/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-tsp/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsp/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsp/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-tsp/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsp/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsp/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-tsp/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsp/custom-service-java/template-1-1.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_ts-wlupdater/custom-service-java/README.md b/BMW-Dynatrace-config/CD_ts-wlupdater/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_ts-wlupdater/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-wlupdater/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_ts-wlupdater/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_ts-wlupdater/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-wlupdater/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_ts-wlupdater/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_ts-wlupdater/custom-service-java/template-1-1.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_tscs/custom-service-java/README.md b/BMW-Dynatrace-config/CD_tscs/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_tscs/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tscs/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_tscs/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_tscs/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tscs/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_tscs/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_tscs/custom-service-java/template-1-1.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_tsmb/custom-service-java/README.md b/BMW-Dynatrace-config/CD_tsmb/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_tsmb/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsmb/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_tsmb/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_tsmb/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsmb/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_tsmb/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_tsmb/custom-service-java/template-1-1.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_tsr-cmr/custom-service-java/README.md b/BMW-Dynatrace-config/CD_tsr-cmr/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_tsr-cmr/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsr-cmr/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_tsr-cmr/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_tsr-cmr/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsr-cmr/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_tsr-cmr/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_tsr-cmr/custom-service-java/template-1-1.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_tsr-dd/custom-service-java/README.md b/BMW-Dynatrace-config/CD_tsr-dd/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_tsr-dd/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsr-dd/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_tsr-dd/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_tsr-dd/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsr-dd/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_tsr-dd/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_tsr-dd/custom-service-java/template-1-1.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_tsr-vu/custom-service-java/README.md b/BMW-Dynatrace-config/CD_tsr-vu/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_tsr-vu/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsr-vu/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_tsr-vu/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_tsr-vu/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsr-vu/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_tsr-vu/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_tsr-vu/custom-service-java/template-1-1.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_tsrservice/custom-service-java/README.md b/BMW-Dynatrace-config/CD_tsrservice/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_tsrservice/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsrservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_tsrservice/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_tsrservice/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsrservice/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_tsrservice/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_tsrservice/custom-service-java/template-1-1.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_user-activity-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_user-activity-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_user-activity-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-activity-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_user-activity-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_user-activity-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-activity-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_user-activity-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_user-activity-service/custom-service-java/template-1-1.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_user-attributes-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_user-attributes-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_user-attributes-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-attributes-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_user-attributes-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_user-attributes-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-attributes-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_user-attributes-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_user-attributes-service/custom-service-java/template-1-1.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_user-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_user-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_user-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_user-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_user-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_user-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_user-composite-service/custom-service-java/template-1-1.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_user-delete-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_user-delete-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_user-delete-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-delete-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_user-delete-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_user-delete-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-delete-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_user-delete-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_user-delete-service/custom-service-java/template-1-1.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_user-position-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_user-position-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_user-position-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-position-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_user-position-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_user-position-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-position-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_user-position-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_user-position-service/custom-service-java/template-1-1.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_user-profile-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_user-profile-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_user-profile-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-profile-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_user-profile-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_user-profile-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-profile-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_user-profile-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_user-profile-service/custom-service-java/template-1-1.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_usid-filter-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_usid-filter-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_usid-filter-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_usid-filter-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_usid-filter-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_usid-filter-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_usid-filter-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_usid-filter-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_usid-filter-service/custom-service-java/template-1-1.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_vehicle-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_vehicle-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_vehicle-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_vehicle-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-composite-service/custom-service-java/template-1-1.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_vehicle-features-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_vehicle-features-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-features-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-features-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_vehicle-features-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-features-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-features-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_vehicle-features-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-features-service/custom-service-java/template-1-1.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_vehicle-list-proxy-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/custom-service-java/template-1-1.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_vehicle-mapping-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/custom-service-java/template-1-1.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_vehicle-mapping-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_vehicle-mapping-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-mapping-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-mapping-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_vehicle-mapping-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-mapping-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-mapping-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_vehicle-mapping-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-mapping-service/custom-service-java/template-1-1.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_vehicle-remote-commands-composite-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/custom-service-java/template-1-1.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_vehicle-service-alert/custom-service-java/README.md b/BMW-Dynatrace-config/CD_vehicle-service-alert/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-alert/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-alert/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_vehicle-service-alert/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-alert/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-alert/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_vehicle-service-alert/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-alert/custom-service-java/template-1-1.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_vehicle-service-background/custom-service-java/README.md b/BMW-Dynatrace-config/CD_vehicle-service-background/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-background/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-background/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_vehicle-service-background/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-background/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-background/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_vehicle-service-background/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-background/custom-service-java/template-1-1.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_vehicle-service-staging/custom-service-java/README.md b/BMW-Dynatrace-config/CD_vehicle-service-staging/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-staging/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-staging/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_vehicle-service-staging/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-staging/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-staging/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_vehicle-service-staging/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-staging/custom-service-java/template-1-1.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_vehicle-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_vehicle-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_vehicle-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_vehicle-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service/custom-service-java/template-1-1.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_vehicle-shadow-event-processor/custom-service-java/README.md b/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/custom-service-java/template-1-1.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_vehicle-status-proxy-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/custom-service-java/template-1-1.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_vehicle-user-relationship-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/custom-service-java/template-1-1.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_vin-list-generator-service/custom-service-java/README.md b/BMW-Dynatrace-config/CD_vin-list-generator-service/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_vin-list-generator-service/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vin-list-generator-service/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_vin-list-generator-service/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_vin-list-generator-service/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vin-list-generator-service/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_vin-list-generator-service/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_vin-list-generator-service/custom-service-java/template-1-1.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_vps-admin/custom-service-java/README.md b/BMW-Dynatrace-config/CD_vps-admin/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_vps-admin/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-admin/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_vps-admin/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_vps-admin/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-admin/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_vps-admin/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_vps-admin/custom-service-java/template-1-1.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_vps-archive/custom-service-java/README.md b/BMW-Dynatrace-config/CD_vps-archive/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_vps-archive/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-archive/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_vps-archive/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_vps-archive/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-archive/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_vps-archive/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_vps-archive/custom-service-java/template-1-1.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_vps-monitor/custom-service-java/README.md b/BMW-Dynatrace-config/CD_vps-monitor/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_vps-monitor/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-monitor/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_vps-monitor/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_vps-monitor/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-monitor/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_vps-monitor/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_vps-monitor/custom-service-java/template-1-1.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_vps-prov/custom-service-java/README.md b/BMW-Dynatrace-config/CD_vps-prov/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_vps-prov/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-prov/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_vps-prov/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_vps-prov/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-prov/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_vps-prov/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_vps-prov/custom-service-java/template-1-1.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_vps-trigger/custom-service-java/README.md b/BMW-Dynatrace-config/CD_vps-trigger/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_vps-trigger/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-trigger/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_vps-trigger/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_vps-trigger/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-trigger/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_vps-trigger/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_vps-trigger/custom-service-java/template-1-1.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_vs-api/custom-service-java/README.md b/BMW-Dynatrace-config/CD_vs-api/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_vs-api/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vs-api/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_vs-api/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_vs-api/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vs-api/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_vs-api/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_vs-api/custom-service-java/template-1-1.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_webapi/custom-service-java/README.md b/BMW-Dynatrace-config/CD_webapi/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_webapi/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_webapi/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_webapi/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_webapi/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_webapi/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_webapi/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_webapi/custom-service-java/template-1-1.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_wlmanager/custom-service-java/README.md b/BMW-Dynatrace-config/CD_wlmanager/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_wlmanager/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_wlmanager/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_wlmanager/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_wlmanager/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_wlmanager/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_wlmanager/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_wlmanager/custom-service-java/template-1-1.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_xfcd/custom-service-java/README.md b/BMW-Dynatrace-config/CD_xfcd/custom-service-java/README.md
deleted file mode 100644
index 5f35e5c1..00000000
--- a/BMW-Dynatrace-config/CD_xfcd/custom-service-java/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure custom services?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_xfcd/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_xfcd/custom-service-java/custom-service-java.yaml
deleted file mode 100644
index 25f8a028..00000000
--- a/BMW-Dynatrace-config/CD_xfcd/custom-service-java/custom-service-java.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-config:
-- customService1: template-1-1.json
-
-customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_xfcd/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_xfcd/custom-service-java/template-1-1.json
deleted file mode 100644
index b3003515..00000000
--- a/BMW-Dynatrace-config/CD_xfcd/custom-service-java/template-1-1.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