diff --git a/BMW-Dynatrace-config/CD_APIGW/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_APIGW/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_APIGW/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_APIGW/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_APIGW/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index b928a3e7..00000000
--- a/BMW-Dynatrace-config/CD_APIGW/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDAPIGW: template.json
-
-CDAPIGW:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: APIGW
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_APIGW/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_APIGW/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_APIGW/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_APIGW/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_APIGW/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_APIGW/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_APIGW/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_APIGW/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index b928a3e7..00000000
--- a/BMW-Dynatrace-config/CD_APIGW/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDAPIGW: template.json
-
-CDAPIGW:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: APIGW
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_APIGW/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_APIGW/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_APIGW/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_APIM/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_APIM/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_APIM/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_APIM/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_APIM/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index c81eaf9c..00000000
--- a/BMW-Dynatrace-config/CD_APIM/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDAPIM: template.json
-
-CDAPIM:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: APIM
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_APIM/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_APIM/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_APIM/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_APIM/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_APIM/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_APIM/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_APIM/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_APIM/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index c81eaf9c..00000000
--- a/BMW-Dynatrace-config/CD_APIM/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDAPIM: template.json
-
-CDAPIM:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: APIM
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_APIM/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_APIM/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_APIM/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ASBC-HAL/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ASBC-HAL/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-HAL/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ASBC-HAL/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ASBC-HAL/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 1ad98d46..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-HAL/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDASBC-HAL: template.json
-
-CDASBC-HAL:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ASBC-HAL
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ASBC-HAL/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ASBC-HAL/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-HAL/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ASBC-HAL/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ASBC-HAL/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-HAL/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ASBC-HAL/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ASBC-HAL/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 1ad98d46..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-HAL/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDASBC-HAL: template.json
-
-CDASBC-HAL:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ASBC-HAL
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ASBC-HAL/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ASBC-HAL/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-HAL/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ASBC-RSU/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ASBC-RSU/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-RSU/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ASBC-RSU/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ASBC-RSU/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 0edfd5d0..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-RSU/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDASBC-RSU: template.json
-
-CDASBC-RSU:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ASBC-RSU
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ASBC-RSU/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ASBC-RSU/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-RSU/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ASBC-RSU/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ASBC-RSU/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-RSU/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ASBC-RSU/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ASBC-RSU/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 0edfd5d0..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-RSU/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDASBC-RSU: template.json
-
-CDASBC-RSU:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ASBC-RSU
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ASBC-RSU/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ASBC-RSU/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-RSU/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ASBC-SMACC/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ASBC-SMACC/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-SMACC/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ASBC-SMACC/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ASBC-SMACC/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index e9eb53e2..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-SMACC/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDASBC-SMACC: template.json
-
-CDASBC-SMACC:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ASBC-SMACC
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ASBC-SMACC/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ASBC-SMACC/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-SMACC/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ASBC-SMACC/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ASBC-SMACC/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-SMACC/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ASBC-SMACC/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ASBC-SMACC/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index e9eb53e2..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-SMACC/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDASBC-SMACC: template.json
-
-CDASBC-SMACC:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ASBC-SMACC
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ASBC-SMACC/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ASBC-SMACC/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ASBC-SMACC/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_App-Repository/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_App-Repository/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_App-Repository/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_App-Repository/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_App-Repository/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 225c42f9..00000000
--- a/BMW-Dynatrace-config/CD_App-Repository/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDApp-Repository: template.json
-
-CDApp-Repository:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: App-Repository
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_App-Repository/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_App-Repository/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_App-Repository/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_App-Repository/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_App-Repository/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_App-Repository/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_App-Repository/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_App-Repository/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 225c42f9..00000000
--- a/BMW-Dynatrace-config/CD_App-Repository/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDApp-Repository: template.json
-
-CDApp-Repository:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: App-Repository
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_App-Repository/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_App-Repository/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_App-Repository/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_BMWPoints/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_BMWPoints/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_BMWPoints/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_BMWPoints/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_BMWPoints/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index f78f0ab4..00000000
--- a/BMW-Dynatrace-config/CD_BMWPoints/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDBMWPoints: template.json
-
-CDBMWPoints:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: BMWPoints
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_BMWPoints/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_BMWPoints/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_BMWPoints/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_BMWPoints/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_BMWPoints/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_BMWPoints/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_BMWPoints/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_BMWPoints/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index f78f0ab4..00000000
--- a/BMW-Dynatrace-config/CD_BMWPoints/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDBMWPoints: template.json
-
-CDBMWPoints:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: BMWPoints
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_BMWPoints/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_BMWPoints/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_BMWPoints/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Billing_Buffet/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_Billing_Buffet/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_Billing_Buffet/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Billing_Buffet/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_Billing_Buffet/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 3c23865b..00000000
--- a/BMW-Dynatrace-config/CD_Billing_Buffet/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDBilling_Buffet: template.json
-
-CDBilling_Buffet:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Billing_Buffet
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Billing_Buffet/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_Billing_Buffet/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_Billing_Buffet/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Billing_Buffet/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_Billing_Buffet/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_Billing_Buffet/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Billing_Buffet/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_Billing_Buffet/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 3c23865b..00000000
--- a/BMW-Dynatrace-config/CD_Billing_Buffet/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDBilling_Buffet: template.json
-
-CDBilling_Buffet:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Billing_Buffet
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Billing_Buffet/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_Billing_Buffet/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_Billing_Buffet/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_CCG/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_CCG/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_CCG/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_CCG/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_CCG/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index e1a2e77e..00000000
--- a/BMW-Dynatrace-config/CD_CCG/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDCCG: template.json
-
-CDCCG:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: CCG
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_CCG/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_CCG/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_CCG/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_CCG/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_CCG/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_CCG/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_CCG/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_CCG/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index e1a2e77e..00000000
--- a/BMW-Dynatrace-config/CD_CCG/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDCCG: template.json
-
-CDCCG:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: CCG
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_CCG/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_CCG/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_CCG/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_CSI/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_CSI/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_CSI/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_CSI/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_CSI/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 5ba3c19b..00000000
--- a/BMW-Dynatrace-config/CD_CSI/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDCSI: template.json
-
-CDCSI:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: CSI
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_CSI/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_CSI/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_CSI/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_CSI/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_CSI/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_CSI/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_CSI/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_CSI/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 5ba3c19b..00000000
--- a/BMW-Dynatrace-config/CD_CSI/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDCSI: template.json
-
-CDCSI:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: CSI
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_CSI/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_CSI/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_CSI/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Call-Handling-Backends/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_Call-Handling-Backends/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_Call-Handling-Backends/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Call-Handling-Backends/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_Call-Handling-Backends/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index a879b07b..00000000
--- a/BMW-Dynatrace-config/CD_Call-Handling-Backends/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDCall-Handling-Backends: template.json
-
-CDCall-Handling-Backends:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Call-Handling-Backends
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Call-Handling-Backends/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_Call-Handling-Backends/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_Call-Handling-Backends/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Call-Handling-Backends/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_Call-Handling-Backends/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_Call-Handling-Backends/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Call-Handling-Backends/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_Call-Handling-Backends/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index a879b07b..00000000
--- a/BMW-Dynatrace-config/CD_Call-Handling-Backends/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDCall-Handling-Backends: template.json
-
-CDCall-Handling-Backends:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Call-Handling-Backends
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Call-Handling-Backends/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_Call-Handling-Backends/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_Call-Handling-Backends/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_CallCenterClient/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_CallCenterClient/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_CallCenterClient/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_CallCenterClient/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_CallCenterClient/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index ee09e53f..00000000
--- a/BMW-Dynatrace-config/CD_CallCenterClient/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDCallCenterClient: template.json
-
-CDCallCenterClient:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: CallCenterClient
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_CallCenterClient/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_CallCenterClient/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_CallCenterClient/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_CallCenterClient/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_CallCenterClient/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_CallCenterClient/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_CallCenterClient/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_CallCenterClient/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index ee09e53f..00000000
--- a/BMW-Dynatrace-config/CD_CallCenterClient/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDCallCenterClient: template.json
-
-CDCallCenterClient:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: CallCenterClient
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_CallCenterClient/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_CallCenterClient/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_CallCenterClient/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Connected-Backend-Services/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_Connected-Backend-Services/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_Connected-Backend-Services/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Connected-Backend-Services/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_Connected-Backend-Services/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index f909d0a0..00000000
--- a/BMW-Dynatrace-config/CD_Connected-Backend-Services/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDConnected-Backend-Services: template.json
-
-CDConnected-Backend-Services:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Connected-Backend-Services
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Connected-Backend-Services/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_Connected-Backend-Services/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_Connected-Backend-Services/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Connected-Backend-Services/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_Connected-Backend-Services/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_Connected-Backend-Services/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Connected-Backend-Services/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_Connected-Backend-Services/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index f909d0a0..00000000
--- a/BMW-Dynatrace-config/CD_Connected-Backend-Services/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDConnected-Backend-Services: template.json
-
-CDConnected-Backend-Services:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Connected-Backend-Services
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Connected-Backend-Services/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_Connected-Backend-Services/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_Connected-Backend-Services/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Connected-User-Behaviour/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_Connected-User-Behaviour/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_Connected-User-Behaviour/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Connected-User-Behaviour/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_Connected-User-Behaviour/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 40522027..00000000
--- a/BMW-Dynatrace-config/CD_Connected-User-Behaviour/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDConnected-User-Behaviour: template.json
-
-CDConnected-User-Behaviour:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Connected-User-Behaviour
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Connected-User-Behaviour/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_Connected-User-Behaviour/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_Connected-User-Behaviour/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Connected-User-Behaviour/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_Connected-User-Behaviour/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_Connected-User-Behaviour/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Connected-User-Behaviour/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_Connected-User-Behaviour/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 40522027..00000000
--- a/BMW-Dynatrace-config/CD_Connected-User-Behaviour/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDConnected-User-Behaviour: template.json
-
-CDConnected-User-Behaviour:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Connected-User-Behaviour
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Connected-User-Behaviour/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_Connected-User-Behaviour/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_Connected-User-Behaviour/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 501bb3b1..00000000
--- a/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDConnectedDrive-Internet-Portal: template.json
-
-CDConnectedDrive-Internet-Portal:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ConnectedDrive-Internet-Portal
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 501bb3b1..00000000
--- a/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDConnectedDrive-Internet-Portal: template.json
-
-CDConnectedDrive-Internet-Portal:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ConnectedDrive-Internet-Portal
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ConnectedDrive-Internet-Portal/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ContentProvider/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ContentProvider/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ContentProvider/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ContentProvider/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ContentProvider/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index c11c63e1..00000000
--- a/BMW-Dynatrace-config/CD_ContentProvider/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDContentProvider: template.json
-
-CDContentProvider:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ContentProvider
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ContentProvider/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ContentProvider/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ContentProvider/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ContentProvider/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ContentProvider/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ContentProvider/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ContentProvider/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ContentProvider/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index c11c63e1..00000000
--- a/BMW-Dynatrace-config/CD_ContentProvider/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDContentProvider: template.json
-
-CDContentProvider:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ContentProvider
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ContentProvider/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ContentProvider/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ContentProvider/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_DPP_DPM/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_DPP_DPM/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_DPP_DPM/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_DPP_DPM/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_DPP_DPM/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 8961f69e..00000000
--- a/BMW-Dynatrace-config/CD_DPP_DPM/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDDPP_DPM: template.json
-
-CDDPP_DPM:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: DPP_DPM
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_DPP_DPM/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_DPP_DPM/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_DPP_DPM/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_DPP_DPM/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_DPP_DPM/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_DPP_DPM/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_DPP_DPM/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_DPP_DPM/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 8961f69e..00000000
--- a/BMW-Dynatrace-config/CD_DPP_DPM/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDDPP_DPM: template.json
-
-CDDPP_DPM:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: DPP_DPM
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_DPP_DPM/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_DPP_DPM/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_DPP_DPM/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_GCDM/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_GCDM/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_GCDM/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_GCDM/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_GCDM/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 8b67f094..00000000
--- a/BMW-Dynatrace-config/CD_GCDM/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDGCDM: template.json
-
-CDGCDM:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: GCDM
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_GCDM/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_GCDM/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_GCDM/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_GCDM/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_GCDM/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_GCDM/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_GCDM/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_GCDM/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 8b67f094..00000000
--- a/BMW-Dynatrace-config/CD_GCDM/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDGCDM: template.json
-
-CDGCDM:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: GCDM
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_GCDM/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_GCDM/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_GCDM/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 27c8a57b..00000000
--- a/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDInfotainment: template.json
-
-CDInfotainment:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Infotainment
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 27c8a57b..00000000
--- a/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDInfotainment: template.json
-
-CDInfotainment:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Infotainment
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_Infotainment-In-Car-Experience-Services/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_LSC-FSU/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_LSC-FSU/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_LSC-FSU/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_LSC-FSU/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_LSC-FSU/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 7a407872..00000000
--- a/BMW-Dynatrace-config/CD_LSC-FSU/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDLSC-FSU: template.json
-
-CDLSC-FSU:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: LSC-FSU
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_LSC-FSU/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_LSC-FSU/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_LSC-FSU/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_LSC-FSU/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_LSC-FSU/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_LSC-FSU/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_LSC-FSU/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_LSC-FSU/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 7a407872..00000000
--- a/BMW-Dynatrace-config/CD_LSC-FSU/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDLSC-FSU: template.json
-
-CDLSC-FSU:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: LSC-FSU
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_LSC-FSU/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_LSC-FSU/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_LSC-FSU/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_LSC/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_LSC/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_LSC/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_LSC/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_LSC/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index a0193180..00000000
--- a/BMW-Dynatrace-config/CD_LSC/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDLSC: template.json
-
-CDLSC:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: LSC
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_LSC/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_LSC/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_LSC/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_LSC/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_LSC/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_LSC/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_LSC/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_LSC/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index a0193180..00000000
--- a/BMW-Dynatrace-config/CD_LSC/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDLSC: template.json
-
-CDLSC:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: LSC
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_LSC/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_LSC/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_LSC/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Location-Services/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_Location-Services/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_Location-Services/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Location-Services/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_Location-Services/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 0223a967..00000000
--- a/BMW-Dynatrace-config/CD_Location-Services/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDLocation-Services: template.json
-
-CDLocation-Services:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Location-Services
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Location-Services/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_Location-Services/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_Location-Services/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Location-Services/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_Location-Services/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_Location-Services/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Location-Services/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_Location-Services/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 0223a967..00000000
--- a/BMW-Dynatrace-config/CD_Location-Services/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDLocation-Services: template.json
-
-CDLocation-Services:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Location-Services
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Location-Services/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_Location-Services/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_Location-Services/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Messaging-Services/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_Messaging-Services/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_Messaging-Services/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Messaging-Services/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_Messaging-Services/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index f7069e40..00000000
--- a/BMW-Dynatrace-config/CD_Messaging-Services/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDMessaging-Services: template.json
-
-CDMessaging-Services:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: MSGSVC
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Messaging-Services/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_Messaging-Services/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_Messaging-Services/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Messaging-Services/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_Messaging-Services/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_Messaging-Services/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Messaging-Services/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_Messaging-Services/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index f7069e40..00000000
--- a/BMW-Dynatrace-config/CD_Messaging-Services/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDMessaging-Services: template.json
-
-CDMessaging-Services:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: MSGSVC
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Messaging-Services/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_Messaging-Services/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_Messaging-Services/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Mobile_2/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_Mobile_2/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_Mobile_2/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Mobile_2/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_Mobile_2/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 7b746656..00000000
--- a/BMW-Dynatrace-config/CD_Mobile_2/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDMobile_2: template.json
-
-CDMobile_2:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Mobile_2
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Mobile_2/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_Mobile_2/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_Mobile_2/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Mobile_2/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_Mobile_2/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_Mobile_2/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Mobile_2/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_Mobile_2/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 7b746656..00000000
--- a/BMW-Dynatrace-config/CD_Mobile_2/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDMobile_2: template.json
-
-CDMobile_2:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Mobile_2
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Mobile_2/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_Mobile_2/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_Mobile_2/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Navigation-Information-Services/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_Navigation-Information-Services/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_Navigation-Information-Services/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Navigation-Information-Services/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_Navigation-Information-Services/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 569ee772..00000000
--- a/BMW-Dynatrace-config/CD_Navigation-Information-Services/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDNavigation-Information-Services: template.json
-
-CDNavigation-Information-Services:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Navigation-Information-Services
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Navigation-Information-Services/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_Navigation-Information-Services/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_Navigation-Information-Services/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Navigation-Information-Services/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_Navigation-Information-Services/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_Navigation-Information-Services/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Navigation-Information-Services/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_Navigation-Information-Services/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 569ee772..00000000
--- a/BMW-Dynatrace-config/CD_Navigation-Information-Services/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDNavigation-Information-Services: template.json
-
-CDNavigation-Information-Services:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Navigation-Information-Services
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Navigation-Information-Services/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_Navigation-Information-Services/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_Navigation-Information-Services/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_PISA/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_PISA/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_PISA/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_PISA/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_PISA/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 3db05b48..00000000
--- a/BMW-Dynatrace-config/CD_PISA/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDPISA: template.json
-
-CDPISA:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: PISA
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_PISA/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_PISA/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_PISA/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_PISA/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_PISA/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_PISA/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_PISA/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_PISA/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 3db05b48..00000000
--- a/BMW-Dynatrace-config/CD_PISA/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDPISA: template.json
-
-CDPISA:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: PISA
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_PISA/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_PISA/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_PISA/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Perseus/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_Perseus/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_Perseus/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Perseus/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_Perseus/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index ba27b530..00000000
--- a/BMW-Dynatrace-config/CD_Perseus/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDPerseus: template.json
-
-CDPerseus:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Perseus
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Perseus/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_Perseus/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_Perseus/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Perseus/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_Perseus/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_Perseus/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Perseus/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_Perseus/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index ba27b530..00000000
--- a/BMW-Dynatrace-config/CD_Perseus/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDPerseus: template.json
-
-CDPerseus:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Perseus
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Perseus/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_Perseus/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_Perseus/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_RemoteServices/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_RemoteServices/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_RemoteServices/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_RemoteServices/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_RemoteServices/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 2ab5eee8..00000000
--- a/BMW-Dynatrace-config/CD_RemoteServices/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDRemoteServices: template.json
-
-CDRemoteServices:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: RemoteServices
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_RemoteServices/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_RemoteServices/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_RemoteServices/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_RemoteServices/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_RemoteServices/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_RemoteServices/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_RemoteServices/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_RemoteServices/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 2ab5eee8..00000000
--- a/BMW-Dynatrace-config/CD_RemoteServices/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDRemoteServices: template.json
-
-CDRemoteServices:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: RemoteServices
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_RemoteServices/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_RemoteServices/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_RemoteServices/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Service-Bus/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_Service-Bus/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_Service-Bus/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Service-Bus/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_Service-Bus/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index f58ca979..00000000
--- a/BMW-Dynatrace-config/CD_Service-Bus/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDService-Bus: template.json
-
-CDService-Bus:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Service-Bus
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Service-Bus/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_Service-Bus/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_Service-Bus/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Service-Bus/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_Service-Bus/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_Service-Bus/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Service-Bus/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_Service-Bus/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index f58ca979..00000000
--- a/BMW-Dynatrace-config/CD_Service-Bus/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDService-Bus: template.json
-
-CDService-Bus:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Service-Bus
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Service-Bus/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_Service-Bus/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_Service-Bus/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Service-Gateway/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_Service-Gateway/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_Service-Gateway/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Service-Gateway/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_Service-Gateway/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index eeb2f10d..00000000
--- a/BMW-Dynatrace-config/CD_Service-Gateway/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDService-Gateway: template.json
-
-CDService-Gateway:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Service-Gateway
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Service-Gateway/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_Service-Gateway/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_Service-Gateway/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Service-Gateway/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_Service-Gateway/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_Service-Gateway/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Service-Gateway/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_Service-Gateway/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index eeb2f10d..00000000
--- a/BMW-Dynatrace-config/CD_Service-Gateway/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDService-Gateway: template.json
-
-CDService-Gateway:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Service-Gateway
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Service-Gateway/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_Service-Gateway/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_Service-Gateway/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Speech/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_Speech/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_Speech/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Speech/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_Speech/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 0b10daf1..00000000
--- a/BMW-Dynatrace-config/CD_Speech/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDSpeech: template.json
-
-CDSpeech:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Speech
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Speech/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_Speech/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_Speech/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Speech/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_Speech/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_Speech/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Speech/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_Speech/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 0b10daf1..00000000
--- a/BMW-Dynatrace-config/CD_Speech/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDSpeech: template.json
-
-CDSpeech:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Speech
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Speech/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_Speech/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_Speech/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Voice-Services/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_Voice-Services/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_Voice-Services/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Voice-Services/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_Voice-Services/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index b86d43fd..00000000
--- a/BMW-Dynatrace-config/CD_Voice-Services/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDVoice-Services: template.json
-
-CDVoice-Services:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Voice Services
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Voice-Services/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_Voice-Services/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_Voice-Services/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Voice-Services/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_Voice-Services/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_Voice-Services/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_Voice-Services/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_Voice-Services/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index b86d43fd..00000000
--- a/BMW-Dynatrace-config/CD_Voice-Services/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDVoice-Services: template.json
-
-CDVoice-Services:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: Voice Services
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_Voice-Services/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_Voice-Services/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_Voice-Services/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_agent-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_agent-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_agent-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_agent-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_agent-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index d3d53700..00000000
--- a/BMW-Dynatrace-config/CD_agent-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDagent-service: template.json
-
-CDagent-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: agent-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_agent-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_agent-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_agent-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_agent-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_agent-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_agent-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_agent-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_agent-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index d3d53700..00000000
--- a/BMW-Dynatrace-config/CD_agent-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDagent-service: template.json
-
-CDagent-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: agent-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_agent-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_agent-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_agent-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_aluis/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_aluis/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_aluis/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_aluis/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_aluis/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 03dd67a4..00000000
--- a/BMW-Dynatrace-config/CD_aluis/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDaluis: template.json
-
-CDaluis:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: aluis
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_aluis/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_aluis/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_aluis/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_aluis/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_aluis/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_aluis/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_aluis/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_aluis/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 03dd67a4..00000000
--- a/BMW-Dynatrace-config/CD_aluis/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDaluis: template.json
-
-CDaluis:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: aluis
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_aluis/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_aluis/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_aluis/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-casa/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_am-casa/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_am-casa/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-casa/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_am-casa/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index b5b70089..00000000
--- a/BMW-Dynatrace-config/CD_am-casa/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-casa: template.json
-
-CDam-casa:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-casa
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-casa/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_am-casa/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_am-casa/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-casa/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_am-casa/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_am-casa/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-casa/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_am-casa/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index b5b70089..00000000
--- a/BMW-Dynatrace-config/CD_am-casa/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-casa: template.json
-
-CDam-casa:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-casa
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-casa/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_am-casa/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_am-casa/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-cesim/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_am-cesim/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_am-cesim/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-cesim/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_am-cesim/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 74c6c599..00000000
--- a/BMW-Dynatrace-config/CD_am-cesim/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-cesim: template.json
-
-CDam-cesim:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-cesim
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-cesim/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_am-cesim/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_am-cesim/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-cesim/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_am-cesim/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_am-cesim/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-cesim/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_am-cesim/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 74c6c599..00000000
--- a/BMW-Dynatrace-config/CD_am-cesim/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-cesim: template.json
-
-CDam-cesim:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-cesim
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-cesim/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_am-cesim/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_am-cesim/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-cns/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_am-cns/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_am-cns/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-cns/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_am-cns/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 0aacc063..00000000
--- a/BMW-Dynatrace-config/CD_am-cns/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-cns: template.json
-
-CDam-cns:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-cns
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-cns/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_am-cns/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_am-cns/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-cns/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_am-cns/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_am-cns/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-cns/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_am-cns/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 0aacc063..00000000
--- a/BMW-Dynatrace-config/CD_am-cns/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-cns: template.json
-
-CDam-cns:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-cns
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-cns/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_am-cns/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_am-cns/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-device/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_am-device/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_am-device/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-device/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_am-device/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index ffa7b065..00000000
--- a/BMW-Dynatrace-config/CD_am-device/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-device: template.json
-
-CDam-device:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-device
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-device/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_am-device/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_am-device/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-device/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_am-device/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_am-device/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-device/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_am-device/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index ffa7b065..00000000
--- a/BMW-Dynatrace-config/CD_am-device/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-device: template.json
-
-CDam-device:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-device
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-device/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_am-device/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_am-device/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-ecs/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_am-ecs/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_am-ecs/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-ecs/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_am-ecs/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index e991cf03..00000000
--- a/BMW-Dynatrace-config/CD_am-ecs/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-ecs: template.json
-
-CDam-ecs:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-ecs
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-ecs/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_am-ecs/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_am-ecs/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-ecs/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_am-ecs/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_am-ecs/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-ecs/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_am-ecs/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index e991cf03..00000000
--- a/BMW-Dynatrace-config/CD_am-ecs/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-ecs: template.json
-
-CDam-ecs:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-ecs
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-ecs/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_am-ecs/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_am-ecs/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-egim/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_am-egim/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_am-egim/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-egim/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_am-egim/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index b2ae78dc..00000000
--- a/BMW-Dynatrace-config/CD_am-egim/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-egim: template.json
-
-CDam-egim:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-egim
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-egim/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_am-egim/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_am-egim/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-egim/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_am-egim/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_am-egim/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-egim/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_am-egim/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index b2ae78dc..00000000
--- a/BMW-Dynatrace-config/CD_am-egim/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-egim: template.json
-
-CDam-egim:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-egim
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-egim/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_am-egim/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_am-egim/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-esim-ui/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_am-esim-ui/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_am-esim-ui/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-esim-ui/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_am-esim-ui/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index d97b25b7..00000000
--- a/BMW-Dynatrace-config/CD_am-esim-ui/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-esim-ui: template.json
-
-CDam-esim-ui:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-esim-ui
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-esim-ui/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_am-esim-ui/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_am-esim-ui/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-esim-ui/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_am-esim-ui/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_am-esim-ui/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-esim-ui/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_am-esim-ui/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index d97b25b7..00000000
--- a/BMW-Dynatrace-config/CD_am-esim-ui/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-esim-ui: template.json
-
-CDam-esim-ui:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-esim-ui
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-esim-ui/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_am-esim-ui/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_am-esim-ui/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-lmcs/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_am-lmcs/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_am-lmcs/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-lmcs/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_am-lmcs/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 191d5730..00000000
--- a/BMW-Dynatrace-config/CD_am-lmcs/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-lmcs: template.json
-
-CDam-lmcs:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-lmcs
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-lmcs/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_am-lmcs/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_am-lmcs/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-lmcs/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_am-lmcs/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_am-lmcs/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-lmcs/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_am-lmcs/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 191d5730..00000000
--- a/BMW-Dynatrace-config/CD_am-lmcs/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-lmcs: template.json
-
-CDam-lmcs:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-lmcs
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-lmcs/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_am-lmcs/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_am-lmcs/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-mno-manager/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_am-mno-manager/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_am-mno-manager/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-mno-manager/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_am-mno-manager/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index cdbf7bbb..00000000
--- a/BMW-Dynatrace-config/CD_am-mno-manager/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-mno-manager: template.json
-
-CDam-mno-manager:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-mno-manager
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-mno-manager/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_am-mno-manager/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_am-mno-manager/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-mno-manager/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_am-mno-manager/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_am-mno-manager/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-mno-manager/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_am-mno-manager/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index cdbf7bbb..00000000
--- a/BMW-Dynatrace-config/CD_am-mno-manager/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-mno-manager: template.json
-
-CDam-mno-manager:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-mno-manager
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-mno-manager/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_am-mno-manager/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_am-mno-manager/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-proxy/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_am-proxy/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_am-proxy/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-proxy/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_am-proxy/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 488af1cc..00000000
--- a/BMW-Dynatrace-config/CD_am-proxy/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-proxy: template.json
-
-CDam-proxy:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-proxy
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-proxy/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_am-proxy/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_am-proxy/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-proxy/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_am-proxy/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_am-proxy/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-proxy/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_am-proxy/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 488af1cc..00000000
--- a/BMW-Dynatrace-config/CD_am-proxy/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-proxy: template.json
-
-CDam-proxy:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-proxy
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-proxy/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_am-proxy/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_am-proxy/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-store/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_am-store/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_am-store/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-store/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_am-store/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index b44d6f8d..00000000
--- a/BMW-Dynatrace-config/CD_am-store/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-store: template.json
-
-CDam-store:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-store
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-store/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_am-store/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_am-store/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-store/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_am-store/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_am-store/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-store/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_am-store/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index b44d6f8d..00000000
--- a/BMW-Dynatrace-config/CD_am-store/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-store: template.json
-
-CDam-store:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-store
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-store/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_am-store/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_am-store/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-svms/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_am-svms/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_am-svms/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-svms/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_am-svms/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 3ff59e79..00000000
--- a/BMW-Dynatrace-config/CD_am-svms/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-svms: template.json
-
-CDam-svms:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-svms
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-svms/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_am-svms/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_am-svms/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-svms/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_am-svms/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_am-svms/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-svms/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_am-svms/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 3ff59e79..00000000
--- a/BMW-Dynatrace-config/CD_am-svms/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-svms: template.json
-
-CDam-svms:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-svms
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-svms/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_am-svms/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_am-svms/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-ui/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_am-ui/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_am-ui/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-ui/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_am-ui/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index d40fc9d0..00000000
--- a/BMW-Dynatrace-config/CD_am-ui/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-ui: template.json
-
-CDam-ui:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-ui
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-ui/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_am-ui/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_am-ui/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-ui/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_am-ui/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_am-ui/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-ui/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_am-ui/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index d40fc9d0..00000000
--- a/BMW-Dynatrace-config/CD_am-ui/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-ui: template.json
-
-CDam-ui:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-ui
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-ui/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_am-ui/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_am-ui/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-usage/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_am-usage/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_am-usage/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-usage/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_am-usage/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 28aa67d4..00000000
--- a/BMW-Dynatrace-config/CD_am-usage/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-usage: template.json
-
-CDam-usage:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-usage
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-usage/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_am-usage/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_am-usage/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-usage/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_am-usage/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_am-usage/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-usage/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_am-usage/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 28aa67d4..00000000
--- a/BMW-Dynatrace-config/CD_am-usage/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-usage: template.json
-
-CDam-usage:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-usage
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-usage/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_am-usage/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_am-usage/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-vehicle-activation/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_am-vehicle-activation/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_am-vehicle-activation/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-vehicle-activation/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_am-vehicle-activation/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 43844dc8..00000000
--- a/BMW-Dynatrace-config/CD_am-vehicle-activation/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-vehicle-activation: template.json
-
-CDam-vehicle-activation:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-vehicle-activation
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-vehicle-activation/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_am-vehicle-activation/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_am-vehicle-activation/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-vehicle-activation/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_am-vehicle-activation/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_am-vehicle-activation/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-vehicle-activation/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_am-vehicle-activation/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 43844dc8..00000000
--- a/BMW-Dynatrace-config/CD_am-vehicle-activation/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-vehicle-activation: template.json
-
-CDam-vehicle-activation:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-vehicle-activation
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-vehicle-activation/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_am-vehicle-activation/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_am-vehicle-activation/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-vms/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_am-vms/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_am-vms/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-vms/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_am-vms/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index e186c59f..00000000
--- a/BMW-Dynatrace-config/CD_am-vms/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-vms: template.json
-
-CDam-vms:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-vms
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-vms/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_am-vms/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_am-vms/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-vms/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_am-vms/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_am-vms/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_am-vms/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_am-vms/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index e186c59f..00000000
--- a/BMW-Dynatrace-config/CD_am-vms/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDam-vms: template.json
-
-CDam-vms:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: am-vms
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_am-vms/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_am-vms/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_am-vms/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_analytics-user-data-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_analytics-user-data-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_analytics-user-data-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_analytics-user-data-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_analytics-user-data-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 8e953e96..00000000
--- a/BMW-Dynatrace-config/CD_analytics-user-data-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDanalytics-user-data-service: template.json
-
-CDanalytics-user-data-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: analytics-user-data-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_analytics-user-data-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_analytics-user-data-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_analytics-user-data-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_analytics-user-data-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_analytics-user-data-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_analytics-user-data-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_analytics-user-data-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_analytics-user-data-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 8e953e96..00000000
--- a/BMW-Dynatrace-config/CD_analytics-user-data-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDanalytics-user-data-service: template.json
-
-CDanalytics-user-data-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: analytics-user-data-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_analytics-user-data-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_analytics-user-data-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_analytics-user-data-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index bd164c3f..00000000
--- a/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDasbc-pki-oclisc2v: template.json
-
-CDasbc-pki-oclisc2v:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: asbc-pki-oclisc2v
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index bd164c3f..00000000
--- a/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDasbc-pki-oclisc2v: template.json
-
-CDasbc-pki-oclisc2v:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: asbc-pki-oclisc2v
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_asbc-pki-oclisc2v/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index c8cab4fd..00000000
--- a/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDasbc-pki-oclisocsp: template.json
-
-CDasbc-pki-oclisocsp:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: asbc-pki-oclisocsp
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index c8cab4fd..00000000
--- a/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDasbc-pki-oclisocsp: template.json
-
-CDasbc-pki-oclisocsp:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: asbc-pki-oclisocsp
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_asbc-pki-oclisocsp/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-sfa-oh/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_asbc-sfa-oh/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_asbc-sfa-oh/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-sfa-oh/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_asbc-sfa-oh/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index c9554c92..00000000
--- a/BMW-Dynatrace-config/CD_asbc-sfa-oh/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDasbc-sfa-oh: template.json
-
-CDasbc-sfa-oh:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: asbc-sfa-oh
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_asbc-sfa-oh/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_asbc-sfa-oh/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_asbc-sfa-oh/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-sfa-oh/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_asbc-sfa-oh/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_asbc-sfa-oh/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-sfa-oh/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_asbc-sfa-oh/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index c9554c92..00000000
--- a/BMW-Dynatrace-config/CD_asbc-sfa-oh/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDasbc-sfa-oh: template.json
-
-CDasbc-sfa-oh:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: asbc-sfa-oh
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_asbc-sfa-oh/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_asbc-sfa-oh/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_asbc-sfa-oh/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-sts/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_asbc-sts/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_asbc-sts/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-sts/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_asbc-sts/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 0fe300e9..00000000
--- a/BMW-Dynatrace-config/CD_asbc-sts/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDasbc-sts: template.json
-
-CDasbc-sts:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: asbc-sts
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_asbc-sts/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_asbc-sts/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_asbc-sts/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-sts/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_asbc-sts/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_asbc-sts/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbc-sts/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_asbc-sts/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 0fe300e9..00000000
--- a/BMW-Dynatrace-config/CD_asbc-sts/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDasbc-sts: template.json
-
-CDasbc-sts:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: asbc-sts
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_asbc-sts/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_asbc-sts/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_asbc-sts/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbctvp/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_asbctvp/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_asbctvp/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbctvp/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_asbctvp/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index f827ad21..00000000
--- a/BMW-Dynatrace-config/CD_asbctvp/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDasbctvp: template.json
-
-CDasbctvp:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: asbctvp
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_asbctvp/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_asbctvp/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_asbctvp/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbctvp/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_asbctvp/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_asbctvp/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_asbctvp/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_asbctvp/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index f827ad21..00000000
--- a/BMW-Dynatrace-config/CD_asbctvp/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDasbctvp: template.json
-
-CDasbctvp:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: asbctvp
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_asbctvp/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_asbctvp/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_asbctvp/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_avs-client-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_avs-client-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_avs-client-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_avs-client-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_avs-client-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 2ad36156..00000000
--- a/BMW-Dynatrace-config/CD_avs-client-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDavs-client-service: template.json
-
-CDavs-client-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: avs-client-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_avs-client-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_avs-client-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_avs-client-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_avs-client-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_avs-client-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_avs-client-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_avs-client-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_avs-client-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 2ad36156..00000000
--- a/BMW-Dynatrace-config/CD_avs-client-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDavs-client-service: template.json
-
-CDavs-client-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: avs-client-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_avs-client-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_avs-client-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_avs-client-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_avs-proxy-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_avs-proxy-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_avs-proxy-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_avs-proxy-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_avs-proxy-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index fd060ab6..00000000
--- a/BMW-Dynatrace-config/CD_avs-proxy-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDavs-proxy-composite-service: template.json
-
-CDavs-proxy-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: avs-proxy-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_avs-proxy-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_avs-proxy-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_avs-proxy-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_avs-proxy-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_avs-proxy-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_avs-proxy-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_avs-proxy-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_avs-proxy-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index fd060ab6..00000000
--- a/BMW-Dynatrace-config/CD_avs-proxy-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDavs-proxy-composite-service: template.json
-
-CDavs-proxy-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: avs-proxy-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_avs-proxy-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_avs-proxy-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_avs-proxy-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-be/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_b2v-com-be/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-be/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-be/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_b2v-com-be/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index baf5b817..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-be/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDb2v-com-be: template.json
-
-CDb2v-com-be:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: b2v-com-be
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_b2v-com-be/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_b2v-com-be/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-be/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-be/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_b2v-com-be/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-be/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-be/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_b2v-com-be/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index baf5b817..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-be/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDb2v-com-be: template.json
-
-CDb2v-com-be:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: b2v-com-be
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_b2v-com-be/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_b2v-com-be/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-be/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-echo/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_b2v-com-echo/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-echo/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-echo/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_b2v-com-echo/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 5d9e598e..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-echo/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDb2v-com-echo: template.json
-
-CDb2v-com-echo:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: b2v-com-echo
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_b2v-com-echo/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_b2v-com-echo/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-echo/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-echo/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_b2v-com-echo/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-echo/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-echo/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_b2v-com-echo/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 5d9e598e..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-echo/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDb2v-com-echo: template.json
-
-CDb2v-com-echo:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: b2v-com-echo
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_b2v-com-echo/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_b2v-com-echo/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-echo/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-fe/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_b2v-com-fe/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-fe/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-fe/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_b2v-com-fe/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index fb70b642..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-fe/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDb2v-com-fe: template.json
-
-CDb2v-com-fe:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: b2v-com-fe
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_b2v-com-fe/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_b2v-com-fe/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-fe/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-fe/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_b2v-com-fe/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-fe/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-fe/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_b2v-com-fe/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index fb70b642..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-fe/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDb2v-com-fe: template.json
-
-CDb2v-com-fe:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: b2v-com-fe
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_b2v-com-fe/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_b2v-com-fe/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-fe/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index d2f6c8b7..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDb2v-com-gcdm-client: template.json
-
-CDb2v-com-gcdm-client:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: b2v-com-gcdm-client
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index d2f6c8b7..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDb2v-com-gcdm-client: template.json
-
-CDb2v-com-gcdm-client:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: b2v-com-gcdm-client
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-gcdm-client/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-hello/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_b2v-com-hello/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-hello/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-hello/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_b2v-com-hello/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 12671939..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-hello/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDb2v-com-hello: template.json
-
-CDb2v-com-hello:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: b2v-com-hello
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_b2v-com-hello/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_b2v-com-hello/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-hello/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-hello/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_b2v-com-hello/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-hello/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-hello/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_b2v-com-hello/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 12671939..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-hello/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDb2v-com-hello: template.json
-
-CDb2v-com-hello:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: b2v-com-hello
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_b2v-com-hello/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_b2v-com-hello/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_b2v-com-hello/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-nots/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_b2v-nots/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_b2v-nots/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-nots/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_b2v-nots/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 5293d720..00000000
--- a/BMW-Dynatrace-config/CD_b2v-nots/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDb2v-nots: template.json
-
-CDb2v-nots:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: b2v-nots
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_b2v-nots/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_b2v-nots/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_b2v-nots/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-nots/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_b2v-nots/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_b2v-nots/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-nots/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_b2v-nots/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 5293d720..00000000
--- a/BMW-Dynatrace-config/CD_b2v-nots/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDb2v-nots: template.json
-
-CDb2v-nots:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: b2v-nots
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_b2v-nots/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_b2v-nots/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_b2v-nots/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-sms-statistics/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_b2v-sms-statistics/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_b2v-sms-statistics/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-sms-statistics/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_b2v-sms-statistics/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 81c9a7ab..00000000
--- a/BMW-Dynatrace-config/CD_b2v-sms-statistics/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDb2v-sms-statistics: template.json
-
-CDb2v-sms-statistics:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: b2v-sms-statistics
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_b2v-sms-statistics/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_b2v-sms-statistics/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_b2v-sms-statistics/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-sms-statistics/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_b2v-sms-statistics/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_b2v-sms-statistics/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-sms-statistics/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_b2v-sms-statistics/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 81c9a7ab..00000000
--- a/BMW-Dynatrace-config/CD_b2v-sms-statistics/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDb2v-sms-statistics: template.json
-
-CDb2v-sms-statistics:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: b2v-sms-statistics
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_b2v-sms-statistics/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_b2v-sms-statistics/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_b2v-sms-statistics/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index d5200809..00000000
--- a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDbmw-points-push-notifications-service: template.json
-
-CDbmw-points-push-notifications-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: bmw-points-push-notifications-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index d5200809..00000000
--- a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDbmw-points-push-notifications-service: template.json
-
-CDbmw-points-push-notifications-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: bmw-points-push-notifications-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_bmw-points-push-notifications-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_bsi-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_bsi-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_bsi-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_bsi-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_bsi-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 5456ee74..00000000
--- a/BMW-Dynatrace-config/CD_bsi-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDbsi-service: template.json
-
-CDbsi-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: bsi-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_bsi-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_bsi-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_bsi-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_bsi-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_bsi-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_bsi-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_bsi-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_bsi-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 5456ee74..00000000
--- a/BMW-Dynatrace-config/CD_bsi-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDbsi-service: template.json
-
-CDbsi-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: bsi-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_bsi-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_bsi-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_bsi-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cac/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_cac/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_cac/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cac/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_cac/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index d0b9c0bd..00000000
--- a/BMW-Dynatrace-config/CD_cac/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcac: template.json
-
-CDcac:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: cac
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_cac/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_cac/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_cac/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cac/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_cac/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_cac/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cac/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_cac/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index d0b9c0bd..00000000
--- a/BMW-Dynatrace-config/CD_cac/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcac: template.json
-
-CDcac:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: cac
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_cac/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_cac/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_cac/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_casa-event-processor/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_casa-event-processor/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_casa-event-processor/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_casa-event-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_casa-event-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 22412248..00000000
--- a/BMW-Dynatrace-config/CD_casa-event-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcasa-event-processor: template.json
-
-CDcasa-event-processor:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: casa-event-processor
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_casa-event-processor/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_casa-event-processor/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_casa-event-processor/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_casa-event-processor/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_casa-event-processor/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_casa-event-processor/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_casa-event-processor/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_casa-event-processor/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 22412248..00000000
--- a/BMW-Dynatrace-config/CD_casa-event-processor/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcasa-event-processor: template.json
-
-CDcasa-event-processor:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: casa-event-processor
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_casa-event-processor/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_casa-event-processor/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_casa-event-processor/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cdc/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_cdc/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_cdc/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cdc/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_cdc/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 70299e63..00000000
--- a/BMW-Dynatrace-config/CD_cdc/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcdc: template.json
-
-CDcdc:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: cdc
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_cdc/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_cdc/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_cdc/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cdc/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_cdc/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_cdc/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cdc/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_cdc/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 70299e63..00000000
--- a/BMW-Dynatrace-config/CD_cdc/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcdc: template.json
-
-CDcdc:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: cdc
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_cdc/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_cdc/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_cdc/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cdcicd-jenkins/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_cdcicd-jenkins/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_cdcicd-jenkins/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cdcicd-jenkins/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_cdcicd-jenkins/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 7722d430..00000000
--- a/BMW-Dynatrace-config/CD_cdcicd-jenkins/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcdcicd-jenkins: template.json
-
-CDcdcicd-jenkins:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: cdcicd-jenkins
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_cdcicd-jenkins/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_cdcicd-jenkins/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_cdcicd-jenkins/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cdcicd-jenkins/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_cdcicd-jenkins/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_cdcicd-jenkins/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cdcicd-jenkins/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_cdcicd-jenkins/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 7722d430..00000000
--- a/BMW-Dynatrace-config/CD_cdcicd-jenkins/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcdcicd-jenkins: template.json
-
-CDcdcicd-jenkins:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: cdcicd-jenkins
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_cdcicd-jenkins/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_cdcicd-jenkins/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_cdcicd-jenkins/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_chargenow-enabler-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_chargenow-enabler-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_chargenow-enabler-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_chargenow-enabler-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_chargenow-enabler-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 62dc2449..00000000
--- a/BMW-Dynatrace-config/CD_chargenow-enabler-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDchargenow-enabler-service: template.json
-
-CDchargenow-enabler-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: chargenow-enabler-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_chargenow-enabler-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_chargenow-enabler-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_chargenow-enabler-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_chargenow-enabler-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_chargenow-enabler-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_chargenow-enabler-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_chargenow-enabler-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_chargenow-enabler-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 62dc2449..00000000
--- a/BMW-Dynatrace-config/CD_chargenow-enabler-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDchargenow-enabler-service: template.json
-
-CDchargenow-enabler-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: chargenow-enabler-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_chargenow-enabler-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_chargenow-enabler-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_chargenow-enabler-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-data-privacy-composite/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_charging-data-privacy-composite/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_charging-data-privacy-composite/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-data-privacy-composite/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_charging-data-privacy-composite/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 907d7140..00000000
--- a/BMW-Dynatrace-config/CD_charging-data-privacy-composite/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcharging-data-privacy-composite: template.json
-
-CDcharging-data-privacy-composite:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: charging-data-privacy-composite
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_charging-data-privacy-composite/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_charging-data-privacy-composite/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_charging-data-privacy-composite/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-data-privacy-composite/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_charging-data-privacy-composite/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_charging-data-privacy-composite/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-data-privacy-composite/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_charging-data-privacy-composite/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 907d7140..00000000
--- a/BMW-Dynatrace-config/CD_charging-data-privacy-composite/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcharging-data-privacy-composite: template.json
-
-CDcharging-data-privacy-composite:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: charging-data-privacy-composite
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_charging-data-privacy-composite/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_charging-data-privacy-composite/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_charging-data-privacy-composite/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-data-privacy/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_charging-data-privacy/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_charging-data-privacy/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-data-privacy/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_charging-data-privacy/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index c6514b20..00000000
--- a/BMW-Dynatrace-config/CD_charging-data-privacy/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcharging-data-privacy: template.json
-
-CDcharging-data-privacy:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: charging-data-privacy
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_charging-data-privacy/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_charging-data-privacy/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_charging-data-privacy/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-data-privacy/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_charging-data-privacy/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_charging-data-privacy/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-data-privacy/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_charging-data-privacy/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index c6514b20..00000000
--- a/BMW-Dynatrace-config/CD_charging-data-privacy/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcharging-data-privacy: template.json
-
-CDcharging-data-privacy:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: charging-data-privacy
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_charging-data-privacy/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_charging-data-privacy/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_charging-data-privacy/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-events-push-notification-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_charging-events-push-notification-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_charging-events-push-notification-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-events-push-notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_charging-events-push-notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index e10d883e..00000000
--- a/BMW-Dynatrace-config/CD_charging-events-push-notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcharging-events-push-notification-service: template.json
-
-CDcharging-events-push-notification-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: charging-events-push-notification-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_charging-events-push-notification-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_charging-events-push-notification-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_charging-events-push-notification-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-events-push-notification-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_charging-events-push-notification-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_charging-events-push-notification-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-events-push-notification-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_charging-events-push-notification-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index e10d883e..00000000
--- a/BMW-Dynatrace-config/CD_charging-events-push-notification-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcharging-events-push-notification-service: template.json
-
-CDcharging-events-push-notification-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: charging-events-push-notification-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_charging-events-push-notification-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_charging-events-push-notification-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_charging-events-push-notification-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-events-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_charging-events-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_charging-events-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-events-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_charging-events-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index ca9d0ed8..00000000
--- a/BMW-Dynatrace-config/CD_charging-events-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcharging-events-service: template.json
-
-CDcharging-events-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: charging-events-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_charging-events-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_charging-events-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_charging-events-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-events-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_charging-events-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_charging-events-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-events-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_charging-events-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index ca9d0ed8..00000000
--- a/BMW-Dynatrace-config/CD_charging-events-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcharging-events-service: template.json
-
-CDcharging-events-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: charging-events-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_charging-events-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_charging-events-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_charging-events-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 49a892cc..00000000
--- a/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcharging-history-gdpr-proxy-service: template.json
-
-CDcharging-history-gdpr-proxy-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: charging-history-gdpr-proxy-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 49a892cc..00000000
--- a/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcharging-history-gdpr-proxy-service: template.json
-
-CDcharging-history-gdpr-proxy-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: charging-history-gdpr-proxy-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_charging-history-gdpr-proxy-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-plan-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_charging-plan-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_charging-plan-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-plan-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_charging-plan-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index e14b194e..00000000
--- a/BMW-Dynatrace-config/CD_charging-plan-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcharging-plan-composite-service: template.json
-
-CDcharging-plan-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: charging-plan-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_charging-plan-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_charging-plan-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_charging-plan-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-plan-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_charging-plan-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_charging-plan-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-plan-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_charging-plan-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index e14b194e..00000000
--- a/BMW-Dynatrace-config/CD_charging-plan-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcharging-plan-composite-service: template.json
-
-CDcharging-plan-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: charging-plan-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_charging-plan-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_charging-plan-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_charging-plan-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-push-notifications-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_charging-push-notifications-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_charging-push-notifications-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-push-notifications-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_charging-push-notifications-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 31f899df..00000000
--- a/BMW-Dynatrace-config/CD_charging-push-notifications-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcharging-push-notifications-service: template.json
-
-CDcharging-push-notifications-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: charging-push-notifications-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_charging-push-notifications-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_charging-push-notifications-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_charging-push-notifications-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-push-notifications-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_charging-push-notifications-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_charging-push-notifications-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-push-notifications-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_charging-push-notifications-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 31f899df..00000000
--- a/BMW-Dynatrace-config/CD_charging-push-notifications-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcharging-push-notifications-service: template.json
-
-CDcharging-push-notifications-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: charging-push-notifications-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_charging-push-notifications-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_charging-push-notifications-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_charging-push-notifications-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 21490dd3..00000000
--- a/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcharging-remote-commands-composite-service: template.json
-
-CDcharging-remote-commands-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: charging-remote-commands-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 21490dd3..00000000
--- a/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcharging-remote-commands-composite-service: template.json
-
-CDcharging-remote-commands-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: charging-remote-commands-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_charging-remote-commands-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 56909d0a..00000000
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcharging-sessions-service: template.json
-
-CDcharging-sessions-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: charging-sessions-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 56909d0a..00000000
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcharging-sessions-service: template.json
-
-CDcharging-sessions-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: charging-sessions-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_charging-sessions-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-stations-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_charging-stations-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_charging-stations-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-stations-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_charging-stations-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 9231ded2..00000000
--- a/BMW-Dynatrace-config/CD_charging-stations-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcharging-stations-service: template.json
-
-CDcharging-stations-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: charging-stations-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_charging-stations-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_charging-stations-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_charging-stations-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-stations-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_charging-stations-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_charging-stations-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_charging-stations-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_charging-stations-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 9231ded2..00000000
--- a/BMW-Dynatrace-config/CD_charging-stations-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcharging-stations-service: template.json
-
-CDcharging-stations-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: charging-stations-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_charging-stations-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_charging-stations-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_charging-stations-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 46660ea9..00000000
--- a/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDclient-agent-telemetry-processor: template.json
-
-CDclient-agent-telemetry-processor:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: client-agent-telemetry-processor
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 46660ea9..00000000
--- a/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDclient-agent-telemetry-processor: template.json
-
-CDclient-agent-telemetry-processor:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: client-agent-telemetry-processor
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_client-agent-telemetry-processor/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index c4c96932..00000000
--- a/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDclient-vehicle-telemetry-processor: template.json
-
-CDclient-vehicle-telemetry-processor:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: client-vehicle-telemetry-processor
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index c4c96932..00000000
--- a/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDclient-vehicle-telemetry-processor: template.json
-
-CDclient-vehicle-telemetry-processor:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: client-vehicle-telemetry-processor
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_client-vehicle-telemetry-processor/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cm/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_cm/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_cm/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cm/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_cm/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index ec64dfd5..00000000
--- a/BMW-Dynatrace-config/CD_cm/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcm: template.json
-
-CDcm:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: cm
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_cm/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_cm/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_cm/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cm/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_cm/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_cm/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_cm/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_cm/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index ec64dfd5..00000000
--- a/BMW-Dynatrace-config/CD_cm/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcm: template.json
-
-CDcm:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: cm
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_cm/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_cm/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_cm/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_commute-notification-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_commute-notification-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_commute-notification-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_commute-notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_commute-notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index b09bca0b..00000000
--- a/BMW-Dynatrace-config/CD_commute-notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcommute-notification-service: template.json
-
-CDcommute-notification-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: commute-notification-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_commute-notification-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_commute-notification-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_commute-notification-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_commute-notification-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_commute-notification-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_commute-notification-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_commute-notification-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_commute-notification-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index b09bca0b..00000000
--- a/BMW-Dynatrace-config/CD_commute-notification-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcommute-notification-service: template.json
-
-CDcommute-notification-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: commute-notification-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_commute-notification-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_commute-notification-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_commute-notification-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_commute-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_commute-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_commute-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_commute-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_commute-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 50252739..00000000
--- a/BMW-Dynatrace-config/CD_commute-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcommute-service: template.json
-
-CDcommute-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: commute-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_commute-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_commute-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_commute-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_commute-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_commute-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_commute-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_commute-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_commute-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 50252739..00000000
--- a/BMW-Dynatrace-config/CD_commute-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcommute-service: template.json
-
-CDcommute-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: commute-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_commute-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_commute-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_commute-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_connected-oauth-service-apim/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_connected-oauth-service-apim/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_connected-oauth-service-apim/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_connected-oauth-service-apim/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_connected-oauth-service-apim/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 4d2ff46b..00000000
--- a/BMW-Dynatrace-config/CD_connected-oauth-service-apim/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDconnected-oauth-service-apim: template.json
-
-CDconnected-oauth-service-apim:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: connected-oauth-service-apim
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_connected-oauth-service-apim/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_connected-oauth-service-apim/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_connected-oauth-service-apim/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_connected-oauth-service-apim/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_connected-oauth-service-apim/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_connected-oauth-service-apim/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_connected-oauth-service-apim/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_connected-oauth-service-apim/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 4d2ff46b..00000000
--- a/BMW-Dynatrace-config/CD_connected-oauth-service-apim/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDconnected-oauth-service-apim: template.json
-
-CDconnected-oauth-service-apim:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: connected-oauth-service-apim
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_connected-oauth-service-apim/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_connected-oauth-service-apim/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_connected-oauth-service-apim/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_connected-oauth-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_connected-oauth-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_connected-oauth-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_connected-oauth-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_connected-oauth-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index f9dbe435..00000000
--- a/BMW-Dynatrace-config/CD_connected-oauth-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDconnected-oauth-service: template.json
-
-CDconnected-oauth-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: connected-oauth-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_connected-oauth-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_connected-oauth-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_connected-oauth-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_connected-oauth-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_connected-oauth-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_connected-oauth-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_connected-oauth-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_connected-oauth-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index f9dbe435..00000000
--- a/BMW-Dynatrace-config/CD_connected-oauth-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDconnected-oauth-service: template.json
-
-CDconnected-oauth-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: connected-oauth-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_connected-oauth-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_connected-oauth-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_connected-oauth-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_connected-onboard-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_connected-onboard-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_connected-onboard-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_connected-onboard-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_connected-onboard-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 26e4f359..00000000
--- a/BMW-Dynatrace-config/CD_connected-onboard-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDconnected-onboard-composite-service: template.json
-
-CDconnected-onboard-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: connected-onboard-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_connected-onboard-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_connected-onboard-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_connected-onboard-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_connected-onboard-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_connected-onboard-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_connected-onboard-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_connected-onboard-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_connected-onboard-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 26e4f359..00000000
--- a/BMW-Dynatrace-config/CD_connected-onboard-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDconnected-onboard-composite-service: template.json
-
-CDconnected-onboard-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: connected-onboard-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_connected-onboard-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_connected-onboard-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_connected-onboard-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_csu/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_csu/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_csu/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_csu/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_csu/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 3103085c..00000000
--- a/BMW-Dynatrace-config/CD_csu/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcsu: template.json
-
-CDcsu:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: csu
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_csu/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_csu/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_csu/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_csu/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_csu/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_csu/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_csu/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_csu/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 3103085c..00000000
--- a/BMW-Dynatrace-config/CD_csu/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcsu: template.json
-
-CDcsu:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: csu
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_csu/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_csu/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_csu/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ctns-event-origin/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ctns-event-origin/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ctns-event-origin/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ctns-event-origin/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ctns-event-origin/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 2af94786..00000000
--- a/BMW-Dynatrace-config/CD_ctns-event-origin/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDctns-event-origin: template.json
-
-CDctns-event-origin:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ctns-event-origin
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ctns-event-origin/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ctns-event-origin/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ctns-event-origin/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ctns-event-origin/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ctns-event-origin/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ctns-event-origin/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ctns-event-origin/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ctns-event-origin/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 2af94786..00000000
--- a/BMW-Dynatrace-config/CD_ctns-event-origin/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDctns-event-origin: template.json
-
-CDctns-event-origin:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ctns-event-origin
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ctns-event-origin/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ctns-event-origin/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ctns-event-origin/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ctns-marketing-api/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ctns-marketing-api/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ctns-marketing-api/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ctns-marketing-api/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ctns-marketing-api/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 5dbb5acd..00000000
--- a/BMW-Dynatrace-config/CD_ctns-marketing-api/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDctns-marketing-api: template.json
-
-CDctns-marketing-api:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ctns-marketing-api
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ctns-marketing-api/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ctns-marketing-api/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ctns-marketing-api/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ctns-marketing-api/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ctns-marketing-api/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ctns-marketing-api/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ctns-marketing-api/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ctns-marketing-api/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 5dbb5acd..00000000
--- a/BMW-Dynatrace-config/CD_ctns-marketing-api/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDctns-marketing-api: template.json
-
-CDctns-marketing-api:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ctns-marketing-api
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ctns-marketing-api/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ctns-marketing-api/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ctns-marketing-api/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ctns-vehicle-api/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ctns-vehicle-api/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ctns-vehicle-api/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ctns-vehicle-api/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ctns-vehicle-api/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index ceb4649c..00000000
--- a/BMW-Dynatrace-config/CD_ctns-vehicle-api/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDctns-vehicle-api: template.json
-
-CDctns-vehicle-api:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ctns-vehicle-api
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ctns-vehicle-api/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ctns-vehicle-api/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ctns-vehicle-api/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ctns-vehicle-api/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ctns-vehicle-api/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ctns-vehicle-api/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ctns-vehicle-api/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ctns-vehicle-api/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index ceb4649c..00000000
--- a/BMW-Dynatrace-config/CD_ctns-vehicle-api/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDctns-vehicle-api: template.json
-
-CDctns-vehicle-api:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ctns-vehicle-api
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ctns-vehicle-api/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ctns-vehicle-api/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ctns-vehicle-api/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_current-driver-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_current-driver-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_current-driver-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_current-driver-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_current-driver-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index b2ec58f8..00000000
--- a/BMW-Dynatrace-config/CD_current-driver-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcurrent-driver-service: template.json
-
-CDcurrent-driver-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: current-driver-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_current-driver-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_current-driver-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_current-driver-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_current-driver-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_current-driver-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_current-driver-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_current-driver-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_current-driver-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index b2ec58f8..00000000
--- a/BMW-Dynatrace-config/CD_current-driver-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDcurrent-driver-service: template.json
-
-CDcurrent-driver-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: current-driver-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_current-driver-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_current-driver-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_current-driver-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_data-deletion-processor/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_data-deletion-processor/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_data-deletion-processor/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_data-deletion-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_data-deletion-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 52988a86..00000000
--- a/BMW-Dynatrace-config/CD_data-deletion-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdata-deletion-processor: template.json
-
-CDdata-deletion-processor:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: data-deletion-processor
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_data-deletion-processor/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_data-deletion-processor/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_data-deletion-processor/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_data-deletion-processor/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_data-deletion-processor/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_data-deletion-processor/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_data-deletion-processor/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_data-deletion-processor/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 52988a86..00000000
--- a/BMW-Dynatrace-config/CD_data-deletion-processor/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdata-deletion-processor: template.json
-
-CDdata-deletion-processor:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: data-deletion-processor
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_data-deletion-processor/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_data-deletion-processor/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_data-deletion-processor/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-comms-provider-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_dealer-comms-provider-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_dealer-comms-provider-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-comms-provider-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_dealer-comms-provider-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index a7f361d9..00000000
--- a/BMW-Dynatrace-config/CD_dealer-comms-provider-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdealer-comms-provider-service: template.json
-
-CDdealer-comms-provider-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: dealer-comms-provider-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_dealer-comms-provider-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_dealer-comms-provider-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_dealer-comms-provider-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-comms-provider-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_dealer-comms-provider-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_dealer-comms-provider-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-comms-provider-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_dealer-comms-provider-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index a7f361d9..00000000
--- a/BMW-Dynatrace-config/CD_dealer-comms-provider-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdealer-comms-provider-service: template.json
-
-CDdealer-comms-provider-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: dealer-comms-provider-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_dealer-comms-provider-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_dealer-comms-provider-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_dealer-comms-provider-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-data-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_dealer-data-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_dealer-data-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-data-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_dealer-data-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 8f3ba023..00000000
--- a/BMW-Dynatrace-config/CD_dealer-data-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdealer-data-service: template.json
-
-CDdealer-data-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: dealer-data-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_dealer-data-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_dealer-data-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_dealer-data-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-data-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_dealer-data-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_dealer-data-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-data-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_dealer-data-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 8f3ba023..00000000
--- a/BMW-Dynatrace-config/CD_dealer-data-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdealer-data-service: template.json
-
-CDdealer-data-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: dealer-data-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_dealer-data-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_dealer-data-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_dealer-data-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index c62295fb..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdealer-payments-invoice-service: template.json
-
-CDdealer-payments-invoice-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: dealer-payments-invoice-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index c62295fb..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdealer-payments-invoice-service: template.json
-
-CDdealer-payments-invoice-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: dealer-payments-invoice-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-invoice-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-notification-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_dealer-payments-notification-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-notification-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_dealer-payments-notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 938b94f4..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdealer-payments-notification-service: template.json
-
-CDdealer-payments-notification-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: dealer-payments-notification-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-notification-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_dealer-payments-notification-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-notification-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-notification-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_dealer-payments-notification-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-notification-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-notification-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_dealer-payments-notification-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 938b94f4..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-notification-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdealer-payments-notification-service: template.json
-
-CDdealer-payments-notification-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: dealer-payments-notification-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-notification-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_dealer-payments-notification-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-notification-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_dealer-payments-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_dealer-payments-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 6a8b1f6a..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdealer-payments-service: template.json
-
-CDdealer-payments-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: dealer-payments-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_dealer-payments-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_dealer-payments-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_dealer-payments-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 6a8b1f6a..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdealer-payments-service: template.json
-
-CDdealer-payments-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: dealer-payments-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_dealer-payments-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_dealer-payments-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_dealer-payments-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-search-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_dealer-search-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_dealer-search-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-search-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_dealer-search-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index dca98b9d..00000000
--- a/BMW-Dynatrace-config/CD_dealer-search-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdealer-search-service: template.json
-
-CDdealer-search-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: dealer-search-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_dealer-search-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_dealer-search-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_dealer-search-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-search-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_dealer-search-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_dealer-search-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-search-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_dealer-search-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index dca98b9d..00000000
--- a/BMW-Dynatrace-config/CD_dealer-search-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdealer-search-service: template.json
-
-CDdealer-search-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: dealer-search-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_dealer-search-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_dealer-search-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_dealer-search-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-services-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_dealer-services-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_dealer-services-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-services-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_dealer-services-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 7dae1bce..00000000
--- a/BMW-Dynatrace-config/CD_dealer-services-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdealer-services-composite-service: template.json
-
-CDdealer-services-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: dealer-services-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_dealer-services-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_dealer-services-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_dealer-services-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-services-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_dealer-services-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_dealer-services-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealer-services-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_dealer-services-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 7dae1bce..00000000
--- a/BMW-Dynatrace-config/CD_dealer-services-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdealer-services-composite-service: template.json
-
-CDdealer-services-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: dealer-services-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_dealer-services-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_dealer-services-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_dealer-services-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealercockpit/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_dealercockpit/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_dealercockpit/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealercockpit/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_dealercockpit/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 0033f8e9..00000000
--- a/BMW-Dynatrace-config/CD_dealercockpit/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdealercockpit: template.json
-
-CDdealercockpit:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: dealercockpit
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_dealercockpit/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_dealercockpit/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_dealercockpit/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealercockpit/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_dealercockpit/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_dealercockpit/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dealercockpit/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_dealercockpit/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 0033f8e9..00000000
--- a/BMW-Dynatrace-config/CD_dealercockpit/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdealercockpit: template.json
-
-CDdealercockpit:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: dealercockpit
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_dealercockpit/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_dealercockpit/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_dealercockpit/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_delivery/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_delivery/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_delivery/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_delivery/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_delivery/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index a6066bf0..00000000
--- a/BMW-Dynatrace-config/CD_delivery/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdelivery: template.json
-
-CDdelivery:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: delivery
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_delivery/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_delivery/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_delivery/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_delivery/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_delivery/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_delivery/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_delivery/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_delivery/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index a6066bf0..00000000
--- a/BMW-Dynatrace-config/CD_delivery/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdelivery: template.json
-
-CDdelivery:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: delivery
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_delivery/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_delivery/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_delivery/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_destination-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_destination-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_destination-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_destination-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_destination-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 7e7d216a..00000000
--- a/BMW-Dynatrace-config/CD_destination-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdestination-composite-service: template.json
-
-CDdestination-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: destination-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_destination-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_destination-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_destination-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_destination-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_destination-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_destination-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_destination-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_destination-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 7e7d216a..00000000
--- a/BMW-Dynatrace-config/CD_destination-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdestination-composite-service: template.json
-
-CDdestination-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: destination-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_destination-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_destination-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_destination-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_digital-key-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_digital-key-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_digital-key-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_digital-key-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_digital-key-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 238f60d9..00000000
--- a/BMW-Dynatrace-config/CD_digital-key-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdigital-key-composite-service: template.json
-
-CDdigital-key-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: digital-key-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_digital-key-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_digital-key-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_digital-key-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_digital-key-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_digital-key-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_digital-key-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_digital-key-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_digital-key-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 238f60d9..00000000
--- a/BMW-Dynatrace-config/CD_digital-key-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdigital-key-composite-service: template.json
-
-CDdigital-key-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: digital-key-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_digital-key-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_digital-key-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_digital-key-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_discover-bmw-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_discover-bmw-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_discover-bmw-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_discover-bmw-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_discover-bmw-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 48e1f3c9..00000000
--- a/BMW-Dynatrace-config/CD_discover-bmw-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdiscover-bmw-composite-service: template.json
-
-CDdiscover-bmw-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: discover-bmw-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_discover-bmw-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_discover-bmw-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_discover-bmw-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_discover-bmw-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_discover-bmw-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_discover-bmw-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_discover-bmw-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_discover-bmw-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 48e1f3c9..00000000
--- a/BMW-Dynatrace-config/CD_discover-bmw-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdiscover-bmw-composite-service: template.json
-
-CDdiscover-bmw-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: discover-bmw-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_discover-bmw-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_discover-bmw-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_discover-bmw-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dsd/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_dsd/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_dsd/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dsd/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_dsd/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 09b9f03f..00000000
--- a/BMW-Dynatrace-config/CD_dsd/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdsd: template.json
-
-CDdsd:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: dsd
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_dsd/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_dsd/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_dsd/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dsd/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_dsd/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_dsd/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_dsd/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_dsd/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 09b9f03f..00000000
--- a/BMW-Dynatrace-config/CD_dsd/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDdsd: template.json
-
-CDdsd:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: dsd
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_dsd/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_dsd/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_dsd/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_eadb/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_eadb/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_eadb/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_eadb/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_eadb/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 6208aeb6..00000000
--- a/BMW-Dynatrace-config/CD_eadb/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDeadb: template.json
-
-CDeadb:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: eadb
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_eadb/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_eadb/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_eadb/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_eadb/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_eadb/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_eadb/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_eadb/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_eadb/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 6208aeb6..00000000
--- a/BMW-Dynatrace-config/CD_eadb/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDeadb: template.json
-
-CDeadb:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: eadb
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_eadb/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_eadb/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_eadb/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ercaf/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ercaf/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ercaf/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ercaf/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ercaf/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 02308b84..00000000
--- a/BMW-Dynatrace-config/CD_ercaf/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDercaf: template.json
-
-CDercaf:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ercaf
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ercaf/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ercaf/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ercaf/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ercaf/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ercaf/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ercaf/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ercaf/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ercaf/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 02308b84..00000000
--- a/BMW-Dynatrace-config/CD_ercaf/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDercaf: template.json
-
-CDercaf:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ercaf
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ercaf/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ercaf/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ercaf/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ercr/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ercr/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ercr/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ercr/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ercr/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 30d7c739..00000000
--- a/BMW-Dynatrace-config/CD_ercr/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDercr: template.json
-
-CDercr:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ercr
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ercr/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ercr/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ercr/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ercr/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ercr/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ercr/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ercr/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ercr/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 30d7c739..00000000
--- a/BMW-Dynatrace-config/CD_ercr/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDercr: template.json
-
-CDercr:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ercr
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ercr/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ercr/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ercr/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_erd/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_erd/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_erd/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_erd/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_erd/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 4c2273b1..00000000
--- a/BMW-Dynatrace-config/CD_erd/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDerd: template.json
-
-CDerd:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: erd
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_erd/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_erd/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_erd/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_erd/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_erd/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_erd/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_erd/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_erd/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 4c2273b1..00000000
--- a/BMW-Dynatrace-config/CD_erd/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDerd: template.json
-
-CDerd:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: erd
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_erd/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_erd/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_erd/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_esh/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_esh/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_esh/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_esh/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_esh/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index ff61a5c4..00000000
--- a/BMW-Dynatrace-config/CD_esh/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDesh: template.json
-
-CDesh:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: esh
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_esh/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_esh/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_esh/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_esh/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_esh/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_esh/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_esh/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_esh/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index ff61a5c4..00000000
--- a/BMW-Dynatrace-config/CD_esh/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDesh: template.json
-
-CDesh:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: esh
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_esh/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_esh/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_esh/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_esim-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_esim-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_esim-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_esim-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_esim-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 484b8cd0..00000000
--- a/BMW-Dynatrace-config/CD_esim-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDesim-composite-service: template.json
-
-CDesim-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: esim-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_esim-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_esim-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_esim-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_esim-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_esim-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_esim-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_esim-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_esim-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 484b8cd0..00000000
--- a/BMW-Dynatrace-config/CD_esim-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDesim-composite-service: template.json
-
-CDesim-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: esim-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_esim-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_esim-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_esim-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_explore-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_explore-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_explore-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_explore-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_explore-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 0fa3cf61..00000000
--- a/BMW-Dynatrace-config/CD_explore-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDexplore-composite-service: template.json
-
-CDexplore-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: explore-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_explore-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_explore-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_explore-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_explore-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_explore-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_explore-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_explore-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_explore-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 0fa3cf61..00000000
--- a/BMW-Dynatrace-config/CD_explore-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDexplore-composite-service: template.json
-
-CDexplore-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: explore-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_explore-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_explore-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_explore-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_feature-toggles-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_feature-toggles-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_feature-toggles-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_feature-toggles-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_feature-toggles-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 1dfcba34..00000000
--- a/BMW-Dynatrace-config/CD_feature-toggles-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDfeature-toggles-service: template.json
-
-CDfeature-toggles-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: feature-toggles-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_feature-toggles-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_feature-toggles-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_feature-toggles-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_feature-toggles-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_feature-toggles-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_feature-toggles-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_feature-toggles-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_feature-toggles-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 1dfcba34..00000000
--- a/BMW-Dynatrace-config/CD_feature-toggles-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDfeature-toggles-service: template.json
-
-CDfeature-toggles-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: feature-toggles-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_feature-toggles-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_feature-toggles-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_feature-toggles-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_fmc/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_fmc/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_fmc/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_fmc/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_fmc/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 99685fb8..00000000
--- a/BMW-Dynatrace-config/CD_fmc/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDfmc: template.json
-
-CDfmc:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: fmc
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_fmc/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_fmc/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_fmc/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_fmc/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_fmc/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_fmc/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_fmc/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_fmc/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 99685fb8..00000000
--- a/BMW-Dynatrace-config/CD_fmc/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDfmc: template.json
-
-CDfmc:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: fmc
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_fmc/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_fmc/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_fmc/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_fuel-search-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_fuel-search-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_fuel-search-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_fuel-search-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_fuel-search-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index e4bdb903..00000000
--- a/BMW-Dynatrace-config/CD_fuel-search-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDfuel-search-service: template.json
-
-CDfuel-search-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: fuel-search-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_fuel-search-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_fuel-search-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_fuel-search-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_fuel-search-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_fuel-search-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_fuel-search-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_fuel-search-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_fuel-search-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index e4bdb903..00000000
--- a/BMW-Dynatrace-config/CD_fuel-search-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDfuel-search-service: template.json
-
-CDfuel-search-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: fuel-search-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_fuel-search-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_fuel-search-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_fuel-search-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_hpauth/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_hpauth/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_hpauth/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_hpauth/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_hpauth/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 56d546ac..00000000
--- a/BMW-Dynatrace-config/CD_hpauth/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDhpauth: template.json
-
-CDhpauth:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: hpauth
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_hpauth/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_hpauth/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_hpauth/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_hpauth/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_hpauth/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_hpauth/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_hpauth/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_hpauth/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 56d546ac..00000000
--- a/BMW-Dynatrace-config/CD_hpauth/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDhpauth: template.json
-
-CDhpauth:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: hpauth
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_hpauth/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_hpauth/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_hpauth/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_hubtab-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_hubtab-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_hubtab-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_hubtab-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_hubtab-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 12a07306..00000000
--- a/BMW-Dynatrace-config/CD_hubtab-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDhubtab-service: template.json
-
-CDhubtab-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: hubtab-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_hubtab-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_hubtab-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_hubtab-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_hubtab-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_hubtab-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_hubtab-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_hubtab-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_hubtab-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 12a07306..00000000
--- a/BMW-Dynatrace-config/CD_hubtab-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDhubtab-service: template.json
-
-CDhubtab-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: hubtab-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_hubtab-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_hubtab-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_hubtab-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_id-lookup-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_id-lookup-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_id-lookup-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_id-lookup-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_id-lookup-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index a25b68f3..00000000
--- a/BMW-Dynatrace-config/CD_id-lookup-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDid-lookup-service: template.json
-
-CDid-lookup-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: id-lookup-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_id-lookup-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_id-lookup-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_id-lookup-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_id-lookup-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_id-lookup-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_id-lookup-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_id-lookup-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_id-lookup-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index a25b68f3..00000000
--- a/BMW-Dynatrace-config/CD_id-lookup-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDid-lookup-service: template.json
-
-CDid-lookup-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: id-lookup-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_id-lookup-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_id-lookup-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_id-lookup-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-admin/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ids-admin/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ids-admin/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-admin/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ids-admin/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 31d78ba4..00000000
--- a/BMW-Dynatrace-config/CD_ids-admin/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDids-admin: template.json
-
-CDids-admin:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ids-admin
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ids-admin/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ids-admin/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ids-admin/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-admin/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ids-admin/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ids-admin/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-admin/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ids-admin/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 31d78ba4..00000000
--- a/BMW-Dynatrace-config/CD_ids-admin/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDids-admin: template.json
-
-CDids-admin:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ids-admin
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ids-admin/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ids-admin/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ids-admin/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-svds/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ids-svds/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ids-svds/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-svds/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ids-svds/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index decc6ab2..00000000
--- a/BMW-Dynatrace-config/CD_ids-svds/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDids-svds: template.json
-
-CDids-svds:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ids-svds
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ids-svds/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ids-svds/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ids-svds/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-svds/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ids-svds/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ids-svds/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-svds/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ids-svds/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index decc6ab2..00000000
--- a/BMW-Dynatrace-config/CD_ids-svds/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDids-svds: template.json
-
-CDids-svds:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ids-svds
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ids-svds/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ids-svds/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ids-svds/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-sync/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ids-sync/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ids-sync/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-sync/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ids-sync/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 2b06b721..00000000
--- a/BMW-Dynatrace-config/CD_ids-sync/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDids-sync: template.json
-
-CDids-sync:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ids-sync
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ids-sync/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ids-sync/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ids-sync/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-sync/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ids-sync/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ids-sync/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-sync/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ids-sync/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 2b06b721..00000000
--- a/BMW-Dynatrace-config/CD_ids-sync/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDids-sync: template.json
-
-CDids-sync:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ids-sync
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ids-sync/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ids-sync/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ids-sync/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-ws/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ids-ws/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ids-ws/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-ws/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ids-ws/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 00d14cf9..00000000
--- a/BMW-Dynatrace-config/CD_ids-ws/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDids-ws: template.json
-
-CDids-ws:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ids-ws
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ids-ws/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ids-ws/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ids-ws/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-ws/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ids-ws/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ids-ws/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ids-ws/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ids-ws/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 00d14cf9..00000000
--- a/BMW-Dynatrace-config/CD_ids-ws/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDids-ws: template.json
-
-CDids-ws:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ids-ws
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ids-ws/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ids-ws/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ids-ws/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_image-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_image-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_image-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_image-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_image-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 28009396..00000000
--- a/BMW-Dynatrace-config/CD_image-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDimage-composite-service: template.json
-
-CDimage-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: image-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_image-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_image-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_image-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_image-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_image-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_image-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_image-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_image-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 28009396..00000000
--- a/BMW-Dynatrace-config/CD_image-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDimage-composite-service: template.json
-
-CDimage-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: image-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_image-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_image-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_image-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_imiles-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_imiles-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_imiles-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_imiles-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_imiles-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 001949c7..00000000
--- a/BMW-Dynatrace-config/CD_imiles-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDimiles-service: template.json
-
-CDimiles-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: imiles-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_imiles-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_imiles-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_imiles-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_imiles-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_imiles-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_imiles-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_imiles-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_imiles-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 001949c7..00000000
--- a/BMW-Dynatrace-config/CD_imiles-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDimiles-service: template.json
-
-CDimiles-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: imiles-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_imiles-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_imiles-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_imiles-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ipa-gateway/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ipa-gateway/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ipa-gateway/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ipa-gateway/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ipa-gateway/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 7cf80534..00000000
--- a/BMW-Dynatrace-config/CD_ipa-gateway/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDipa-gateway: template.json
-
-CDipa-gateway:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ipa-gateway
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ipa-gateway/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ipa-gateway/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ipa-gateway/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ipa-gateway/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ipa-gateway/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ipa-gateway/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ipa-gateway/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ipa-gateway/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 7cf80534..00000000
--- a/BMW-Dynatrace-config/CD_ipa-gateway/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDipa-gateway: template.json
-
-CDipa-gateway:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ipa-gateway
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ipa-gateway/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ipa-gateway/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ipa-gateway/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_jdssp21/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_jdssp21/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_jdssp21/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_jdssp21/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_jdssp21/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index cb9f3c86..00000000
--- a/BMW-Dynatrace-config/CD_jdssp21/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDjdssp21: template.json
-
-CDjdssp21:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: jdssp21
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_jdssp21/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_jdssp21/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_jdssp21/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_jdssp21/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_jdssp21/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_jdssp21/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_jdssp21/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_jdssp21/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index cb9f3c86..00000000
--- a/BMW-Dynatrace-config/CD_jdssp21/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDjdssp21: template.json
-
-CDjdssp21:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: jdssp21
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_jdssp21/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_jdssp21/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_jdssp21/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_legacy-deletion-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_legacy-deletion-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_legacy-deletion-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_legacy-deletion-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_legacy-deletion-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index acc19556..00000000
--- a/BMW-Dynatrace-config/CD_legacy-deletion-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDlegacy-deletion-service: template.json
-
-CDlegacy-deletion-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: legacy-deletion-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_legacy-deletion-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_legacy-deletion-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_legacy-deletion-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_legacy-deletion-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_legacy-deletion-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_legacy-deletion-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_legacy-deletion-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_legacy-deletion-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index acc19556..00000000
--- a/BMW-Dynatrace-config/CD_legacy-deletion-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDlegacy-deletion-service: template.json
-
-CDlegacy-deletion-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: legacy-deletion-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_legacy-deletion-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_legacy-deletion-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_legacy-deletion-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_legacy-sar-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_legacy-sar-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_legacy-sar-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_legacy-sar-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_legacy-sar-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 9295a863..00000000
--- a/BMW-Dynatrace-config/CD_legacy-sar-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDlegacy-sar-service: template.json
-
-CDlegacy-sar-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: legacy-sar-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_legacy-sar-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_legacy-sar-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_legacy-sar-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_legacy-sar-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_legacy-sar-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_legacy-sar-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_legacy-sar-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_legacy-sar-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 9295a863..00000000
--- a/BMW-Dynatrace-config/CD_legacy-sar-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDlegacy-sar-service: template.json
-
-CDlegacy-sar-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: legacy-sar-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_legacy-sar-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_legacy-sar-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_legacy-sar-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_legal-document-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_legal-document-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_legal-document-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_legal-document-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_legal-document-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index a5a9491e..00000000
--- a/BMW-Dynatrace-config/CD_legal-document-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDlegal-document-composite-service: template.json
-
-CDlegal-document-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: legal-document-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_legal-document-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_legal-document-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_legal-document-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_legal-document-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_legal-document-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_legal-document-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_legal-document-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_legal-document-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index a5a9491e..00000000
--- a/BMW-Dynatrace-config/CD_legal-document-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDlegal-document-composite-service: template.json
-
-CDlegal-document-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: legal-document-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_legal-document-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_legal-document-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_legal-document-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_log-data-deletion-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_log-data-deletion-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_log-data-deletion-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_log-data-deletion-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_log-data-deletion-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index c2a0ca11..00000000
--- a/BMW-Dynatrace-config/CD_log-data-deletion-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDlog-data-deletion-service: template.json
-
-CDlog-data-deletion-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: log-data-deletion-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_log-data-deletion-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_log-data-deletion-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_log-data-deletion-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_log-data-deletion-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_log-data-deletion-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_log-data-deletion-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_log-data-deletion-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_log-data-deletion-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index c2a0ca11..00000000
--- a/BMW-Dynatrace-config/CD_log-data-deletion-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDlog-data-deletion-service: template.json
-
-CDlog-data-deletion-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: log-data-deletion-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_log-data-deletion-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_log-data-deletion-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_log-data-deletion-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-kc/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_lsc-kc/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_lsc-kc/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-kc/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_lsc-kc/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index fbca5175..00000000
--- a/BMW-Dynatrace-config/CD_lsc-kc/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDlsc-kc: template.json
-
-CDlsc-kc:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: lsc-kc
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_lsc-kc/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_lsc-kc/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_lsc-kc/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-kc/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_lsc-kc/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_lsc-kc/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-kc/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_lsc-kc/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index fbca5175..00000000
--- a/BMW-Dynatrace-config/CD_lsc-kc/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDlsc-kc: template.json
-
-CDlsc-kc:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: lsc-kc
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_lsc-kc/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_lsc-kc/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_lsc-kc/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-mm/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_lsc-mm/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_lsc-mm/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-mm/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_lsc-mm/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 48f51136..00000000
--- a/BMW-Dynatrace-config/CD_lsc-mm/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDlsc-mm: template.json
-
-CDlsc-mm:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: lsc-mm
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_lsc-mm/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_lsc-mm/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_lsc-mm/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-mm/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_lsc-mm/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_lsc-mm/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-mm/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_lsc-mm/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 48f51136..00000000
--- a/BMW-Dynatrace-config/CD_lsc-mm/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDlsc-mm: template.json
-
-CDlsc-mm:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: lsc-mm
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_lsc-mm/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_lsc-mm/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_lsc-mm/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-oc/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_lsc-oc/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_lsc-oc/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-oc/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_lsc-oc/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index c3595bf2..00000000
--- a/BMW-Dynatrace-config/CD_lsc-oc/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDlsc-oc: template.json
-
-CDlsc-oc:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: lsc-oc
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_lsc-oc/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_lsc-oc/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_lsc-oc/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-oc/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_lsc-oc/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_lsc-oc/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-oc/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_lsc-oc/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index c3595bf2..00000000
--- a/BMW-Dynatrace-config/CD_lsc-oc/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDlsc-oc: template.json
-
-CDlsc-oc:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: lsc-oc
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_lsc-oc/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_lsc-oc/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_lsc-oc/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-og/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_lsc-og/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_lsc-og/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-og/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_lsc-og/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 04ac9831..00000000
--- a/BMW-Dynatrace-config/CD_lsc-og/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDlsc-og: template.json
-
-CDlsc-og:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: lsc-og
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_lsc-og/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_lsc-og/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_lsc-og/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-og/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_lsc-og/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_lsc-og/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_lsc-og/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_lsc-og/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 04ac9831..00000000
--- a/BMW-Dynatrace-config/CD_lsc-og/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDlsc-og: template.json
-
-CDlsc-og:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: lsc-og
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_lsc-og/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_lsc-og/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_lsc-og/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mds/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_mds/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_mds/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mds/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_mds/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 750dbdb5..00000000
--- a/BMW-Dynatrace-config/CD_mds/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDmds: template.json
-
-CDmds:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: mds
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_mds/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_mds/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_mds/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mds/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_mds/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_mds/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mds/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_mds/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 750dbdb5..00000000
--- a/BMW-Dynatrace-config/CD_mds/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDmds: template.json
-
-CDmds:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: mds
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_mds/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_mds/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_mds/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ml-ingestion-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ml-ingestion-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ml-ingestion-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ml-ingestion-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ml-ingestion-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 5de351db..00000000
--- a/BMW-Dynatrace-config/CD_ml-ingestion-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDml-ingestion-service: template.json
-
-CDml-ingestion-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ml-ingestion-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ml-ingestion-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ml-ingestion-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ml-ingestion-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ml-ingestion-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ml-ingestion-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ml-ingestion-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ml-ingestion-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ml-ingestion-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 5de351db..00000000
--- a/BMW-Dynatrace-config/CD_ml-ingestion-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDml-ingestion-service: template.json
-
-CDml-ingestion-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ml-ingestion-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ml-ingestion-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ml-ingestion-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ml-ingestion-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mlc/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_mlc/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_mlc/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mlc/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_mlc/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 9c1908e7..00000000
--- a/BMW-Dynatrace-config/CD_mlc/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDmlc: template.json
-
-CDmlc:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: mlc
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_mlc/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_mlc/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_mlc/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mlc/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_mlc/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_mlc/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mlc/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_mlc/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 9c1908e7..00000000
--- a/BMW-Dynatrace-config/CD_mlc/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDmlc: template.json
-
-CDmlc:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: mlc
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_mlc/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_mlc/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_mlc/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mrp/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_mrp/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_mrp/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mrp/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_mrp/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 0b3d9b1d..00000000
--- a/BMW-Dynatrace-config/CD_mrp/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDmrp: template.json
-
-CDmrp:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: mrp
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_mrp/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_mrp/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_mrp/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mrp/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_mrp/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_mrp/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mrp/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_mrp/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 0b3d9b1d..00000000
--- a/BMW-Dynatrace-config/CD_mrp/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDmrp: template.json
-
-CDmrp:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: mrp
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_mrp/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_mrp/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_mrp/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mrpspringboot/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_mrpspringboot/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_mrpspringboot/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mrpspringboot/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_mrpspringboot/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 1f16fe2c..00000000
--- a/BMW-Dynatrace-config/CD_mrpspringboot/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDmrpspringboot: template.json
-
-CDmrpspringboot:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: mrpspringboot
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_mrpspringboot/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_mrpspringboot/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_mrpspringboot/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mrpspringboot/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_mrpspringboot/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_mrpspringboot/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_mrpspringboot/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_mrpspringboot/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 1f16fe2c..00000000
--- a/BMW-Dynatrace-config/CD_mrpspringboot/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDmrpspringboot: template.json
-
-CDmrpspringboot:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: mrpspringboot
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_mrpspringboot/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_mrpspringboot/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_mrpspringboot/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-admin/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_nop-admin/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_nop-admin/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-admin/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_nop-admin/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index ca38a5f0..00000000
--- a/BMW-Dynatrace-config/CD_nop-admin/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDnop-admin: template.json
-
-CDnop-admin:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: nop-admin
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_nop-admin/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_nop-admin/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_nop-admin/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-admin/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_nop-admin/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_nop-admin/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-admin/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_nop-admin/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index ca38a5f0..00000000
--- a/BMW-Dynatrace-config/CD_nop-admin/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDnop-admin: template.json
-
-CDnop-admin:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: nop-admin
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_nop-admin/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_nop-admin/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_nop-admin/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-archive/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_nop-archive/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_nop-archive/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-archive/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_nop-archive/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index bbd93782..00000000
--- a/BMW-Dynatrace-config/CD_nop-archive/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDnop-archive: template.json
-
-CDnop-archive:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: nop-archive
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_nop-archive/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_nop-archive/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_nop-archive/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-archive/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_nop-archive/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_nop-archive/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-archive/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_nop-archive/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index bbd93782..00000000
--- a/BMW-Dynatrace-config/CD_nop-archive/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDnop-archive: template.json
-
-CDnop-archive:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: nop-archive
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_nop-archive/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_nop-archive/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_nop-archive/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-provisioning/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_nop-provisioning/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_nop-provisioning/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-provisioning/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_nop-provisioning/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index dfa486d9..00000000
--- a/BMW-Dynatrace-config/CD_nop-provisioning/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDnop-provisioning: template.json
-
-CDnop-provisioning:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: nop-provisioning
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_nop-provisioning/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_nop-provisioning/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_nop-provisioning/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-provisioning/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_nop-provisioning/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_nop-provisioning/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-provisioning/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_nop-provisioning/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index dfa486d9..00000000
--- a/BMW-Dynatrace-config/CD_nop-provisioning/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDnop-provisioning: template.json
-
-CDnop-provisioning:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: nop-provisioning
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_nop-provisioning/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_nop-provisioning/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_nop-provisioning/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-trigger/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_nop-trigger/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_nop-trigger/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-trigger/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_nop-trigger/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index bc089870..00000000
--- a/BMW-Dynatrace-config/CD_nop-trigger/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDnop-trigger: template.json
-
-CDnop-trigger:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: nop-trigger
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_nop-trigger/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_nop-trigger/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_nop-trigger/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-trigger/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_nop-trigger/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_nop-trigger/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_nop-trigger/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_nop-trigger/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index bc089870..00000000
--- a/BMW-Dynatrace-config/CD_nop-trigger/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDnop-trigger: template.json
-
-CDnop-trigger:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: nop-trigger
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_nop-trigger/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_nop-trigger/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_nop-trigger/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_notification-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_notification-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_notification-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_notification-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_notification-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 0cd12c57..00000000
--- a/BMW-Dynatrace-config/CD_notification-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDnotification-composite-service: template.json
-
-CDnotification-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: notification-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_notification-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_notification-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_notification-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_notification-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_notification-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_notification-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_notification-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_notification-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 0cd12c57..00000000
--- a/BMW-Dynatrace-config/CD_notification-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDnotification-composite-service: template.json
-
-CDnotification-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: notification-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_notification-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_notification-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_notification-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_notification-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_notification-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_notification-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 99005541..00000000
--- a/BMW-Dynatrace-config/CD_notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDnotification-service: template.json
-
-CDnotification-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: notification-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_notification-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_notification-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_notification-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_notification-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_notification-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_notification-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_notification-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_notification-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 99005541..00000000
--- a/BMW-Dynatrace-config/CD_notification-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDnotification-service: template.json
-
-CDnotification-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: notification-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_notification-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_notification-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_notification-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_oas-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_oas-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_oas-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_oas-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_oas-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index ee76d40c..00000000
--- a/BMW-Dynatrace-config/CD_oas-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDoas-composite-service: template.json
-
-CDoas-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: oas-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_oas-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_oas-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_oas-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_oas-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_oas-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_oas-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_oas-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_oas-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index ee76d40c..00000000
--- a/BMW-Dynatrace-config/CD_oas-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDoas-composite-service: template.json
-
-CDoas-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: oas-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_oas-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_oas-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_oas-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_oclisc2v/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_oclisc2v/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_oclisc2v/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_oclisc2v/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_oclisc2v/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index feddd114..00000000
--- a/BMW-Dynatrace-config/CD_oclisc2v/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDoclisc2v: template.json
-
-CDoclisc2v:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: oclisc2v
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_oclisc2v/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_oclisc2v/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_oclisc2v/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_oclisc2v/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_oclisc2v/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_oclisc2v/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_oclisc2v/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_oclisc2v/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index feddd114..00000000
--- a/BMW-Dynatrace-config/CD_oclisc2v/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDoclisc2v: template.json
-
-CDoclisc2v:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: oclisc2v
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_oclisc2v/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_oclisc2v/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_oclisc2v/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_oclisocsp/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_oclisocsp/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_oclisocsp/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_oclisocsp/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_oclisocsp/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 38a5b8e9..00000000
--- a/BMW-Dynatrace-config/CD_oclisocsp/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDoclisocsp: template.json
-
-CDoclisocsp:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: oclisocsp
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_oclisocsp/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_oclisocsp/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_oclisocsp/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_oclisocsp/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_oclisocsp/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_oclisocsp/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_oclisocsp/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_oclisocsp/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 38a5b8e9..00000000
--- a/BMW-Dynatrace-config/CD_oclisocsp/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDoclisocsp: template.json
-
-CDoclisocsp:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: oclisocsp
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_oclisocsp/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_oclisocsp/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_oclisocsp/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_omc-cd-services/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_omc-cd-services/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_omc-cd-services/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_omc-cd-services/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_omc-cd-services/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 2d855928..00000000
--- a/BMW-Dynatrace-config/CD_omc-cd-services/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDomc-cd-services: template.json
-
-CDomc-cd-services:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: omc-cd-services
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_omc-cd-services/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_omc-cd-services/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_omc-cd-services/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_omc-cd-services/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_omc-cd-services/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_omc-cd-services/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_omc-cd-services/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_omc-cd-services/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 2d855928..00000000
--- a/BMW-Dynatrace-config/CD_omc-cd-services/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDomc-cd-services: template.json
-
-CDomc-cd-services:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: omc-cd-services
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_omc-cd-services/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_omc-cd-services/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_omc-cd-services/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_omg/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_omg/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_omg/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_omg/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_omg/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 62435cd8..00000000
--- a/BMW-Dynatrace-config/CD_omg/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDomg: template.json
-
-CDomg:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: omg
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_omg/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_omg/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_omg/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_omg/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_omg/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_omg/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_omg/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_omg/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 62435cd8..00000000
--- a/BMW-Dynatrace-config/CD_omg/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDomg: template.json
-
-CDomg:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: omg
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_omg/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_omg/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_omg/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index bbfc210c..00000000
--- a/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDonboard-navigation-sync-service: template.json
-
-CDonboard-navigation-sync-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: onboard-navigation-sync-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index bbfc210c..00000000
--- a/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDonboard-navigation-sync-service: template.json
-
-CDonboard-navigation-sync-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: onboard-navigation-sync-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_onboard-navigation-sync-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_online-appointment-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_online-appointment-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_online-appointment-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_online-appointment-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_online-appointment-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 2d4648e6..00000000
--- a/BMW-Dynatrace-config/CD_online-appointment-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDonline-appointment-service: template.json
-
-CDonline-appointment-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: online-appointment-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_online-appointment-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_online-appointment-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_online-appointment-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_online-appointment-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_online-appointment-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_online-appointment-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_online-appointment-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_online-appointment-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 2d4648e6..00000000
--- a/BMW-Dynatrace-config/CD_online-appointment-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDonline-appointment-service: template.json
-
-CDonline-appointment-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: online-appointment-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_online-appointment-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_online-appointment-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_online-appointment-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_online-entertainment/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_online-entertainment/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_online-entertainment/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_online-entertainment/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_online-entertainment/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index a679308c..00000000
--- a/BMW-Dynatrace-config/CD_online-entertainment/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDonline-entertainment: template.json
-
-CDonline-entertainment:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: online-entertainment
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_online-entertainment/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_online-entertainment/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_online-entertainment/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_online-entertainment/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_online-entertainment/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_online-entertainment/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_online-entertainment/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_online-entertainment/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index a679308c..00000000
--- a/BMW-Dynatrace-config/CD_online-entertainment/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDonline-entertainment: template.json
-
-CDonline-entertainment:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: online-entertainment
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_online-entertainment/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_online-entertainment/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_online-entertainment/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_pdmmanager/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_pdmmanager/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_pdmmanager/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_pdmmanager/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_pdmmanager/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 7d33c1d4..00000000
--- a/BMW-Dynatrace-config/CD_pdmmanager/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDpdmmanager: template.json
-
-CDpdmmanager:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: pdmmanager
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_pdmmanager/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_pdmmanager/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_pdmmanager/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_pdmmanager/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_pdmmanager/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_pdmmanager/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_pdmmanager/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_pdmmanager/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 7d33c1d4..00000000
--- a/BMW-Dynatrace-config/CD_pdmmanager/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDpdmmanager: template.json
-
-CDpdmmanager:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: pdmmanager
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_pdmmanager/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_pdmmanager/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_pdmmanager/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_personal-data-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_personal-data-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_personal-data-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_personal-data-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_personal-data-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 78619a2b..00000000
--- a/BMW-Dynatrace-config/CD_personal-data-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDpersonal-data-service: template.json
-
-CDpersonal-data-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: personal-data-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_personal-data-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_personal-data-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_personal-data-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_personal-data-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_personal-data-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_personal-data-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_personal-data-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_personal-data-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 78619a2b..00000000
--- a/BMW-Dynatrace-config/CD_personal-data-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDpersonal-data-service: template.json
-
-CDpersonal-data-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: personal-data-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_personal-data-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_personal-data-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_personal-data-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_pmuimapper-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_pmuimapper-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_pmuimapper-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_pmuimapper-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_pmuimapper-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index c6cdb61e..00000000
--- a/BMW-Dynatrace-config/CD_pmuimapper-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDpmuimapper-service: template.json
-
-CDpmuimapper-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: pmuimapper-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_pmuimapper-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_pmuimapper-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_pmuimapper-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_pmuimapper-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_pmuimapper-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_pmuimapper-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_pmuimapper-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_pmuimapper-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index c6cdb61e..00000000
--- a/BMW-Dynatrace-config/CD_pmuimapper-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDpmuimapper-service: template.json
-
-CDpmuimapper-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: pmuimapper-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_pmuimapper-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_pmuimapper-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_pmuimapper-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 967a3f5c..00000000
--- a/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDprivate-charging-tariffs-composite-service: template.json
-
-CDprivate-charging-tariffs-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: private-charging-tariffs-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 967a3f5c..00000000
--- a/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDprivate-charging-tariffs-composite-service: template.json
-
-CDprivate-charging-tariffs-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: private-charging-tariffs-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_private-charging-tariffs-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_private-charging-tariffs-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_private-charging-tariffs-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_private-charging-tariffs-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_private-charging-tariffs-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_private-charging-tariffs-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 25079c11..00000000
--- a/BMW-Dynatrace-config/CD_private-charging-tariffs-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDprivate-charging-tariffs-service: template.json
-
-CDprivate-charging-tariffs-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: private-charging-tariffs-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_private-charging-tariffs-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_private-charging-tariffs-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_private-charging-tariffs-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_private-charging-tariffs-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_private-charging-tariffs-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_private-charging-tariffs-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_private-charging-tariffs-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_private-charging-tariffs-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 25079c11..00000000
--- a/BMW-Dynatrace-config/CD_private-charging-tariffs-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDprivate-charging-tariffs-service: template.json
-
-CDprivate-charging-tariffs-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: private-charging-tariffs-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_private-charging-tariffs-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_private-charging-tariffs-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_private-charging-tariffs-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_push-notification-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_push-notification-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_push-notification-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_push-notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_push-notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index e6faf023..00000000
--- a/BMW-Dynatrace-config/CD_push-notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDpush-notification-service: template.json
-
-CDpush-notification-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: push-notification-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_push-notification-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_push-notification-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_push-notification-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_push-notification-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_push-notification-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_push-notification-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_push-notification-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_push-notification-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index e6faf023..00000000
--- a/BMW-Dynatrace-config/CD_push-notification-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDpush-notification-service: template.json
-
-CDpush-notification-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: push-notification-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_push-notification-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_push-notification-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_push-notification-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 4f1de0ff..00000000
--- a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDpush-notification-settings-composite-service: template.json
-
-CDpush-notification-settings-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: push-notification-settings-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 4f1de0ff..00000000
--- a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDpush-notification-settings-composite-service: template.json
-
-CDpush-notification-settings-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: push-notification-settings-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_push-notification-settings-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-analytics-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_recall-analytics-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_recall-analytics-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-analytics-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_recall-analytics-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 18dfed3a..00000000
--- a/BMW-Dynatrace-config/CD_recall-analytics-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDrecall-analytics-service: template.json
-
-CDrecall-analytics-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: recall-analytics-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_recall-analytics-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_recall-analytics-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_recall-analytics-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-analytics-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_recall-analytics-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_recall-analytics-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-analytics-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_recall-analytics-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 18dfed3a..00000000
--- a/BMW-Dynatrace-config/CD_recall-analytics-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDrecall-analytics-service: template.json
-
-CDrecall-analytics-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: recall-analytics-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_recall-analytics-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_recall-analytics-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_recall-analytics-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-client-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_recall-client-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_recall-client-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-client-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_recall-client-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 07021bbb..00000000
--- a/BMW-Dynatrace-config/CD_recall-client-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDrecall-client-service: template.json
-
-CDrecall-client-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: recall-client-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_recall-client-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_recall-client-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_recall-client-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-client-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_recall-client-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_recall-client-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-client-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_recall-client-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 07021bbb..00000000
--- a/BMW-Dynatrace-config/CD_recall-client-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDrecall-client-service: template.json
-
-CDrecall-client-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: recall-client-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_recall-client-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_recall-client-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_recall-client-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-handler-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_recall-handler-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_recall-handler-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-handler-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_recall-handler-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 7f804e81..00000000
--- a/BMW-Dynatrace-config/CD_recall-handler-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDrecall-handler-service: template.json
-
-CDrecall-handler-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: recall-handler-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_recall-handler-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_recall-handler-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_recall-handler-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-handler-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_recall-handler-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_recall-handler-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-handler-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_recall-handler-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 7f804e81..00000000
--- a/BMW-Dynatrace-config/CD_recall-handler-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDrecall-handler-service: template.json
-
-CDrecall-handler-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: recall-handler-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_recall-handler-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_recall-handler-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_recall-handler-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-notification-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_recall-notification-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_recall-notification-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_recall-notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 5a52d1bf..00000000
--- a/BMW-Dynatrace-config/CD_recall-notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDrecall-notification-service: template.json
-
-CDrecall-notification-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: recall-notification-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_recall-notification-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_recall-notification-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_recall-notification-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-notification-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_recall-notification-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_recall-notification-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-notification-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_recall-notification-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 5a52d1bf..00000000
--- a/BMW-Dynatrace-config/CD_recall-notification-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDrecall-notification-service: template.json
-
-CDrecall-notification-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: recall-notification-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_recall-notification-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_recall-notification-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_recall-notification-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-scheduler-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_recall-scheduler-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_recall-scheduler-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-scheduler-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_recall-scheduler-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 3bd7f440..00000000
--- a/BMW-Dynatrace-config/CD_recall-scheduler-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDrecall-scheduler-service: template.json
-
-CDrecall-scheduler-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: recall-scheduler-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_recall-scheduler-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_recall-scheduler-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_recall-scheduler-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-scheduler-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_recall-scheduler-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_recall-scheduler-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-scheduler-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_recall-scheduler-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 3bd7f440..00000000
--- a/BMW-Dynatrace-config/CD_recall-scheduler-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDrecall-scheduler-service: template.json
-
-CDrecall-scheduler-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: recall-scheduler-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_recall-scheduler-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_recall-scheduler-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_recall-scheduler-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-tcn-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_recall-tcn-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_recall-tcn-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-tcn-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_recall-tcn-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 8b7ada54..00000000
--- a/BMW-Dynatrace-config/CD_recall-tcn-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDrecall-tcn-service: template.json
-
-CDrecall-tcn-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: recall-tcn-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_recall-tcn-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_recall-tcn-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_recall-tcn-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-tcn-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_recall-tcn-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_recall-tcn-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_recall-tcn-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_recall-tcn-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 8b7ada54..00000000
--- a/BMW-Dynatrace-config/CD_recall-tcn-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDrecall-tcn-service: template.json
-
-CDrecall-tcn-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: recall-tcn-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_recall-tcn-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_recall-tcn-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_recall-tcn-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-360-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_remote-360-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_remote-360-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-360-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_remote-360-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index c2613b53..00000000
--- a/BMW-Dynatrace-config/CD_remote-360-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDremote-360-composite-service: template.json
-
-CDremote-360-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: remote-360-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_remote-360-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_remote-360-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_remote-360-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-360-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_remote-360-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_remote-360-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-360-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_remote-360-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index c2613b53..00000000
--- a/BMW-Dynatrace-config/CD_remote-360-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDremote-360-composite-service: template.json
-
-CDremote-360-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: remote-360-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_remote-360-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_remote-360-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_remote-360-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-service-event-processor/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_remote-service-event-processor/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_remote-service-event-processor/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-service-event-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_remote-service-event-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 9cb97830..00000000
--- a/BMW-Dynatrace-config/CD_remote-service-event-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDremote-service-event-processor: template.json
-
-CDremote-service-event-processor:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: remote-service-event-processor
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_remote-service-event-processor/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_remote-service-event-processor/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_remote-service-event-processor/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-service-event-processor/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_remote-service-event-processor/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_remote-service-event-processor/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-service-event-processor/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_remote-service-event-processor/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 9cb97830..00000000
--- a/BMW-Dynatrace-config/CD_remote-service-event-processor/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDremote-service-event-processor: template.json
-
-CDremote-service-event-processor:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: remote-service-event-processor
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_remote-service-event-processor/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_remote-service-event-processor/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_remote-service-event-processor/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_remote-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_remote-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_remote-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 116fe129..00000000
--- a/BMW-Dynatrace-config/CD_remote-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDremote-service: template.json
-
-CDremote-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: remote-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_remote-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_remote-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_remote-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_remote-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_remote-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_remote-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 116fe129..00000000
--- a/BMW-Dynatrace-config/CD_remote-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDremote-service: template.json
-
-CDremote-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: remote-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_remote-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_remote-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_remote-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-software-upgrade/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_remote-software-upgrade/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_remote-software-upgrade/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-software-upgrade/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_remote-software-upgrade/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 219cecce..00000000
--- a/BMW-Dynatrace-config/CD_remote-software-upgrade/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDremote-software-upgrade: template.json
-
-CDremote-software-upgrade:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: remote-software-upgrade
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_remote-software-upgrade/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_remote-software-upgrade/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_remote-software-upgrade/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-software-upgrade/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_remote-software-upgrade/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_remote-software-upgrade/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_remote-software-upgrade/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_remote-software-upgrade/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 219cecce..00000000
--- a/BMW-Dynatrace-config/CD_remote-software-upgrade/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDremote-software-upgrade: template.json
-
-CDremote-software-upgrade:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: remote-software-upgrade
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_remote-software-upgrade/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_remote-software-upgrade/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_remote-software-upgrade/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index de39f3e3..00000000
--- a/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDroadside-assistance-composite-service: template.json
-
-CDroadside-assistance-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: roadside-assistance-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index de39f3e3..00000000
--- a/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDroadside-assistance-composite-service: template.json
-
-CDroadside-assistance-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: roadside-assistance-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_roadside-assistance-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_roadside-assistance/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_roadside-assistance/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_roadside-assistance/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_roadside-assistance/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_roadside-assistance/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 535b777f..00000000
--- a/BMW-Dynatrace-config/CD_roadside-assistance/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDroadside-assistance: template.json
-
-CDroadside-assistance:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: roadside-assistance
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_roadside-assistance/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_roadside-assistance/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_roadside-assistance/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_roadside-assistance/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_roadside-assistance/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_roadside-assistance/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_roadside-assistance/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_roadside-assistance/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 535b777f..00000000
--- a/BMW-Dynatrace-config/CD_roadside-assistance/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDroadside-assistance: template.json
-
-CDroadside-assistance:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: roadside-assistance
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_roadside-assistance/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_roadside-assistance/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_roadside-assistance/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_rsu-adapter/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_rsu-adapter/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_rsu-adapter/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_rsu-adapter/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_rsu-adapter/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 43d01b07..00000000
--- a/BMW-Dynatrace-config/CD_rsu-adapter/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDrsu-adapter: template.json
-
-CDrsu-adapter:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: rsu-adapter
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_rsu-adapter/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_rsu-adapter/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_rsu-adapter/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_rsu-adapter/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_rsu-adapter/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_rsu-adapter/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_rsu-adapter/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_rsu-adapter/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 43d01b07..00000000
--- a/BMW-Dynatrace-config/CD_rsu-adapter/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDrsu-adapter: template.json
-
-CDrsu-adapter:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: rsu-adapter
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_rsu-adapter/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_rsu-adapter/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_rsu-adapter/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_rsu/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_rsu/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_rsu/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_rsu/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_rsu/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 0f7139fc..00000000
--- a/BMW-Dynatrace-config/CD_rsu/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDrsu: template.json
-
-CDrsu:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: rsu
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_rsu/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_rsu/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_rsu/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_rsu/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_rsu/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_rsu/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_rsu/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_rsu/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 0f7139fc..00000000
--- a/BMW-Dynatrace-config/CD_rsu/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDrsu: template.json
-
-CDrsu:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: rsu
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_rsu/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_rsu/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_rsu/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sbr/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_sbr/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_sbr/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sbr/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_sbr/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index a9a2cec9..00000000
--- a/BMW-Dynatrace-config/CD_sbr/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsbr: template.json
-
-CDsbr:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: sbr
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_sbr/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_sbr/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_sbr/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sbr/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_sbr/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_sbr/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sbr/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_sbr/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index a9a2cec9..00000000
--- a/BMW-Dynatrace-config/CD_sbr/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsbr: template.json
-
-CDsbr:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: sbr
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_sbr/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_sbr/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_sbr/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scb/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_scb/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_scb/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scb/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_scb/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 37eb76f2..00000000
--- a/BMW-Dynatrace-config/CD_scb/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDscb: template.json
-
-CDscb:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: scb
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_scb/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_scb/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_scb/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scb/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_scb/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_scb/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scb/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_scb/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 37eb76f2..00000000
--- a/BMW-Dynatrace-config/CD_scb/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDscb: template.json
-
-CDscb:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: scb
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_scb/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_scb/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_scb/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scc/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_scc/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_scc/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scc/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_scc/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 3bbc005a..00000000
--- a/BMW-Dynatrace-config/CD_scc/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDscc: template.json
-
-CDscc:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: scc
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_scc/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_scc/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_scc/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scc/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_scc/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_scc/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scc/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_scc/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 3bbc005a..00000000
--- a/BMW-Dynatrace-config/CD_scc/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDscc: template.json
-
-CDscc:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: scc
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_scc/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_scc/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_scc/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scm-agentreg/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_scm-agentreg/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_scm-agentreg/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scm-agentreg/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_scm-agentreg/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 4356c404..00000000
--- a/BMW-Dynatrace-config/CD_scm-agentreg/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDscm-agentreg: template.json
-
-CDscm-agentreg:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: scm-agentreg
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_scm-agentreg/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_scm-agentreg/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_scm-agentreg/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scm-agentreg/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_scm-agentreg/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_scm-agentreg/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scm-agentreg/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_scm-agentreg/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 4356c404..00000000
--- a/BMW-Dynatrace-config/CD_scm-agentreg/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDscm-agentreg: template.json
-
-CDscm-agentreg:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: scm-agentreg
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_scm-agentreg/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_scm-agentreg/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_scm-agentreg/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scm-scm/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_scm-scm/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_scm-scm/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scm-scm/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_scm-scm/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 6dfd77ac..00000000
--- a/BMW-Dynatrace-config/CD_scm-scm/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDscm-scm: template.json
-
-CDscm-scm:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: scm-scm
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_scm-scm/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_scm-scm/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_scm-scm/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scm-scm/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_scm-scm/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_scm-scm/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scm-scm/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_scm-scm/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 6dfd77ac..00000000
--- a/BMW-Dynatrace-config/CD_scm-scm/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDscm-scm: template.json
-
-CDscm-scm:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: scm-scm
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_scm-scm/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_scm-scm/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_scm-scm/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scma-backend/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_scma-backend/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_scma-backend/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scma-backend/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_scma-backend/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 3152e3c3..00000000
--- a/BMW-Dynatrace-config/CD_scma-backend/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDscma-backend: template.json
-
-CDscma-backend:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: scma-backend
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_scma-backend/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_scma-backend/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_scma-backend/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scma-backend/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_scma-backend/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_scma-backend/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_scma-backend/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_scma-backend/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 3152e3c3..00000000
--- a/BMW-Dynatrace-config/CD_scma-backend/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDscma-backend: template.json
-
-CDscma-backend:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: scma-backend
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_scma-backend/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_scma-backend/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_scma-backend/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_seam-event-consumer/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_seam-event-consumer/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_seam-event-consumer/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_seam-event-consumer/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_seam-event-consumer/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 3224bdd5..00000000
--- a/BMW-Dynatrace-config/CD_seam-event-consumer/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDseam-event-consumer: template.json
-
-CDseam-event-consumer:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: seam-event-consumer
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_seam-event-consumer/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_seam-event-consumer/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_seam-event-consumer/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_seam-event-consumer/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_seam-event-consumer/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_seam-event-consumer/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_seam-event-consumer/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_seam-event-consumer/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 3224bdd5..00000000
--- a/BMW-Dynatrace-config/CD_seam-event-consumer/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDseam-event-consumer: template.json
-
-CDseam-event-consumer:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: seam-event-consumer
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_seam-event-consumer/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_seam-event-consumer/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_seam-event-consumer/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_seam-event-producer/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_seam-event-producer/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_seam-event-producer/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_seam-event-producer/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_seam-event-producer/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 34b46925..00000000
--- a/BMW-Dynatrace-config/CD_seam-event-producer/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDseam-event-producer: template.json
-
-CDseam-event-producer:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: seam-event-producer
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_seam-event-producer/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_seam-event-producer/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_seam-event-producer/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_seam-event-producer/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_seam-event-producer/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_seam-event-producer/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_seam-event-producer/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_seam-event-producer/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 34b46925..00000000
--- a/BMW-Dynatrace-config/CD_seam-event-producer/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDseam-event-producer: template.json
-
-CDseam-event-producer:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: seam-event-producer
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_seam-event-producer/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_seam-event-producer/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_seam-event-producer/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_search-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_search-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_search-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_search-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_search-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index cc0df542..00000000
--- a/BMW-Dynatrace-config/CD_search-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsearch-composite-service: template.json
-
-CDsearch-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: search-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_search-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_search-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_search-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_search-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_search-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_search-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_search-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_search-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index cc0df542..00000000
--- a/BMW-Dynatrace-config/CD_search-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsearch-composite-service: template.json
-
-CDsearch-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: search-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_search-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_search-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_search-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_send-to-car-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_send-to-car-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_send-to-car-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_send-to-car-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_send-to-car-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index c9dd2dbb..00000000
--- a/BMW-Dynatrace-config/CD_send-to-car-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsend-to-car-service: template.json
-
-CDsend-to-car-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: send-to-car-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_send-to-car-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_send-to-car-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_send-to-car-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_send-to-car-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_send-to-car-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_send-to-car-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_send-to-car-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_send-to-car-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index c9dd2dbb..00000000
--- a/BMW-Dynatrace-config/CD_send-to-car-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsend-to-car-service: template.json
-
-CDsend-to-car-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: send-to-car-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_send-to-car-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_send-to-car-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_send-to-car-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_service-manager/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_service-manager/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_service-manager/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_service-manager/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_service-manager/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index a46c41e8..00000000
--- a/BMW-Dynatrace-config/CD_service-manager/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDservice-manager: template.json
-
-CDservice-manager:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: service-manager
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_service-manager/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_service-manager/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_service-manager/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_service-manager/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_service-manager/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_service-manager/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_service-manager/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_service-manager/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index a46c41e8..00000000
--- a/BMW-Dynatrace-config/CD_service-manager/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDservice-manager: template.json
-
-CDservice-manager:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: service-manager
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_service-manager/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_service-manager/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_service-manager/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_service-notification-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_service-notification-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_service-notification-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_service-notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_service-notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index d506a0c2..00000000
--- a/BMW-Dynatrace-config/CD_service-notification-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDservice-notification-service: template.json
-
-CDservice-notification-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: service-notification-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_service-notification-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_service-notification-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_service-notification-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_service-notification-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_service-notification-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_service-notification-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_service-notification-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_service-notification-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index d506a0c2..00000000
--- a/BMW-Dynatrace-config/CD_service-notification-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDservice-notification-service: template.json
-
-CDservice-notification-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: service-notification-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_service-notification-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_service-notification-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_service-notification-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa-fre/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_sfa-fre/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_sfa-fre/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa-fre/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_sfa-fre/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 830d3e64..00000000
--- a/BMW-Dynatrace-config/CD_sfa-fre/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsfa-fre: template.json
-
-CDsfa-fre:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: sfa-fre
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_sfa-fre/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_sfa-fre/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_sfa-fre/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa-fre/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_sfa-fre/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_sfa-fre/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa-fre/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_sfa-fre/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 830d3e64..00000000
--- a/BMW-Dynatrace-config/CD_sfa-fre/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsfa-fre: template.json
-
-CDsfa-fre:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: sfa-fre
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_sfa-fre/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_sfa-fre/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_sfa-fre/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa-ota/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_sfa-ota/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_sfa-ota/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa-ota/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_sfa-ota/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index a43af184..00000000
--- a/BMW-Dynatrace-config/CD_sfa-ota/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsfa-ota: template.json
-
-CDsfa-ota:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: sfa-ota
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_sfa-ota/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_sfa-ota/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_sfa-ota/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa-ota/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_sfa-ota/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_sfa-ota/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa-ota/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_sfa-ota/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index a43af184..00000000
--- a/BMW-Dynatrace-config/CD_sfa-ota/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsfa-ota: template.json
-
-CDsfa-ota:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: sfa-ota
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_sfa-ota/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_sfa-ota/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_sfa-ota/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa-vs/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_sfa-vs/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_sfa-vs/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa-vs/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_sfa-vs/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 9df0e31e..00000000
--- a/BMW-Dynatrace-config/CD_sfa-vs/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsfa-vs: template.json
-
-CDsfa-vs:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: sfa-vs
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_sfa-vs/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_sfa-vs/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_sfa-vs/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa-vs/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_sfa-vs/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_sfa-vs/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa-vs/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_sfa-vs/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 9df0e31e..00000000
--- a/BMW-Dynatrace-config/CD_sfa-vs/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsfa-vs: template.json
-
-CDsfa-vs:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: sfa-vs
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_sfa-vs/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_sfa-vs/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_sfa-vs/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_sfa/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_sfa/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_sfa/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 5af68e87..00000000
--- a/BMW-Dynatrace-config/CD_sfa/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsfa: template.json
-
-CDsfa:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: sfa
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_sfa/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_sfa/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_sfa/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_sfa/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_sfa/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sfa/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_sfa/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 5af68e87..00000000
--- a/BMW-Dynatrace-config/CD_sfa/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsfa: template.json
-
-CDsfa:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: sfa
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_sfa/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_sfa/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_sfa/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_smart-access-order-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_smart-access-order-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_smart-access-order-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_smart-access-order-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_smart-access-order-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index effede9c..00000000
--- a/BMW-Dynatrace-config/CD_smart-access-order-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsmart-access-order-service: template.json
-
-CDsmart-access-order-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: smart-access-order-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_smart-access-order-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_smart-access-order-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_smart-access-order-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_smart-access-order-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_smart-access-order-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_smart-access-order-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_smart-access-order-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_smart-access-order-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index effede9c..00000000
--- a/BMW-Dynatrace-config/CD_smart-access-order-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsmart-access-order-service: template.json
-
-CDsmart-access-order-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: smart-access-order-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_smart-access-order-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_smart-access-order-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_smart-access-order-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sms-email-adapter-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_sms-email-adapter-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_sms-email-adapter-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sms-email-adapter-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_sms-email-adapter-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 6db2869f..00000000
--- a/BMW-Dynatrace-config/CD_sms-email-adapter-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsms-email-adapter-service: template.json
-
-CDsms-email-adapter-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: sms-email-adapter-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_sms-email-adapter-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_sms-email-adapter-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_sms-email-adapter-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sms-email-adapter-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_sms-email-adapter-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_sms-email-adapter-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_sms-email-adapter-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_sms-email-adapter-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 6db2869f..00000000
--- a/BMW-Dynatrace-config/CD_sms-email-adapter-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsms-email-adapter-service: template.json
-
-CDsms-email-adapter-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: sms-email-adapter-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_sms-email-adapter-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_sms-email-adapter-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_sms-email-adapter-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_srmanager/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_srmanager/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_srmanager/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_srmanager/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_srmanager/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 5e0c0334..00000000
--- a/BMW-Dynatrace-config/CD_srmanager/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsrmanager: template.json
-
-CDsrmanager:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: srmanager
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_srmanager/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_srmanager/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_srmanager/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_srmanager/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_srmanager/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_srmanager/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_srmanager/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_srmanager/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 5e0c0334..00000000
--- a/BMW-Dynatrace-config/CD_srmanager/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsrmanager: template.json
-
-CDsrmanager:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: srmanager
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_srmanager/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_srmanager/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_srmanager/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_stm/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_stm/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_stm/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_stm/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_stm/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index fb830d1b..00000000
--- a/BMW-Dynatrace-config/CD_stm/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDstm: template.json
-
-CDstm:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: stm
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_stm/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_stm/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_stm/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_stm/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_stm/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_stm/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_stm/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_stm/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index fb830d1b..00000000
--- a/BMW-Dynatrace-config/CD_stm/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDstm: template.json
-
-CDstm:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: stm
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_stm/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_stm/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_stm/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_svcinfo/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_svcinfo/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_svcinfo/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_svcinfo/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_svcinfo/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index bc9697ce..00000000
--- a/BMW-Dynatrace-config/CD_svcinfo/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsvcinfo: template.json
-
-CDsvcinfo:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: svcinfo
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_svcinfo/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_svcinfo/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_svcinfo/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_svcinfo/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_svcinfo/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_svcinfo/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_svcinfo/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_svcinfo/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index bc9697ce..00000000
--- a/BMW-Dynatrace-config/CD_svcinfo/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDsvcinfo: template.json
-
-CDsvcinfo:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: svcinfo
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_svcinfo/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_svcinfo/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_svcinfo/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_timer-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_timer-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_timer-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_timer-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_timer-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 3eb1c516..00000000
--- a/BMW-Dynatrace-config/CD_timer-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtimer-service: template.json
-
-CDtimer-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: timer-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_timer-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_timer-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_timer-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_timer-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_timer-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_timer-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_timer-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_timer-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 3eb1c516..00000000
--- a/BMW-Dynatrace-config/CD_timer-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtimer-service: template.json
-
-CDtimer-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: timer-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_timer-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_timer-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_timer-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_timers-processor/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_timers-processor/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_timers-processor/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_timers-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_timers-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 05f8ded4..00000000
--- a/BMW-Dynatrace-config/CD_timers-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtimers-processor: template.json
-
-CDtimers-processor:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: timers-processor
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_timers-processor/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_timers-processor/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_timers-processor/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_timers-processor/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_timers-processor/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_timers-processor/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_timers-processor/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_timers-processor/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 05f8ded4..00000000
--- a/BMW-Dynatrace-config/CD_timers-processor/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtimers-processor: template.json
-
-CDtimers-processor:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: timers-processor
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_timers-processor/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_timers-processor/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_timers-processor/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_token-exchanger-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_token-exchanger-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_token-exchanger-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_token-exchanger-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_token-exchanger-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 66eb8f76..00000000
--- a/BMW-Dynatrace-config/CD_token-exchanger-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtoken-exchanger-service: template.json
-
-CDtoken-exchanger-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: token-exchanger-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_token-exchanger-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_token-exchanger-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_token-exchanger-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_token-exchanger-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_token-exchanger-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_token-exchanger-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_token-exchanger-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_token-exchanger-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 66eb8f76..00000000
--- a/BMW-Dynatrace-config/CD_token-exchanger-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtoken-exchanger-service: template.json
-
-CDtoken-exchanger-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: token-exchanger-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_token-exchanger-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_token-exchanger-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_token-exchanger-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tol-mgu/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_tol-mgu/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_tol-mgu/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tol-mgu/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_tol-mgu/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 00067d27..00000000
--- a/BMW-Dynatrace-config/CD_tol-mgu/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtol-mgu: template.json
-
-CDtol-mgu:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: tol-mgu
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_tol-mgu/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_tol-mgu/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_tol-mgu/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tol-mgu/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_tol-mgu/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_tol-mgu/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tol-mgu/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_tol-mgu/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 00067d27..00000000
--- a/BMW-Dynatrace-config/CD_tol-mgu/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtol-mgu: template.json
-
-CDtol-mgu:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: tol-mgu
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_tol-mgu/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_tol-mgu/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_tol-mgu/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tol-tssb/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_tol-tssb/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_tol-tssb/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tol-tssb/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_tol-tssb/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 7177f1e2..00000000
--- a/BMW-Dynatrace-config/CD_tol-tssb/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtol-tssb: template.json
-
-CDtol-tssb:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: tol-tssb
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_tol-tssb/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_tol-tssb/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_tol-tssb/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tol-tssb/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_tol-tssb/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_tol-tssb/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tol-tssb/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_tol-tssb/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 7177f1e2..00000000
--- a/BMW-Dynatrace-config/CD_tol-tssb/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtol-tssb: template.json
-
-CDtol-tssb:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: tol-tssb
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_tol-tssb/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_tol-tssb/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_tol-tssb/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tol/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_tol/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_tol/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tol/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_tol/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 4b56f6fa..00000000
--- a/BMW-Dynatrace-config/CD_tol/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtol: template.json
-
-CDtol:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: tol
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_tol/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_tol/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_tol/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tol/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_tol/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_tol/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tol/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_tol/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 4b56f6fa..00000000
--- a/BMW-Dynatrace-config/CD_tol/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtol: template.json
-
-CDtol:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: tol
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_tol/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_tol/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_tol/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-change-processor/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_trip-change-processor/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_trip-change-processor/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-change-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_trip-change-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index d11a3951..00000000
--- a/BMW-Dynatrace-config/CD_trip-change-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtrip-change-processor: template.json
-
-CDtrip-change-processor:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: trip-change-processor
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_trip-change-processor/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_trip-change-processor/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_trip-change-processor/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-change-processor/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_trip-change-processor/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_trip-change-processor/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-change-processor/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_trip-change-processor/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index d11a3951..00000000
--- a/BMW-Dynatrace-config/CD_trip-change-processor/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtrip-change-processor: template.json
-
-CDtrip-change-processor:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: trip-change-processor
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_trip-change-processor/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_trip-change-processor/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_trip-change-processor/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-cleanup-app-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_trip-cleanup-app-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_trip-cleanup-app-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-cleanup-app-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_trip-cleanup-app-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 144e9df6..00000000
--- a/BMW-Dynatrace-config/CD_trip-cleanup-app-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtrip-cleanup-app-service: template.json
-
-CDtrip-cleanup-app-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: trip-cleanup-app-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_trip-cleanup-app-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_trip-cleanup-app-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_trip-cleanup-app-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-cleanup-app-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_trip-cleanup-app-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_trip-cleanup-app-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-cleanup-app-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_trip-cleanup-app-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 144e9df6..00000000
--- a/BMW-Dynatrace-config/CD_trip-cleanup-app-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtrip-cleanup-app-service: template.json
-
-CDtrip-cleanup-app-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: trip-cleanup-app-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_trip-cleanup-app-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_trip-cleanup-app-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_trip-cleanup-app-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-monitor-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_trip-monitor-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_trip-monitor-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-monitor-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_trip-monitor-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index e6e827ba..00000000
--- a/BMW-Dynatrace-config/CD_trip-monitor-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtrip-monitor-service: template.json
-
-CDtrip-monitor-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: trip-monitor-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_trip-monitor-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_trip-monitor-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_trip-monitor-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-monitor-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_trip-monitor-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_trip-monitor-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-monitor-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_trip-monitor-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index e6e827ba..00000000
--- a/BMW-Dynatrace-config/CD_trip-monitor-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtrip-monitor-service: template.json
-
-CDtrip-monitor-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: trip-monitor-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_trip-monitor-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_trip-monitor-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_trip-monitor-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-reminder-processor/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_trip-reminder-processor/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_trip-reminder-processor/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-reminder-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_trip-reminder-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index c086f074..00000000
--- a/BMW-Dynatrace-config/CD_trip-reminder-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtrip-reminder-processor: template.json
-
-CDtrip-reminder-processor:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: trip-reminder-processor
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_trip-reminder-processor/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_trip-reminder-processor/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_trip-reminder-processor/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-reminder-processor/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_trip-reminder-processor/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_trip-reminder-processor/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-reminder-processor/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_trip-reminder-processor/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index c086f074..00000000
--- a/BMW-Dynatrace-config/CD_trip-reminder-processor/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtrip-reminder-processor: template.json
-
-CDtrip-reminder-processor:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: trip-reminder-processor
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_trip-reminder-processor/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_trip-reminder-processor/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_trip-reminder-processor/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-route-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_trip-route-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_trip-route-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-route-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_trip-route-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index ad70a90e..00000000
--- a/BMW-Dynatrace-config/CD_trip-route-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtrip-route-service: template.json
-
-CDtrip-route-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: trip-route-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_trip-route-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_trip-route-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_trip-route-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-route-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_trip-route-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_trip-route-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-route-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_trip-route-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index ad70a90e..00000000
--- a/BMW-Dynatrace-config/CD_trip-route-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtrip-route-service: template.json
-
-CDtrip-route-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: trip-route-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_trip-route-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_trip-route-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_trip-route-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_trip-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_trip-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_trip-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 3403f137..00000000
--- a/BMW-Dynatrace-config/CD_trip-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtrip-service: template.json
-
-CDtrip-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: trip-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_trip-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_trip-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_trip-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_trip-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_trip-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_trip-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_trip-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 3403f137..00000000
--- a/BMW-Dynatrace-config/CD_trip-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtrip-service: template.json
-
-CDtrip-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: trip-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_trip-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_trip-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_trip-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bcallservice/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-bcallservice/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-bcallservice/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bcallservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-bcallservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 00e755d1..00000000
--- a/BMW-Dynatrace-config/CD_ts-bcallservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-bcallservice: template.json
-
-CDts-bcallservice:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-bcallservice
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-bcallservice/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-bcallservice/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-bcallservice/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bcallservice/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-bcallservice/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-bcallservice/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bcallservice/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-bcallservice/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 00e755d1..00000000
--- a/BMW-Dynatrace-config/CD_ts-bcallservice/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-bcallservice: template.json
-
-CDts-bcallservice:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-bcallservice
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-bcallservice/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-bcallservice/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-bcallservice/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bt/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-bt/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-bt/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bt/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-bt/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index b0c580be..00000000
--- a/BMW-Dynatrace-config/CD_ts-bt/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-bt: template.json
-
-CDts-bt:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-bt
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-bt/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-bt/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-bt/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bt/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-bt/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-bt/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bt/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-bt/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index b0c580be..00000000
--- a/BMW-Dynatrace-config/CD_ts-bt/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-bt: template.json
-
-CDts-bt:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-bt
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-bt/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-bt/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-bt/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bti/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-bti/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-bti/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bti/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-bti/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 8f3ada60..00000000
--- a/BMW-Dynatrace-config/CD_ts-bti/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-bti: template.json
-
-CDts-bti:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-bti
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-bti/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-bti/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-bti/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bti/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-bti/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-bti/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bti/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-bti/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 8f3ada60..00000000
--- a/BMW-Dynatrace-config/CD_ts-bti/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-bti: template.json
-
-CDts-bti:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-bti
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-bti/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-bti/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-bti/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-cas-spm/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-cas-spm/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-cas-spm/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-cas-spm/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-cas-spm/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index f176b376..00000000
--- a/BMW-Dynatrace-config/CD_ts-cas-spm/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-cas-spm: template.json
-
-CDts-cas-spm:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-cas-spm
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-cas-spm/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-cas-spm/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-cas-spm/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-cas-spm/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-cas-spm/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-cas-spm/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-cas-spm/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-cas-spm/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index f176b376..00000000
--- a/BMW-Dynatrace-config/CD_ts-cas-spm/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-cas-spm: template.json
-
-CDts-cas-spm:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-cas-spm
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-cas-spm/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-cas-spm/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-cas-spm/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-cas-stm/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-cas-stm/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-cas-stm/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-cas-stm/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-cas-stm/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 86e812ee..00000000
--- a/BMW-Dynatrace-config/CD_ts-cas-stm/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-cas-stm: template.json
-
-CDts-cas-stm:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-cas-stm
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-cas-stm/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-cas-stm/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-cas-stm/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-cas-stm/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-cas-stm/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-cas-stm/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-cas-stm/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-cas-stm/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 86e812ee..00000000
--- a/BMW-Dynatrace-config/CD_ts-cas-stm/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-cas-stm: template.json
-
-CDts-cas-stm:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-cas-stm
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-cas-stm/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-cas-stm/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-cas-stm/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-datadispatcher/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-datadispatcher/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-datadispatcher/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-datadispatcher/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-datadispatcher/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index b75c6fa4..00000000
--- a/BMW-Dynatrace-config/CD_ts-datadispatcher/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-datadispatcher: template.json
-
-CDts-datadispatcher:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-datadispatcher
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-datadispatcher/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-datadispatcher/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-datadispatcher/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-datadispatcher/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-datadispatcher/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-datadispatcher/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-datadispatcher/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-datadispatcher/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index b75c6fa4..00000000
--- a/BMW-Dynatrace-config/CD_ts-datadispatcher/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-datadispatcher: template.json
-
-CDts-datadispatcher:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-datadispatcher
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-datadispatcher/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-datadispatcher/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-datadispatcher/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-diagservice/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-diagservice/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-diagservice/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-diagservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-diagservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 7b8e77a8..00000000
--- a/BMW-Dynatrace-config/CD_ts-diagservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-diagservice: template.json
-
-CDts-diagservice:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-diagservice
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-diagservice/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-diagservice/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-diagservice/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-diagservice/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-diagservice/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-diagservice/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-diagservice/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-diagservice/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 7b8e77a8..00000000
--- a/BMW-Dynatrace-config/CD_ts-diagservice/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-diagservice: template.json
-
-CDts-diagservice:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-diagservice
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-diagservice/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-diagservice/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-diagservice/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-eshad/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-eshad/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-eshad/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-eshad/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-eshad/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 3ec9d228..00000000
--- a/BMW-Dynatrace-config/CD_ts-eshad/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-eshad: template.json
-
-CDts-eshad:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-eshad
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-eshad/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-eshad/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-eshad/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-eshad/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-eshad/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-eshad/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-eshad/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-eshad/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 3ec9d228..00000000
--- a/BMW-Dynatrace-config/CD_ts-eshad/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-eshad: template.json
-
-CDts-eshad:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-eshad
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-eshad/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-eshad/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-eshad/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-message-receiver/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-message-receiver/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-message-receiver/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-message-receiver/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-message-receiver/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index c6dabb5c..00000000
--- a/BMW-Dynatrace-config/CD_ts-message-receiver/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-message-receiver: template.json
-
-CDts-message-receiver:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-message-receiver
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-message-receiver/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-message-receiver/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-message-receiver/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-message-receiver/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-message-receiver/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-message-receiver/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-message-receiver/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-message-receiver/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index c6dabb5c..00000000
--- a/BMW-Dynatrace-config/CD_ts-message-receiver/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-message-receiver: template.json
-
-CDts-message-receiver:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-message-receiver
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-message-receiver/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-message-receiver/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-message-receiver/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-pdmupdater/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-pdmupdater/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-pdmupdater/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-pdmupdater/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-pdmupdater/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index c93e39df..00000000
--- a/BMW-Dynatrace-config/CD_ts-pdmupdater/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-pdmupdater: template.json
-
-CDts-pdmupdater:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-pdmupdater
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-pdmupdater/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-pdmupdater/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-pdmupdater/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-pdmupdater/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-pdmupdater/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-pdmupdater/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-pdmupdater/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-pdmupdater/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index c93e39df..00000000
--- a/BMW-Dynatrace-config/CD_ts-pdmupdater/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-pdmupdater: template.json
-
-CDts-pdmupdater:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-pdmupdater
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-pdmupdater/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-pdmupdater/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-pdmupdater/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-pservice/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-pservice/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-pservice/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-pservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-pservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index b88a4b69..00000000
--- a/BMW-Dynatrace-config/CD_ts-pservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-pservice: template.json
-
-CDts-pservice:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-pservice
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-pservice/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-pservice/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-pservice/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-pservice/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-pservice/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-pservice/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-pservice/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-pservice/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index b88a4b69..00000000
--- a/BMW-Dynatrace-config/CD_ts-pservice/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-pservice: template.json
-
-CDts-pservice:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-pservice
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-pservice/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-pservice/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-pservice/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-remotediagnosis/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-remotediagnosis/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-remotediagnosis/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-remotediagnosis/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-remotediagnosis/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 26e8d6c3..00000000
--- a/BMW-Dynatrace-config/CD_ts-remotediagnosis/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-remotediagnosis: template.json
-
-CDts-remotediagnosis:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-remotediagnosis
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-remotediagnosis/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-remotediagnosis/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-remotediagnosis/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-remotediagnosis/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-remotediagnosis/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-remotediagnosis/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-remotediagnosis/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-remotediagnosis/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 26e8d6c3..00000000
--- a/BMW-Dynatrace-config/CD_ts-remotediagnosis/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-remotediagnosis: template.json
-
-CDts-remotediagnosis:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-remotediagnosis
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-remotediagnosis/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-remotediagnosis/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-remotediagnosis/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rsurservice/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-rsurservice/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-rsurservice/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rsurservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-rsurservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 389174da..00000000
--- a/BMW-Dynatrace-config/CD_ts-rsurservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-rsurservice: template.json
-
-CDts-rsurservice:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-rsurservice
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-rsurservice/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-rsurservice/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-rsurservice/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rsurservice/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-rsurservice/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-rsurservice/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rsurservice/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-rsurservice/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 389174da..00000000
--- a/BMW-Dynatrace-config/CD_ts-rsurservice/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-rsurservice: template.json
-
-CDts-rsurservice:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-rsurservice
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-rsurservice/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-rsurservice/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-rsurservice/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rtcadapter/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-rtcadapter/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtcadapter/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rtcadapter/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-rtcadapter/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 8f367c60..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtcadapter/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-rtcadapter: template.json
-
-CDts-rtcadapter:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-rtcadapter
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-rtcadapter/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-rtcadapter/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtcadapter/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rtcadapter/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-rtcadapter/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtcadapter/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rtcadapter/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-rtcadapter/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 8f367c60..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtcadapter/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-rtcadapter: template.json
-
-CDts-rtcadapter:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-rtcadapter
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-rtcadapter/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-rtcadapter/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtcadapter/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rtchandler/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-rtchandler/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtchandler/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rtchandler/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-rtchandler/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index d1d0d501..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtchandler/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-rtchandler: template.json
-
-CDts-rtchandler:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-rtchandler
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-rtchandler/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-rtchandler/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtchandler/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rtchandler/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-rtchandler/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtchandler/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rtchandler/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-rtchandler/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index d1d0d501..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtchandler/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-rtchandler: template.json
-
-CDts-rtchandler:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-rtchandler
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-rtchandler/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-rtchandler/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtchandler/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rtcservice/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-rtcservice/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtcservice/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rtcservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-rtcservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 85923d20..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtcservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-rtcservice: template.json
-
-CDts-rtcservice:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-rtcservice
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-rtcservice/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-rtcservice/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtcservice/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rtcservice/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-rtcservice/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtcservice/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-rtcservice/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-rtcservice/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 85923d20..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtcservice/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-rtcservice: template.json
-
-CDts-rtcservice:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-rtcservice
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-rtcservice/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-rtcservice/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-rtcservice/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-scallservice/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-scallservice/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-scallservice/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-scallservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-scallservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 53b55b7a..00000000
--- a/BMW-Dynatrace-config/CD_ts-scallservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-scallservice: template.json
-
-CDts-scallservice:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-scallservice
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-scallservice/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-scallservice/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-scallservice/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-scallservice/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-scallservice/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-scallservice/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-scallservice/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-scallservice/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 53b55b7a..00000000
--- a/BMW-Dynatrace-config/CD_ts-scallservice/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-scallservice: template.json
-
-CDts-scallservice:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-scallservice
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-scallservice/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-scallservice/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-scallservice/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsbgam/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-tsbgam/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsbgam/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsbgam/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-tsbgam/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 101c5c19..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsbgam/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-tsbgam: template.json
-
-CDts-tsbgam:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-tsbgam
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-tsbgam/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-tsbgam/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsbgam/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsbgam/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-tsbgam/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsbgam/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsbgam/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-tsbgam/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 101c5c19..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsbgam/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-tsbgam: template.json
-
-CDts-tsbgam:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-tsbgam
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-tsbgam/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-tsbgam/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsbgam/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsbgservice/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-tsbgservice/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsbgservice/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsbgservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-tsbgservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index be96eea6..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsbgservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-tsbgservice: template.json
-
-CDts-tsbgservice:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-tsbgservice
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-tsbgservice/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-tsbgservice/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsbgservice/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsbgservice/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-tsbgservice/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsbgservice/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsbgservice/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-tsbgservice/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index be96eea6..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsbgservice/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-tsbgservice: template.json
-
-CDts-tsbgservice:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-tsbgservice
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-tsbgservice/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-tsbgservice/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsbgservice/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsp/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-tsp/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsp/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsp/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-tsp/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 1b6abb39..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsp/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-tsp: template.json
-
-CDts-tsp:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-tsp
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-tsp/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-tsp/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsp/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsp/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-tsp/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsp/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsp/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-tsp/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 1b6abb39..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsp/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-tsp: template.json
-
-CDts-tsp:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-tsp
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-tsp/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-tsp/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsp/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-wlupdater/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_ts-wlupdater/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-wlupdater/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-wlupdater/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_ts-wlupdater/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 61c768a8..00000000
--- a/BMW-Dynatrace-config/CD_ts-wlupdater/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-wlupdater: template.json
-
-CDts-wlupdater:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-wlupdater
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-wlupdater/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_ts-wlupdater/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_ts-wlupdater/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-wlupdater/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_ts-wlupdater/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_ts-wlupdater/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-wlupdater/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_ts-wlupdater/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 61c768a8..00000000
--- a/BMW-Dynatrace-config/CD_ts-wlupdater/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDts-wlupdater: template.json
-
-CDts-wlupdater:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: ts-wlupdater
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_ts-wlupdater/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_ts-wlupdater/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_ts-wlupdater/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tscs/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_tscs/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_tscs/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tscs/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_tscs/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 689b1426..00000000
--- a/BMW-Dynatrace-config/CD_tscs/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtscs: template.json
-
-CDtscs:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: tscs
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_tscs/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_tscs/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_tscs/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tscs/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_tscs/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_tscs/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tscs/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_tscs/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 689b1426..00000000
--- a/BMW-Dynatrace-config/CD_tscs/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtscs: template.json
-
-CDtscs:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: tscs
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_tscs/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_tscs/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_tscs/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsmb/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_tsmb/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_tsmb/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsmb/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_tsmb/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 7f350b36..00000000
--- a/BMW-Dynatrace-config/CD_tsmb/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtsmb: template.json
-
-CDtsmb:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: tsmb
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_tsmb/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_tsmb/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_tsmb/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsmb/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_tsmb/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_tsmb/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsmb/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_tsmb/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 7f350b36..00000000
--- a/BMW-Dynatrace-config/CD_tsmb/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtsmb: template.json
-
-CDtsmb:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: tsmb
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_tsmb/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_tsmb/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_tsmb/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsr-cmr/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_tsr-cmr/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_tsr-cmr/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsr-cmr/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_tsr-cmr/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 92a203ef..00000000
--- a/BMW-Dynatrace-config/CD_tsr-cmr/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtsr-cmr: template.json
-
-CDtsr-cmr:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: tsr-cmr
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_tsr-cmr/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_tsr-cmr/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_tsr-cmr/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsr-cmr/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_tsr-cmr/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_tsr-cmr/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsr-cmr/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_tsr-cmr/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 92a203ef..00000000
--- a/BMW-Dynatrace-config/CD_tsr-cmr/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtsr-cmr: template.json
-
-CDtsr-cmr:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: tsr-cmr
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_tsr-cmr/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_tsr-cmr/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_tsr-cmr/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsr-dd/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_tsr-dd/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_tsr-dd/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsr-dd/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_tsr-dd/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index a57f1303..00000000
--- a/BMW-Dynatrace-config/CD_tsr-dd/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtsr-dd: template.json
-
-CDtsr-dd:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: tsr-dd
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_tsr-dd/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_tsr-dd/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_tsr-dd/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsr-dd/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_tsr-dd/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_tsr-dd/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsr-dd/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_tsr-dd/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index a57f1303..00000000
--- a/BMW-Dynatrace-config/CD_tsr-dd/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtsr-dd: template.json
-
-CDtsr-dd:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: tsr-dd
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_tsr-dd/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_tsr-dd/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_tsr-dd/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsr-vu/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_tsr-vu/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_tsr-vu/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsr-vu/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_tsr-vu/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index de0cd3cf..00000000
--- a/BMW-Dynatrace-config/CD_tsr-vu/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtsr-vu: template.json
-
-CDtsr-vu:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: tsr-vu
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_tsr-vu/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_tsr-vu/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_tsr-vu/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsr-vu/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_tsr-vu/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_tsr-vu/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsr-vu/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_tsr-vu/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index de0cd3cf..00000000
--- a/BMW-Dynatrace-config/CD_tsr-vu/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtsr-vu: template.json
-
-CDtsr-vu:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: tsr-vu
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_tsr-vu/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_tsr-vu/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_tsr-vu/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsrservice/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_tsrservice/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_tsrservice/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsrservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_tsrservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 2e66c73a..00000000
--- a/BMW-Dynatrace-config/CD_tsrservice/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtsrservice: template.json
-
-CDtsrservice:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: tsrservice
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_tsrservice/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_tsrservice/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_tsrservice/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsrservice/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_tsrservice/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_tsrservice/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_tsrservice/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_tsrservice/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 2e66c73a..00000000
--- a/BMW-Dynatrace-config/CD_tsrservice/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDtsrservice: template.json
-
-CDtsrservice:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: tsrservice
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_tsrservice/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_tsrservice/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_tsrservice/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-activity-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_user-activity-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_user-activity-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-activity-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_user-activity-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 115fcd3c..00000000
--- a/BMW-Dynatrace-config/CD_user-activity-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDuser-activity-service: template.json
-
-CDuser-activity-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: user-activity-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_user-activity-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_user-activity-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_user-activity-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-activity-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_user-activity-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_user-activity-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-activity-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_user-activity-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 115fcd3c..00000000
--- a/BMW-Dynatrace-config/CD_user-activity-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDuser-activity-service: template.json
-
-CDuser-activity-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: user-activity-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_user-activity-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_user-activity-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_user-activity-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-attributes-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_user-attributes-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_user-attributes-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-attributes-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_user-attributes-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index f61910ee..00000000
--- a/BMW-Dynatrace-config/CD_user-attributes-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDuser-attributes-service: template.json
-
-CDuser-attributes-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: user-attributes-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_user-attributes-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_user-attributes-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_user-attributes-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-attributes-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_user-attributes-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_user-attributes-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-attributes-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_user-attributes-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index f61910ee..00000000
--- a/BMW-Dynatrace-config/CD_user-attributes-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDuser-attributes-service: template.json
-
-CDuser-attributes-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: user-attributes-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_user-attributes-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_user-attributes-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_user-attributes-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_user-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_user-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_user-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index b67256ff..00000000
--- a/BMW-Dynatrace-config/CD_user-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDuser-composite-service: template.json
-
-CDuser-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: user-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_user-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_user-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_user-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_user-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_user-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_user-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index b67256ff..00000000
--- a/BMW-Dynatrace-config/CD_user-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDuser-composite-service: template.json
-
-CDuser-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: user-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_user-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_user-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_user-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-delete-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_user-delete-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_user-delete-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-delete-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_user-delete-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 437b137b..00000000
--- a/BMW-Dynatrace-config/CD_user-delete-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDuser-delete-service: template.json
-
-CDuser-delete-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: user-delete-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_user-delete-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_user-delete-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_user-delete-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-delete-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_user-delete-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_user-delete-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-delete-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_user-delete-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 437b137b..00000000
--- a/BMW-Dynatrace-config/CD_user-delete-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDuser-delete-service: template.json
-
-CDuser-delete-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: user-delete-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_user-delete-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_user-delete-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_user-delete-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-position-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_user-position-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_user-position-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-position-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_user-position-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 8726f56a..00000000
--- a/BMW-Dynatrace-config/CD_user-position-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDuser-position-service: template.json
-
-CDuser-position-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: user-position-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_user-position-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_user-position-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_user-position-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-position-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_user-position-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_user-position-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-position-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_user-position-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 8726f56a..00000000
--- a/BMW-Dynatrace-config/CD_user-position-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDuser-position-service: template.json
-
-CDuser-position-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: user-position-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_user-position-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_user-position-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_user-position-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-profile-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_user-profile-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_user-profile-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-profile-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_user-profile-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index f3f43338..00000000
--- a/BMW-Dynatrace-config/CD_user-profile-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDuser-profile-service: template.json
-
-CDuser-profile-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: user-profile-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_user-profile-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_user-profile-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_user-profile-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-profile-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_user-profile-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_user-profile-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_user-profile-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_user-profile-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index f3f43338..00000000
--- a/BMW-Dynatrace-config/CD_user-profile-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDuser-profile-service: template.json
-
-CDuser-profile-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: user-profile-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_user-profile-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_user-profile-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_user-profile-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_usid-filter-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_usid-filter-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_usid-filter-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_usid-filter-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_usid-filter-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index d719e65f..00000000
--- a/BMW-Dynatrace-config/CD_usid-filter-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDusid-filter-service: template.json
-
-CDusid-filter-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: usid-filter-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_usid-filter-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_usid-filter-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_usid-filter-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_usid-filter-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_usid-filter-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_usid-filter-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_usid-filter-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_usid-filter-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index d719e65f..00000000
--- a/BMW-Dynatrace-config/CD_usid-filter-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDusid-filter-service: template.json
-
-CDusid-filter-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: usid-filter-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_usid-filter-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_usid-filter-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_usid-filter-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_vehicle-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_vehicle-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 64f4cfd9..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-composite-service: template.json
-
-CDvehicle-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_vehicle-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_vehicle-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_vehicle-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 64f4cfd9..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-composite-service: template.json
-
-CDvehicle-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_vehicle-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-features-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_vehicle-features-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-features-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-features-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_vehicle-features-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index a96b7888..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-features-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-features-service: template.json
-
-CDvehicle-features-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-features-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-features-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_vehicle-features-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-features-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-features-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_vehicle-features-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-features-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-features-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_vehicle-features-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index a96b7888..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-features-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-features-service: template.json
-
-CDvehicle-features-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-features-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-features-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_vehicle-features-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-features-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 2d5b28d2..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-list-proxy-service: template.json
-
-CDvehicle-list-proxy-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-list-proxy-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 2d5b28d2..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-list-proxy-service: template.json
-
-CDvehicle-list-proxy-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-list-proxy-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-list-proxy-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 2d30b96c..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-mapping-composite-service: template.json
-
-CDvehicle-mapping-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-mapping-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 2d30b96c..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-mapping-composite-service: template.json
-
-CDvehicle-mapping-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-mapping-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-mapping-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-mapping-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_vehicle-mapping-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-mapping-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-mapping-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_vehicle-mapping-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index ad19cc2d..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-mapping-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-mapping-service: template.json
-
-CDvehicle-mapping-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-mapping-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-mapping-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_vehicle-mapping-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-mapping-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-mapping-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_vehicle-mapping-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-mapping-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-mapping-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_vehicle-mapping-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index ad19cc2d..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-mapping-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-mapping-service: template.json
-
-CDvehicle-mapping-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-mapping-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-mapping-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_vehicle-mapping-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-mapping-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 238d627e..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-remote-commands-composite-service: template.json
-
-CDvehicle-remote-commands-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-remote-commands-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 238d627e..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-remote-commands-composite-service: template.json
-
-CDvehicle-remote-commands-composite-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-remote-commands-composite-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-remote-commands-composite-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-alert/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_vehicle-service-alert/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-alert/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-alert/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_vehicle-service-alert/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 7261d9c4..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-alert/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-service-alert: template.json
-
-CDvehicle-service-alert:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-service-alert
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-alert/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_vehicle-service-alert/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-alert/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-alert/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_vehicle-service-alert/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-alert/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-alert/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_vehicle-service-alert/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 7261d9c4..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-alert/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-service-alert: template.json
-
-CDvehicle-service-alert:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-service-alert
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-alert/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_vehicle-service-alert/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-alert/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-background/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_vehicle-service-background/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-background/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-background/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_vehicle-service-background/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 18c7418d..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-background/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-service-background: template.json
-
-CDvehicle-service-background:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-service-background
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-background/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_vehicle-service-background/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-background/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-background/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_vehicle-service-background/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-background/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-background/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_vehicle-service-background/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 18c7418d..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-background/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-service-background: template.json
-
-CDvehicle-service-background:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-service-background
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-background/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_vehicle-service-background/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-background/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-staging/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_vehicle-service-staging/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-staging/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-staging/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_vehicle-service-staging/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 7e129df3..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-staging/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-service-staging: template.json
-
-CDvehicle-service-staging:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-service-staging
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-staging/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_vehicle-service-staging/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-staging/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-staging/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_vehicle-service-staging/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-staging/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-staging/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_vehicle-service-staging/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 7e129df3..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-staging/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-service-staging: template.json
-
-CDvehicle-service-staging:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-service-staging
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-service-staging/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_vehicle-service-staging/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service-staging/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_vehicle-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_vehicle-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 4f5e41d8..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-service: template.json
-
-CDvehicle-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_vehicle-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_vehicle-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_vehicle-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 4f5e41d8..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-service: template.json
-
-CDvehicle-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_vehicle-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 7faa3ce5..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-shadow-event-processor: template.json
-
-CDvehicle-shadow-event-processor:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-shadow-event-processor
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 7faa3ce5..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-shadow-event-processor: template.json
-
-CDvehicle-shadow-event-processor:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-shadow-event-processor
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-shadow-event-processor/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index ded74860..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-status-proxy-service: template.json
-
-CDvehicle-status-proxy-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-status-proxy-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index ded74860..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-status-proxy-service: template.json
-
-CDvehicle-status-proxy-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-status-proxy-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-status-proxy-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 005ef857..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-user-relationship-service: template.json
-
-CDvehicle-user-relationship-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-user-relationship-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 005ef857..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvehicle-user-relationship-service: template.json
-
-CDvehicle-user-relationship-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vehicle-user-relationship-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_vehicle-user-relationship-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vin-list-generator-service/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_vin-list-generator-service/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_vin-list-generator-service/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vin-list-generator-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_vin-list-generator-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index c0d0a51b..00000000
--- a/BMW-Dynatrace-config/CD_vin-list-generator-service/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvin-list-generator-service: template.json
-
-CDvin-list-generator-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vin-list-generator-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vin-list-generator-service/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_vin-list-generator-service/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_vin-list-generator-service/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vin-list-generator-service/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_vin-list-generator-service/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_vin-list-generator-service/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vin-list-generator-service/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_vin-list-generator-service/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index c0d0a51b..00000000
--- a/BMW-Dynatrace-config/CD_vin-list-generator-service/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvin-list-generator-service: template.json
-
-CDvin-list-generator-service:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vin-list-generator-service
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vin-list-generator-service/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_vin-list-generator-service/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_vin-list-generator-service/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-admin/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_vps-admin/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_vps-admin/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-admin/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_vps-admin/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 6329c3ba..00000000
--- a/BMW-Dynatrace-config/CD_vps-admin/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvps-admin: template.json
-
-CDvps-admin:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vps-admin
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vps-admin/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_vps-admin/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_vps-admin/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-admin/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_vps-admin/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_vps-admin/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-admin/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_vps-admin/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 6329c3ba..00000000
--- a/BMW-Dynatrace-config/CD_vps-admin/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvps-admin: template.json
-
-CDvps-admin:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vps-admin
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vps-admin/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_vps-admin/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_vps-admin/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-archive/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_vps-archive/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_vps-archive/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-archive/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_vps-archive/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index c34b8d74..00000000
--- a/BMW-Dynatrace-config/CD_vps-archive/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvps-archive: template.json
-
-CDvps-archive:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vps-archive
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vps-archive/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_vps-archive/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_vps-archive/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-archive/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_vps-archive/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_vps-archive/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-archive/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_vps-archive/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index c34b8d74..00000000
--- a/BMW-Dynatrace-config/CD_vps-archive/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvps-archive: template.json
-
-CDvps-archive:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vps-archive
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vps-archive/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_vps-archive/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_vps-archive/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-monitor/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_vps-monitor/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_vps-monitor/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-monitor/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_vps-monitor/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 89c591bb..00000000
--- a/BMW-Dynatrace-config/CD_vps-monitor/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvps-monitor: template.json
-
-CDvps-monitor:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vps-monitor
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vps-monitor/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_vps-monitor/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_vps-monitor/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-monitor/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_vps-monitor/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_vps-monitor/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-monitor/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_vps-monitor/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 89c591bb..00000000
--- a/BMW-Dynatrace-config/CD_vps-monitor/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvps-monitor: template.json
-
-CDvps-monitor:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vps-monitor
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vps-monitor/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_vps-monitor/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_vps-monitor/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-prov/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_vps-prov/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_vps-prov/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-prov/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_vps-prov/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 9764010c..00000000
--- a/BMW-Dynatrace-config/CD_vps-prov/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvps-prov: template.json
-
-CDvps-prov:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vps-prov
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vps-prov/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_vps-prov/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_vps-prov/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-prov/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_vps-prov/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_vps-prov/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-prov/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_vps-prov/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 9764010c..00000000
--- a/BMW-Dynatrace-config/CD_vps-prov/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvps-prov: template.json
-
-CDvps-prov:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vps-prov
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vps-prov/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_vps-prov/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_vps-prov/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-trigger/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_vps-trigger/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_vps-trigger/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-trigger/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_vps-trigger/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 16a5c74e..00000000
--- a/BMW-Dynatrace-config/CD_vps-trigger/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvps-trigger: template.json
-
-CDvps-trigger:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vps-trigger
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vps-trigger/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_vps-trigger/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_vps-trigger/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-trigger/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_vps-trigger/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_vps-trigger/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vps-trigger/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_vps-trigger/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 16a5c74e..00000000
--- a/BMW-Dynatrace-config/CD_vps-trigger/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvps-trigger: template.json
-
-CDvps-trigger:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vps-trigger
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vps-trigger/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_vps-trigger/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_vps-trigger/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vs-api/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_vs-api/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_vs-api/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vs-api/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_vs-api/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 55c98009..00000000
--- a/BMW-Dynatrace-config/CD_vs-api/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvs-api: template.json
-
-CDvs-api:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vs-api
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vs-api/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_vs-api/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_vs-api/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vs-api/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_vs-api/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_vs-api/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_vs-api/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_vs-api/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 55c98009..00000000
--- a/BMW-Dynatrace-config/CD_vs-api/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDvs-api: template.json
-
-CDvs-api:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: vs-api
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_vs-api/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_vs-api/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_vs-api/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_webapi/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_webapi/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_webapi/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_webapi/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_webapi/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index c1fc3f96..00000000
--- a/BMW-Dynatrace-config/CD_webapi/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDwebapi: template.json
-
-CDwebapi:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: webapi
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_webapi/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_webapi/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_webapi/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_webapi/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_webapi/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_webapi/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_webapi/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_webapi/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index c1fc3f96..00000000
--- a/BMW-Dynatrace-config/CD_webapi/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDwebapi: template.json
-
-CDwebapi:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: webapi
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_webapi/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_webapi/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_webapi/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_wlmanager/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_wlmanager/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_wlmanager/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_wlmanager/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_wlmanager/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index 426fc11f..00000000
--- a/BMW-Dynatrace-config/CD_wlmanager/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDwlmanager: template.json
-
-CDwlmanager:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: wlmanager
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_wlmanager/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_wlmanager/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_wlmanager/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_wlmanager/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_wlmanager/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_wlmanager/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_wlmanager/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_wlmanager/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index 426fc11f..00000000
--- a/BMW-Dynatrace-config/CD_wlmanager/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDwlmanager: template.json
-
-CDwlmanager:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: wlmanager
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_wlmanager/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_wlmanager/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_wlmanager/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_xfcd/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_xfcd/conditional-naming-processgroup/README.md
deleted file mode 100644
index 519727bf..00000000
--- a/BMW-Dynatrace-config/CD_xfcd/conditional-naming-processgroup/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure process groups?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_xfcd/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_xfcd/conditional-naming-processgroup/conditional-naming-processgroup.yaml
deleted file mode 100644
index de3c9975..00000000
--- a/BMW-Dynatrace-config/CD_xfcd/conditional-naming-processgroup/conditional-naming-processgroup.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDxfcd: template.json
-
-CDxfcd:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: xfcd
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_xfcd/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_xfcd/conditional-naming-processgroup/template.json
deleted file mode 100644
index 7c039808..00000000
--- a/BMW-Dynatrace-config/CD_xfcd/conditional-naming-processgroup/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "PROCESS_GROUP_TAGS"
-   }
-  }
- ],
- "type": "PROCESS_GROUP"
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_xfcd/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_xfcd/conditional-naming-service/README.md
deleted file mode 100644
index b6f10ae1..00000000
--- a/BMW-Dynatrace-config/CD_xfcd/conditional-naming-service/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure service naming
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_xfcd/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_xfcd/conditional-naming-service/conditional-naming-service.yaml
deleted file mode 100644
index de3c9975..00000000
--- a/BMW-Dynatrace-config/CD_xfcd/conditional-naming-service/conditional-naming-service.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-config:
-- CDxfcd: template.json
-
-CDxfcd:
-- name: MyProcessNamingRule
-- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}"
-- tag: xfcd
-- skipDeployment: "true"
diff --git a/BMW-Dynatrace-config/CD_xfcd/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_xfcd/conditional-naming-service/template.json
deleted file mode 100644
index 5d4fac56..00000000
--- a/BMW-Dynatrace-config/CD_xfcd/conditional-naming-service/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "displayName": "{{.name}}",
- "enabled": true,
- "metadata": {
-  "clusterVersion": "1.214.107.20210407-223952",
-  "configurationVersions": [
-   0
-  ]
- },
- "nameFormat": "{{.nameFormat}}",
- "rules": [
-  {
-   "comparisonInfo": {
-    "negate": false,
-    "operator": "EQUALS",
-    "type": "TAG",
-    "value": {
-     "context": "CONTEXTLESS",
-     "key": "Component",
-     "value": "{{.tag}}"
-    }
-   },
-   "key": {
-    "attribute": "SERVICE_TAGS"
-   }
-  }
- ],
- "type": "SERVICE"
-}
\ No newline at end of file