diff --git a/BMW-Dynatrace-config/CD_ts-bcallservice/dashboard/README.md b/BMW-Dynatrace-config/CD_ts-bcallservice/dashboard/README.md
deleted file mode 100644
index f2f821ec..00000000
--- a/BMW-Dynatrace-config/CD_ts-bcallservice/dashboard/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure dashboards?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Dashboards) page to configure your dashboards.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bcallservice/dashboard/dashboard.yaml b/BMW-Dynatrace-config/CD_ts-bcallservice/dashboard/dashboard.yaml
deleted file mode 100644
index 0dcc1d71..00000000
--- a/BMW-Dynatrace-config/CD_ts-bcallservice/dashboard/dashboard.yaml
+++ /dev/null
@@ -1,125 +0,0 @@
-config:
-- CDts-bcallservice-PROD: default.json
-- CDts-bcallservice-E2E: default.json
-- CDts-bcallservice-INT: default.json
-- CDts-bcallservice-TEST: default.json
-
-#PROD dashboards for EMEA/NA/CN Prod
-CDts-bcallservice-PROD:
-- name: CD_ts-bcallservice PROD
-- mzName: CD_ts-bcallservice/management-zone/CDts-bcallservice.name
-- mzId: CD_ts-bcallservice/management-zone/CDts-bcallservice.id
-- tag: ts-bcallservice
-- env: PROD
-- skipDeployment: "true"
-CDts-bcallservice-PROD.EMEA-Prod:
-- name: CD_ts-bcallservice PROD
-- mzName: CD_ts-bcallservice/management-zone/CDts-bcallservice.name
-- mzId: CD_ts-bcallservice/management-zone/CDts-bcallservice.id
-- tag: ts-bcallservice
-- env: PROD
-- skipDeployment: "false"
-CDts-bcallservice-PROD.NA-Prod:
-- name: CD_ts-bcallservice PROD
-- mzName: CD_ts-bcallservice/management-zone/CDts-bcallservice.name
-- mzId: CD_ts-bcallservice/management-zone/CDts-bcallservice.id
-- tag: ts-bcallservice
-- env: PROD
-- skipDeployment: "false"
-CDts-bcallservice-PROD.CN-Prod:
-- name: CD_ts-bcallservice PROD
-- mzName: CD_ts-bcallservice/management-zone/CDts-bcallservice.name
-- mzId: CD_ts-bcallservice/management-zone/CDts-bcallservice.id
-- tag: ts-bcallservice
-- env: PROD
-- skipDeployment: "false"
-
-#E2E dashboards for EMEA/NA/CN Prod
-CDts-bcallservice-E2E:
-- name: CD_ts-bcallservice E2E
-- mzName: CD_ts-bcallservice/management-zone/CDts-bcallservice.name
-- mzId: CD_ts-bcallservice/management-zone/CDts-bcallservice.id
-- tag: ts-bcallservice
-- env: E2E
-- skipDeployment: "true"
-CDts-bcallservice-E2E.EMEA-Prod:
-- name: CD_ts-bcallservice E2E
-- mzName: CD_ts-bcallservice/management-zone/CDts-bcallservice.name
-- mzId: CD_ts-bcallservice/management-zone/CDts-bcallservice.id
-- tag: ts-bcallservice
-- env: E2E
-- skipDeployment: "false"
-CDts-bcallservice-E2E.NA-Prod:
-- name: CD_ts-bcallservice E2E
-- mzName: CD_ts-bcallservice/management-zone/CDts-bcallservice.name
-- mzId: CD_ts-bcallservice/management-zone/CDts-bcallservice.id
-- tag: ts-bcallservice
-- env: E2E
-- skipDeployment: "false"
-CDts-bcallservice-E2E.CN-Prod:
-- name: CD_ts-bcallservice E2E
-- mzName: CD_ts-bcallservice/management-zone/CDts-bcallservice.name
-- mzId: CD_ts-bcallservice/management-zone/CDts-bcallservice.id
-- tag: ts-bcallservice
-- env: E2E
-- skipDeployment: "false"
-
-#INT dashboards for EMEA/NA/CN PreProd
-CDts-bcallservice-INT:
-- name: CD_ts-bcallservice INT
-- mzName: CD_ts-bcallservice/management-zone/CDts-bcallservice.name
-- mzId: CD_ts-bcallservice/management-zone/CDts-bcallservice.id
-- tag: ts-bcallservice
-- env: INT
-- skipDeployment: "true"
-CDts-bcallservice-INT.EMEA-PreProd:
-- name: CD_ts-bcallservice INT
-- mzName: CD_ts-bcallservice/management-zone/CDts-bcallservice.name
-- mzId: CD_ts-bcallservice/management-zone/CDts-bcallservice.id
-- tag: ts-bcallservice
-- env: INT
-- skipDeployment: "false"
-CDts-bcallservice-INT.NA-PreProd:
-- name: CD_ts-bcallservice INT
-- mzName: CD_ts-bcallservice/management-zone/CDts-bcallservice.name
-- mzId: CD_ts-bcallservice/management-zone/CDts-bcallservice.id
-- tag: ts-bcallservice
-- env: INT
-- skipDeployment: "false"
-CDts-bcallservice-INT.CN-PreProd:
-- name: CD_ts-bcallservice INT
-- mzName: CD_ts-bcallservice/management-zone/CDts-bcallservice.name
-- mzId: CD_ts-bcallservice/management-zone/CDts-bcallservice.id
-- tag: ts-bcallservice
-- env: INT
-- skipDeployment: "false"
-
-#TEST dashboards for EMEA/NA/CN PreProd
-CDts-bcallservice-TEST:
-- name: CD_ts-bcallservice TEST
-- mzName: CD_ts-bcallservice/management-zone/CDts-bcallservice.name
-- mzId: CD_ts-bcallservice/management-zone/CDts-bcallservice.id
-- tag: ts-bcallservice
-- env: TEST
-- skipDeployment: "true"
-CDts-bcallservice-TEST.EMEA-PreProd:
-- name: CD_ts-bcallservice TEST
-- mzName: CD_ts-bcallservice/management-zone/CDts-bcallservice.name
-- mzId: CD_ts-bcallservice/management-zone/CDts-bcallservice.id
-- tag: ts-bcallservice
-- env: TEST
-- skipDeployment: "false"
-CDts-bcallservice-TEST.NA-PreProd:
-- name: CD_ts-bcallservice TEST
-- mzName: CD_ts-bcallservice/management-zone/CDts-bcallservice.name
-- mzId: CD_ts-bcallservice/management-zone/CDts-bcallservice.id
-- tag: ts-bcallservice
-- env: TEST
-- skipDeployment: "false"
-CDts-bcallservice-TEST.CN-PreProd:
-- name: CD_ts-bcallservice TEST
-- mzName: CD_ts-bcallservice/management-zone/CDts-bcallservice.name
-- mzId: CD_ts-bcallservice/management-zone/CDts-bcallservice.id
-- tag: ts-bcallservice
-- env: TEST
-- skipDeployment: "false"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bcallservice/dashboard/default.json b/BMW-Dynatrace-config/CD_ts-bcallservice/dashboard/default.json
deleted file mode 100644
index 6c685810..00000000
--- a/BMW-Dynatrace-config/CD_ts-bcallservice/dashboard/default.json
+++ /dev/null
@@ -1,308 +0,0 @@
-{
-  "metadata": {
-    "configurationVersions": [
-      3
-    ],
-    "clusterVersion": "1.214.107.20210407-223952"
-  },
-  "dashboardMetadata": {
-    "name": "{{.name}}",
-    "shared": true,
-    "owner": "Ignacio.Goldman@partner.bmwgroup.com",
-    "dashboardFilter": {
-      "timeframe": "-24h to now"
-    },
-    "tags": [
-      "{{.tag}}"
-    ]
-  },
-  "tiles": [
-    {
-      "name": "Custom chart",
-      "tileType": "CUSTOM_CHARTING",
-      "configured": true,
-      "bounds": {
-        "top": 228,
-        "left": 38,
-        "width": 1064,
-        "height": 304
-      },
-      "tileFilter": {},
-      "filterConfig": {
-        "type": "MIXED",
-        "customName": "Failure rate (HTTP 4xx/5xx  errors)",
-        "defaultName": "Custom chart",
-        "chartConfig": {
-          "legendShown": true,
-          "type": "TIMESERIES",
-          "series": [
-            {
-              "metric": "builtin:service.errors.fourxx.rate",
-              "aggregation": "AVG",
-              "type": "BAR",
-              "entityType": "SERVICE",
-              "dimensions": [],
-              "sortAscending": false,
-              "sortColumn": false,
-              "aggregationRate": "TOTAL"
-            },
-            {
-              "metric": "builtin:service.errors.fivexx.rate",
-              "aggregation": "AVG",
-              "type": "BAR",
-              "entityType": "SERVICE",
-              "dimensions": [],
-              "sortAscending": false,
-              "sortColumn": true,
-              "aggregationRate": "TOTAL"
-            }
-          ],
-          "resultMetadata": {
-            "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE": {
-              "lastModified": 1617956393463,
-              "customColor": "#ff0000"
-            },
-            "nullbuiltin:service.errors.fourxx.rate|AVG|TOTAL|BAR|SERVICE": {
-              "lastModified": 1617956441725,
-              "customColor": "#fff29a"
-            }
-          }
-        },
-        "filtersPerEntityType": {
-          "SERVICE": {
-            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
-            ]
-          }
-        }
-      }
-    },
-    {
-      "name": "Problems",
-      "tileType": "OPEN_PROBLEMS",
-      "configured": true,
-      "bounds": {
-        "top": 38,
-        "left": 950,
-        "width": 152,
-        "height": 152
-      },
-      "tileFilter": {
-        "managementZone": {
-          "id": "{{.mzId}}",
-          "name": "{{.mzName}}"
-        }
-      }
-    },
-    {
-      "name": "Overall Health",
-      "tileType": "HEADER",
-      "configured": true,
-      "bounds": {
-        "top": 0,
-        "left": 38,
-        "width": 1064,
-        "height": 38
-      },
-      "tileFilter": {}
-    },
-    {
-      "name": "Markdown",
-      "tileType": "MARKDOWN",
-      "configured": true,
-      "bounds": {
-        "top": 532,
-        "left": 38,
-        "width": 1064,
-        "height": 38
-      },
-      "tileFilter": {},
-      "markdown": "---\n"
-    },
-    {
-      "name": "Custom chart",
-      "tileType": "CUSTOM_CHARTING",
-      "configured": true,
-      "bounds": {
-        "top": 570,
-        "left": 38,
-        "width": 1064,
-        "height": 304
-      },
-      "tileFilter": {},
-      "filterConfig": {
-        "type": "MIXED",
-        "customName": "Response time, Request Count and Number of Errors",
-        "defaultName": "Custom chart",
-        "chartConfig": {
-          "legendShown": true,
-          "type": "TIMESERIES",
-          "series": [
-            {
-              "metric": "builtin:service.response.time",
-              "aggregation": "AVG",
-              "type": "LINE",
-              "entityType": "SERVICE",
-              "dimensions": [],
-              "sortAscending": false,
-              "sortColumn": false,
-              "aggregationRate": "TOTAL"
-            },
-            {
-              "metric": "builtin:service.requestCount.total",
-              "aggregation": "NONE",
-              "type": "BAR",
-              "entityType": "SERVICE",
-              "dimensions": [],
-              "sortAscending": false,
-              "sortColumn": false,
-              "aggregationRate": "TOTAL"
-            },
-            {
-              "metric": "builtin:service.errors.total.count",
-              "aggregation": "NONE",
-              "type": "BAR",
-              "entityType": "SERVICE",
-              "dimensions": [],
-              "sortAscending": false,
-              "sortColumn": true,
-              "aggregationRate": "TOTAL"
-            }
-          ],
-          "resultMetadata": {
-            "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE": {
-              "lastModified": 1595275720776,
-              "customColor": "#008cdb"
-            },
-            "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE": {
-              "lastModified": 1595275955999,
-              "customColor": "#ef651f"
-            },
-            "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE": {
-              "lastModified": 1595275686773,
-              "customColor": "#b4e5f9"
-            }
-          }
-        },
-        "filtersPerEntityType": {
-          "SERVICE": {
-            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
-            ]
-          }
-        }
-      }
-    },
-    {
-      "name": "Markdown",
-      "tileType": "MARKDOWN",
-      "configured": true,
-      "bounds": {
-        "top": 190,
-        "left": 38,
-        "width": 1064,
-        "height": 38
-      },
-      "tileFilter": {},
-      "markdown": "---\n"
-    },
-    {
-      "name": "",
-      "tileType": "DATABASES_OVERVIEW",
-      "configured": true,
-      "bounds": {
-        "top": 38,
-        "left": 646,
-        "width": 190,
-        "height": 152
-      },
-      "tileFilter": {},
-      "filterConfig": {
-        "type": "DATABASE",
-        "customName": "Databases",
-        "defaultName": "Databases",
-        "chartConfig": {
-          "legendShown": true,
-          "type": "TIMESERIES",
-          "series": [],
-          "resultMetadata": {}
-        },
-        "filtersPerEntityType": {
-          "DATABASE": {
-            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
-            ]
-          }
-        }
-      },
-      "chartVisible": true
-    },
-    {
-      "name": "",
-      "tileType": "SERVICES",
-      "configured": true,
-      "bounds": {
-        "top": 38,
-        "left": 342,
-        "width": 190,
-        "height": 152
-      },
-      "tileFilter": {},
-      "filterConfig": {
-        "type": "SERVICE",
-        "customName": "Services",
-        "defaultName": "Services",
-        "chartConfig": {
-          "legendShown": true,
-          "type": "TIMESERIES",
-          "series": [],
-          "resultMetadata": {}
-        },
-        "filtersPerEntityType": {
-          "SERVICE": {
-            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
-            ]
-          }
-        }
-      },
-      "chartVisible": true
-    },
-    {
-      "name": "",
-      "tileType": "HOSTS",
-      "configured": true,
-      "bounds": {
-        "top": 38,
-        "left": 38,
-        "width": 190,
-        "height": 152
-      },
-      "tileFilter": {},
-      "filterConfig": {
-        "type": "HOST",
-        "customName": "Hosts",
-        "defaultName": "Hosts",
-        "chartConfig": {
-          "legendShown": true,
-          "type": "TIMESERIES",
-          "series": [],
-          "resultMetadata": {}
-        },
-        "filtersPerEntityType": {
-          "HOST": {
-            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
-            ]
-          }
-        }
-      },
-      "chartVisible": true
-    }
-  ]
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bcallservice/management-zone/README.md b/BMW-Dynatrace-config/CD_ts-bcallservice/management-zone/README.md
deleted file mode 100644
index 3716858c..00000000
--- a/BMW-Dynatrace-config/CD_ts-bcallservice/management-zone/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure management zones?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Management+Zones) page to configure your management zones.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bcallservice/management-zone/default.json b/BMW-Dynatrace-config/CD_ts-bcallservice/management-zone/default.json
deleted file mode 100644
index bffa0c3b..00000000
--- a/BMW-Dynatrace-config/CD_ts-bcallservice/management-zone/default.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
- "dimensionalRules": [],
- "name": "{{.name}}",
- "rules": [
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "negate": false,
-      "operator": "EQUALS",
-      "type": "TAG",
-      "value": {
-       "context": "CONTEXTLESS",
-       "key": "Component",
-       "value": "{{.tag}}"
-      }
-     },
-     "key": {
-      "attribute": "SERVICE_TAGS"
-     }
-    }
-   ],
-   "enabled": true,
-   "propagationTypes": [
-    "SERVICE_TO_PROCESS_GROUP_LIKE",
-    "SERVICE_TO_HOST_LIKE"
-   ],
-   "type": "SERVICE"
-  },
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "negate": false,
-      "operator": "EQUALS",
-      "type": "TAG",
-      "value": {
-       "context": "CONTEXTLESS",
-       "key": "Component",
-       "value": "{{.tag}}"
-      }
-     },
-     "key": {
-      "attribute": "PROCESS_GROUP_TAGS"
-     }
-    }
-   ],
-   "enabled": true,
-   "propagationTypes": [
-    "PROCESS_GROUP_TO_HOST"
-   ],
-   "type": "PROCESS_GROUP"
-  },
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "negate": false,
-      "operator": "EQUALS",
-      "type": "TAG",
-      "value": {
-       "context": "CONTEXTLESS",
-       "key": "Component",
-       "value": "{{.tag}}"
-      }
-     },
-     "key": {
-      "attribute": "HOST_TAGS"
-     }
-    }
-   ],
-   "enabled": true,
-   "type": "HOST"
-  },
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "caseSensitive": true,
-      "negate": false,
-      "operator": "CONTAINS",
-      "type": "STRING",
-      "value": "{{.tag}}"
-     },
-     "key": {
-      "attribute": "CLOUD_APPLICATION_NAMESPACE_NAME"
-     }
-    }
-   ],
-   "enabled": true,
-   "propagationTypes": [],
-   "type": "CLOUD_APPLICATION_NAMESPACE"
-  },
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "caseSensitive": true,
-      "negate": false,
-      "operator": "CONTAINS",
-      "type": "STRING",
-      "value": "{{.tag}}"
-     },
-     "key": {
-      "attribute": "CLOUD_APPLICATION_NAME"
-     }
-    }
-   ],
-   "enabled": true,
-   "propagationTypes": [],
-   "type": "CLOUD_APPLICATION"
-  }
- ]
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bcallservice/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_ts-bcallservice/management-zone/management-zone.yaml
deleted file mode 100644
index 67efd35c..00000000
--- a/BMW-Dynatrace-config/CD_ts-bcallservice/management-zone/management-zone.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-config:
-- CDts-bcallservice: default.json
-
-CDts-bcallservice:
-- name: CD_ts-bcallservice
-- tag: ts-bcallservice
diff --git a/BMW-Dynatrace-config/CD_ts-bt/dashboard/README.md b/BMW-Dynatrace-config/CD_ts-bt/dashboard/README.md
deleted file mode 100644
index f2f821ec..00000000
--- a/BMW-Dynatrace-config/CD_ts-bt/dashboard/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure dashboards?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Dashboards) page to configure your dashboards.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bt/dashboard/dashboard.yaml b/BMW-Dynatrace-config/CD_ts-bt/dashboard/dashboard.yaml
deleted file mode 100644
index 14f862f2..00000000
--- a/BMW-Dynatrace-config/CD_ts-bt/dashboard/dashboard.yaml
+++ /dev/null
@@ -1,125 +0,0 @@
-config:
-- CDts-bt-PROD: default.json
-- CDts-bt-E2E: default.json
-- CDts-bt-INT: default.json
-- CDts-bt-TEST: default.json
-
-#PROD dashboards for EMEA/NA/CN Prod
-CDts-bt-PROD:
-- name: CD_ts-bt PROD
-- mzName: CD_ts-bt/management-zone/CDts-bt.name
-- mzId: CD_ts-bt/management-zone/CDts-bt.id
-- tag: ts-bt
-- env: PROD
-- skipDeployment: "true"
-CDts-bt-PROD.EMEA-Prod:
-- name: CD_ts-bt PROD
-- mzName: CD_ts-bt/management-zone/CDts-bt.name
-- mzId: CD_ts-bt/management-zone/CDts-bt.id
-- tag: ts-bt
-- env: PROD
-- skipDeployment: "false"
-CDts-bt-PROD.NA-Prod:
-- name: CD_ts-bt PROD
-- mzName: CD_ts-bt/management-zone/CDts-bt.name
-- mzId: CD_ts-bt/management-zone/CDts-bt.id
-- tag: ts-bt
-- env: PROD
-- skipDeployment: "false"
-CDts-bt-PROD.CN-Prod:
-- name: CD_ts-bt PROD
-- mzName: CD_ts-bt/management-zone/CDts-bt.name
-- mzId: CD_ts-bt/management-zone/CDts-bt.id
-- tag: ts-bt
-- env: PROD
-- skipDeployment: "false"
-
-#E2E dashboards for EMEA/NA/CN Prod
-CDts-bt-E2E:
-- name: CD_ts-bt E2E
-- mzName: CD_ts-bt/management-zone/CDts-bt.name
-- mzId: CD_ts-bt/management-zone/CDts-bt.id
-- tag: ts-bt
-- env: E2E
-- skipDeployment: "true"
-CDts-bt-E2E.EMEA-Prod:
-- name: CD_ts-bt E2E
-- mzName: CD_ts-bt/management-zone/CDts-bt.name
-- mzId: CD_ts-bt/management-zone/CDts-bt.id
-- tag: ts-bt
-- env: E2E
-- skipDeployment: "false"
-CDts-bt-E2E.NA-Prod:
-- name: CD_ts-bt E2E
-- mzName: CD_ts-bt/management-zone/CDts-bt.name
-- mzId: CD_ts-bt/management-zone/CDts-bt.id
-- tag: ts-bt
-- env: E2E
-- skipDeployment: "false"
-CDts-bt-E2E.CN-Prod:
-- name: CD_ts-bt E2E
-- mzName: CD_ts-bt/management-zone/CDts-bt.name
-- mzId: CD_ts-bt/management-zone/CDts-bt.id
-- tag: ts-bt
-- env: E2E
-- skipDeployment: "false"
-
-#INT dashboards for EMEA/NA/CN PreProd
-CDts-bt-INT:
-- name: CD_ts-bt INT
-- mzName: CD_ts-bt/management-zone/CDts-bt.name
-- mzId: CD_ts-bt/management-zone/CDts-bt.id
-- tag: ts-bt
-- env: INT
-- skipDeployment: "true"
-CDts-bt-INT.EMEA-PreProd:
-- name: CD_ts-bt INT
-- mzName: CD_ts-bt/management-zone/CDts-bt.name
-- mzId: CD_ts-bt/management-zone/CDts-bt.id
-- tag: ts-bt
-- env: INT
-- skipDeployment: "false"
-CDts-bt-INT.NA-PreProd:
-- name: CD_ts-bt INT
-- mzName: CD_ts-bt/management-zone/CDts-bt.name
-- mzId: CD_ts-bt/management-zone/CDts-bt.id
-- tag: ts-bt
-- env: INT
-- skipDeployment: "false"
-CDts-bt-INT.CN-PreProd:
-- name: CD_ts-bt INT
-- mzName: CD_ts-bt/management-zone/CDts-bt.name
-- mzId: CD_ts-bt/management-zone/CDts-bt.id
-- tag: ts-bt
-- env: INT
-- skipDeployment: "false"
-
-#TEST dashboards for EMEA/NA/CN PreProd
-CDts-bt-TEST:
-- name: CD_ts-bt TEST
-- mzName: CD_ts-bt/management-zone/CDts-bt.name
-- mzId: CD_ts-bt/management-zone/CDts-bt.id
-- tag: ts-bt
-- env: TEST
-- skipDeployment: "true"
-CDts-bt-TEST.EMEA-PreProd:
-- name: CD_ts-bt TEST
-- mzName: CD_ts-bt/management-zone/CDts-bt.name
-- mzId: CD_ts-bt/management-zone/CDts-bt.id
-- tag: ts-bt
-- env: TEST
-- skipDeployment: "false"
-CDts-bt-TEST.NA-PreProd:
-- name: CD_ts-bt TEST
-- mzName: CD_ts-bt/management-zone/CDts-bt.name
-- mzId: CD_ts-bt/management-zone/CDts-bt.id
-- tag: ts-bt
-- env: TEST
-- skipDeployment: "false"
-CDts-bt-TEST.CN-PreProd:
-- name: CD_ts-bt TEST
-- mzName: CD_ts-bt/management-zone/CDts-bt.name
-- mzId: CD_ts-bt/management-zone/CDts-bt.id
-- tag: ts-bt
-- env: TEST
-- skipDeployment: "false"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bt/dashboard/default.json b/BMW-Dynatrace-config/CD_ts-bt/dashboard/default.json
deleted file mode 100644
index 6c685810..00000000
--- a/BMW-Dynatrace-config/CD_ts-bt/dashboard/default.json
+++ /dev/null
@@ -1,308 +0,0 @@
-{
-  "metadata": {
-    "configurationVersions": [
-      3
-    ],
-    "clusterVersion": "1.214.107.20210407-223952"
-  },
-  "dashboardMetadata": {
-    "name": "{{.name}}",
-    "shared": true,
-    "owner": "Ignacio.Goldman@partner.bmwgroup.com",
-    "dashboardFilter": {
-      "timeframe": "-24h to now"
-    },
-    "tags": [
-      "{{.tag}}"
-    ]
-  },
-  "tiles": [
-    {
-      "name": "Custom chart",
-      "tileType": "CUSTOM_CHARTING",
-      "configured": true,
-      "bounds": {
-        "top": 228,
-        "left": 38,
-        "width": 1064,
-        "height": 304
-      },
-      "tileFilter": {},
-      "filterConfig": {
-        "type": "MIXED",
-        "customName": "Failure rate (HTTP 4xx/5xx  errors)",
-        "defaultName": "Custom chart",
-        "chartConfig": {
-          "legendShown": true,
-          "type": "TIMESERIES",
-          "series": [
-            {
-              "metric": "builtin:service.errors.fourxx.rate",
-              "aggregation": "AVG",
-              "type": "BAR",
-              "entityType": "SERVICE",
-              "dimensions": [],
-              "sortAscending": false,
-              "sortColumn": false,
-              "aggregationRate": "TOTAL"
-            },
-            {
-              "metric": "builtin:service.errors.fivexx.rate",
-              "aggregation": "AVG",
-              "type": "BAR",
-              "entityType": "SERVICE",
-              "dimensions": [],
-              "sortAscending": false,
-              "sortColumn": true,
-              "aggregationRate": "TOTAL"
-            }
-          ],
-          "resultMetadata": {
-            "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE": {
-              "lastModified": 1617956393463,
-              "customColor": "#ff0000"
-            },
-            "nullbuiltin:service.errors.fourxx.rate|AVG|TOTAL|BAR|SERVICE": {
-              "lastModified": 1617956441725,
-              "customColor": "#fff29a"
-            }
-          }
-        },
-        "filtersPerEntityType": {
-          "SERVICE": {
-            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
-            ]
-          }
-        }
-      }
-    },
-    {
-      "name": "Problems",
-      "tileType": "OPEN_PROBLEMS",
-      "configured": true,
-      "bounds": {
-        "top": 38,
-        "left": 950,
-        "width": 152,
-        "height": 152
-      },
-      "tileFilter": {
-        "managementZone": {
-          "id": "{{.mzId}}",
-          "name": "{{.mzName}}"
-        }
-      }
-    },
-    {
-      "name": "Overall Health",
-      "tileType": "HEADER",
-      "configured": true,
-      "bounds": {
-        "top": 0,
-        "left": 38,
-        "width": 1064,
-        "height": 38
-      },
-      "tileFilter": {}
-    },
-    {
-      "name": "Markdown",
-      "tileType": "MARKDOWN",
-      "configured": true,
-      "bounds": {
-        "top": 532,
-        "left": 38,
-        "width": 1064,
-        "height": 38
-      },
-      "tileFilter": {},
-      "markdown": "---\n"
-    },
-    {
-      "name": "Custom chart",
-      "tileType": "CUSTOM_CHARTING",
-      "configured": true,
-      "bounds": {
-        "top": 570,
-        "left": 38,
-        "width": 1064,
-        "height": 304
-      },
-      "tileFilter": {},
-      "filterConfig": {
-        "type": "MIXED",
-        "customName": "Response time, Request Count and Number of Errors",
-        "defaultName": "Custom chart",
-        "chartConfig": {
-          "legendShown": true,
-          "type": "TIMESERIES",
-          "series": [
-            {
-              "metric": "builtin:service.response.time",
-              "aggregation": "AVG",
-              "type": "LINE",
-              "entityType": "SERVICE",
-              "dimensions": [],
-              "sortAscending": false,
-              "sortColumn": false,
-              "aggregationRate": "TOTAL"
-            },
-            {
-              "metric": "builtin:service.requestCount.total",
-              "aggregation": "NONE",
-              "type": "BAR",
-              "entityType": "SERVICE",
-              "dimensions": [],
-              "sortAscending": false,
-              "sortColumn": false,
-              "aggregationRate": "TOTAL"
-            },
-            {
-              "metric": "builtin:service.errors.total.count",
-              "aggregation": "NONE",
-              "type": "BAR",
-              "entityType": "SERVICE",
-              "dimensions": [],
-              "sortAscending": false,
-              "sortColumn": true,
-              "aggregationRate": "TOTAL"
-            }
-          ],
-          "resultMetadata": {
-            "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE": {
-              "lastModified": 1595275720776,
-              "customColor": "#008cdb"
-            },
-            "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE": {
-              "lastModified": 1595275955999,
-              "customColor": "#ef651f"
-            },
-            "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE": {
-              "lastModified": 1595275686773,
-              "customColor": "#b4e5f9"
-            }
-          }
-        },
-        "filtersPerEntityType": {
-          "SERVICE": {
-            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
-            ]
-          }
-        }
-      }
-    },
-    {
-      "name": "Markdown",
-      "tileType": "MARKDOWN",
-      "configured": true,
-      "bounds": {
-        "top": 190,
-        "left": 38,
-        "width": 1064,
-        "height": 38
-      },
-      "tileFilter": {},
-      "markdown": "---\n"
-    },
-    {
-      "name": "",
-      "tileType": "DATABASES_OVERVIEW",
-      "configured": true,
-      "bounds": {
-        "top": 38,
-        "left": 646,
-        "width": 190,
-        "height": 152
-      },
-      "tileFilter": {},
-      "filterConfig": {
-        "type": "DATABASE",
-        "customName": "Databases",
-        "defaultName": "Databases",
-        "chartConfig": {
-          "legendShown": true,
-          "type": "TIMESERIES",
-          "series": [],
-          "resultMetadata": {}
-        },
-        "filtersPerEntityType": {
-          "DATABASE": {
-            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
-            ]
-          }
-        }
-      },
-      "chartVisible": true
-    },
-    {
-      "name": "",
-      "tileType": "SERVICES",
-      "configured": true,
-      "bounds": {
-        "top": 38,
-        "left": 342,
-        "width": 190,
-        "height": 152
-      },
-      "tileFilter": {},
-      "filterConfig": {
-        "type": "SERVICE",
-        "customName": "Services",
-        "defaultName": "Services",
-        "chartConfig": {
-          "legendShown": true,
-          "type": "TIMESERIES",
-          "series": [],
-          "resultMetadata": {}
-        },
-        "filtersPerEntityType": {
-          "SERVICE": {
-            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
-            ]
-          }
-        }
-      },
-      "chartVisible": true
-    },
-    {
-      "name": "",
-      "tileType": "HOSTS",
-      "configured": true,
-      "bounds": {
-        "top": 38,
-        "left": 38,
-        "width": 190,
-        "height": 152
-      },
-      "tileFilter": {},
-      "filterConfig": {
-        "type": "HOST",
-        "customName": "Hosts",
-        "defaultName": "Hosts",
-        "chartConfig": {
-          "legendShown": true,
-          "type": "TIMESERIES",
-          "series": [],
-          "resultMetadata": {}
-        },
-        "filtersPerEntityType": {
-          "HOST": {
-            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
-            ]
-          }
-        }
-      },
-      "chartVisible": true
-    }
-  ]
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bt/management-zone/README.md b/BMW-Dynatrace-config/CD_ts-bt/management-zone/README.md
deleted file mode 100644
index 3716858c..00000000
--- a/BMW-Dynatrace-config/CD_ts-bt/management-zone/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure management zones?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Management+Zones) page to configure your management zones.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bt/management-zone/default.json b/BMW-Dynatrace-config/CD_ts-bt/management-zone/default.json
deleted file mode 100644
index bffa0c3b..00000000
--- a/BMW-Dynatrace-config/CD_ts-bt/management-zone/default.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
- "dimensionalRules": [],
- "name": "{{.name}}",
- "rules": [
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "negate": false,
-      "operator": "EQUALS",
-      "type": "TAG",
-      "value": {
-       "context": "CONTEXTLESS",
-       "key": "Component",
-       "value": "{{.tag}}"
-      }
-     },
-     "key": {
-      "attribute": "SERVICE_TAGS"
-     }
-    }
-   ],
-   "enabled": true,
-   "propagationTypes": [
-    "SERVICE_TO_PROCESS_GROUP_LIKE",
-    "SERVICE_TO_HOST_LIKE"
-   ],
-   "type": "SERVICE"
-  },
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "negate": false,
-      "operator": "EQUALS",
-      "type": "TAG",
-      "value": {
-       "context": "CONTEXTLESS",
-       "key": "Component",
-       "value": "{{.tag}}"
-      }
-     },
-     "key": {
-      "attribute": "PROCESS_GROUP_TAGS"
-     }
-    }
-   ],
-   "enabled": true,
-   "propagationTypes": [
-    "PROCESS_GROUP_TO_HOST"
-   ],
-   "type": "PROCESS_GROUP"
-  },
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "negate": false,
-      "operator": "EQUALS",
-      "type": "TAG",
-      "value": {
-       "context": "CONTEXTLESS",
-       "key": "Component",
-       "value": "{{.tag}}"
-      }
-     },
-     "key": {
-      "attribute": "HOST_TAGS"
-     }
-    }
-   ],
-   "enabled": true,
-   "type": "HOST"
-  },
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "caseSensitive": true,
-      "negate": false,
-      "operator": "CONTAINS",
-      "type": "STRING",
-      "value": "{{.tag}}"
-     },
-     "key": {
-      "attribute": "CLOUD_APPLICATION_NAMESPACE_NAME"
-     }
-    }
-   ],
-   "enabled": true,
-   "propagationTypes": [],
-   "type": "CLOUD_APPLICATION_NAMESPACE"
-  },
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "caseSensitive": true,
-      "negate": false,
-      "operator": "CONTAINS",
-      "type": "STRING",
-      "value": "{{.tag}}"
-     },
-     "key": {
-      "attribute": "CLOUD_APPLICATION_NAME"
-     }
-    }
-   ],
-   "enabled": true,
-   "propagationTypes": [],
-   "type": "CLOUD_APPLICATION"
-  }
- ]
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bt/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_ts-bt/management-zone/management-zone.yaml
deleted file mode 100644
index 8b44874e..00000000
--- a/BMW-Dynatrace-config/CD_ts-bt/management-zone/management-zone.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-config:
-- CDts-bt: default.json
-
-CDts-bt:
-- name: CD_ts-bt
-- tag: ts-bt
diff --git a/BMW-Dynatrace-config/CD_ts-bti/dashboard/README.md b/BMW-Dynatrace-config/CD_ts-bti/dashboard/README.md
deleted file mode 100644
index f2f821ec..00000000
--- a/BMW-Dynatrace-config/CD_ts-bti/dashboard/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure dashboards?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Dashboards) page to configure your dashboards.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bti/dashboard/dashboard.yaml b/BMW-Dynatrace-config/CD_ts-bti/dashboard/dashboard.yaml
deleted file mode 100644
index 4653bf9f..00000000
--- a/BMW-Dynatrace-config/CD_ts-bti/dashboard/dashboard.yaml
+++ /dev/null
@@ -1,125 +0,0 @@
-config:
-- CDts-bti-PROD: default.json
-- CDts-bti-E2E: default.json
-- CDts-bti-INT: default.json
-- CDts-bti-TEST: default.json
-
-#PROD dashboards for EMEA/NA/CN Prod
-CDts-bti-PROD:
-- name: CD_ts-bti PROD
-- mzName: CD_ts-bti/management-zone/CDts-bti.name
-- mzId: CD_ts-bti/management-zone/CDts-bti.id
-- tag: ts-bti
-- env: PROD
-- skipDeployment: "true"
-CDts-bti-PROD.EMEA-Prod:
-- name: CD_ts-bti PROD
-- mzName: CD_ts-bti/management-zone/CDts-bti.name
-- mzId: CD_ts-bti/management-zone/CDts-bti.id
-- tag: ts-bti
-- env: PROD
-- skipDeployment: "false"
-CDts-bti-PROD.NA-Prod:
-- name: CD_ts-bti PROD
-- mzName: CD_ts-bti/management-zone/CDts-bti.name
-- mzId: CD_ts-bti/management-zone/CDts-bti.id
-- tag: ts-bti
-- env: PROD
-- skipDeployment: "false"
-CDts-bti-PROD.CN-Prod:
-- name: CD_ts-bti PROD
-- mzName: CD_ts-bti/management-zone/CDts-bti.name
-- mzId: CD_ts-bti/management-zone/CDts-bti.id
-- tag: ts-bti
-- env: PROD
-- skipDeployment: "false"
-
-#E2E dashboards for EMEA/NA/CN Prod
-CDts-bti-E2E:
-- name: CD_ts-bti E2E
-- mzName: CD_ts-bti/management-zone/CDts-bti.name
-- mzId: CD_ts-bti/management-zone/CDts-bti.id
-- tag: ts-bti
-- env: E2E
-- skipDeployment: "true"
-CDts-bti-E2E.EMEA-Prod:
-- name: CD_ts-bti E2E
-- mzName: CD_ts-bti/management-zone/CDts-bti.name
-- mzId: CD_ts-bti/management-zone/CDts-bti.id
-- tag: ts-bti
-- env: E2E
-- skipDeployment: "false"
-CDts-bti-E2E.NA-Prod:
-- name: CD_ts-bti E2E
-- mzName: CD_ts-bti/management-zone/CDts-bti.name
-- mzId: CD_ts-bti/management-zone/CDts-bti.id
-- tag: ts-bti
-- env: E2E
-- skipDeployment: "false"
-CDts-bti-E2E.CN-Prod:
-- name: CD_ts-bti E2E
-- mzName: CD_ts-bti/management-zone/CDts-bti.name
-- mzId: CD_ts-bti/management-zone/CDts-bti.id
-- tag: ts-bti
-- env: E2E
-- skipDeployment: "false"
-
-#INT dashboards for EMEA/NA/CN PreProd
-CDts-bti-INT:
-- name: CD_ts-bti INT
-- mzName: CD_ts-bti/management-zone/CDts-bti.name
-- mzId: CD_ts-bti/management-zone/CDts-bti.id
-- tag: ts-bti
-- env: INT
-- skipDeployment: "true"
-CDts-bti-INT.EMEA-PreProd:
-- name: CD_ts-bti INT
-- mzName: CD_ts-bti/management-zone/CDts-bti.name
-- mzId: CD_ts-bti/management-zone/CDts-bti.id
-- tag: ts-bti
-- env: INT
-- skipDeployment: "false"
-CDts-bti-INT.NA-PreProd:
-- name: CD_ts-bti INT
-- mzName: CD_ts-bti/management-zone/CDts-bti.name
-- mzId: CD_ts-bti/management-zone/CDts-bti.id
-- tag: ts-bti
-- env: INT
-- skipDeployment: "false"
-CDts-bti-INT.CN-PreProd:
-- name: CD_ts-bti INT
-- mzName: CD_ts-bti/management-zone/CDts-bti.name
-- mzId: CD_ts-bti/management-zone/CDts-bti.id
-- tag: ts-bti
-- env: INT
-- skipDeployment: "false"
-
-#TEST dashboards for EMEA/NA/CN PreProd
-CDts-bti-TEST:
-- name: CD_ts-bti TEST
-- mzName: CD_ts-bti/management-zone/CDts-bti.name
-- mzId: CD_ts-bti/management-zone/CDts-bti.id
-- tag: ts-bti
-- env: TEST
-- skipDeployment: "true"
-CDts-bti-TEST.EMEA-PreProd:
-- name: CD_ts-bti TEST
-- mzName: CD_ts-bti/management-zone/CDts-bti.name
-- mzId: CD_ts-bti/management-zone/CDts-bti.id
-- tag: ts-bti
-- env: TEST
-- skipDeployment: "false"
-CDts-bti-TEST.NA-PreProd:
-- name: CD_ts-bti TEST
-- mzName: CD_ts-bti/management-zone/CDts-bti.name
-- mzId: CD_ts-bti/management-zone/CDts-bti.id
-- tag: ts-bti
-- env: TEST
-- skipDeployment: "false"
-CDts-bti-TEST.CN-PreProd:
-- name: CD_ts-bti TEST
-- mzName: CD_ts-bti/management-zone/CDts-bti.name
-- mzId: CD_ts-bti/management-zone/CDts-bti.id
-- tag: ts-bti
-- env: TEST
-- skipDeployment: "false"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bti/dashboard/default.json b/BMW-Dynatrace-config/CD_ts-bti/dashboard/default.json
deleted file mode 100644
index 6c685810..00000000
--- a/BMW-Dynatrace-config/CD_ts-bti/dashboard/default.json
+++ /dev/null
@@ -1,308 +0,0 @@
-{
-  "metadata": {
-    "configurationVersions": [
-      3
-    ],
-    "clusterVersion": "1.214.107.20210407-223952"
-  },
-  "dashboardMetadata": {
-    "name": "{{.name}}",
-    "shared": true,
-    "owner": "Ignacio.Goldman@partner.bmwgroup.com",
-    "dashboardFilter": {
-      "timeframe": "-24h to now"
-    },
-    "tags": [
-      "{{.tag}}"
-    ]
-  },
-  "tiles": [
-    {
-      "name": "Custom chart",
-      "tileType": "CUSTOM_CHARTING",
-      "configured": true,
-      "bounds": {
-        "top": 228,
-        "left": 38,
-        "width": 1064,
-        "height": 304
-      },
-      "tileFilter": {},
-      "filterConfig": {
-        "type": "MIXED",
-        "customName": "Failure rate (HTTP 4xx/5xx  errors)",
-        "defaultName": "Custom chart",
-        "chartConfig": {
-          "legendShown": true,
-          "type": "TIMESERIES",
-          "series": [
-            {
-              "metric": "builtin:service.errors.fourxx.rate",
-              "aggregation": "AVG",
-              "type": "BAR",
-              "entityType": "SERVICE",
-              "dimensions": [],
-              "sortAscending": false,
-              "sortColumn": false,
-              "aggregationRate": "TOTAL"
-            },
-            {
-              "metric": "builtin:service.errors.fivexx.rate",
-              "aggregation": "AVG",
-              "type": "BAR",
-              "entityType": "SERVICE",
-              "dimensions": [],
-              "sortAscending": false,
-              "sortColumn": true,
-              "aggregationRate": "TOTAL"
-            }
-          ],
-          "resultMetadata": {
-            "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE": {
-              "lastModified": 1617956393463,
-              "customColor": "#ff0000"
-            },
-            "nullbuiltin:service.errors.fourxx.rate|AVG|TOTAL|BAR|SERVICE": {
-              "lastModified": 1617956441725,
-              "customColor": "#fff29a"
-            }
-          }
-        },
-        "filtersPerEntityType": {
-          "SERVICE": {
-            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
-            ]
-          }
-        }
-      }
-    },
-    {
-      "name": "Problems",
-      "tileType": "OPEN_PROBLEMS",
-      "configured": true,
-      "bounds": {
-        "top": 38,
-        "left": 950,
-        "width": 152,
-        "height": 152
-      },
-      "tileFilter": {
-        "managementZone": {
-          "id": "{{.mzId}}",
-          "name": "{{.mzName}}"
-        }
-      }
-    },
-    {
-      "name": "Overall Health",
-      "tileType": "HEADER",
-      "configured": true,
-      "bounds": {
-        "top": 0,
-        "left": 38,
-        "width": 1064,
-        "height": 38
-      },
-      "tileFilter": {}
-    },
-    {
-      "name": "Markdown",
-      "tileType": "MARKDOWN",
-      "configured": true,
-      "bounds": {
-        "top": 532,
-        "left": 38,
-        "width": 1064,
-        "height": 38
-      },
-      "tileFilter": {},
-      "markdown": "---\n"
-    },
-    {
-      "name": "Custom chart",
-      "tileType": "CUSTOM_CHARTING",
-      "configured": true,
-      "bounds": {
-        "top": 570,
-        "left": 38,
-        "width": 1064,
-        "height": 304
-      },
-      "tileFilter": {},
-      "filterConfig": {
-        "type": "MIXED",
-        "customName": "Response time, Request Count and Number of Errors",
-        "defaultName": "Custom chart",
-        "chartConfig": {
-          "legendShown": true,
-          "type": "TIMESERIES",
-          "series": [
-            {
-              "metric": "builtin:service.response.time",
-              "aggregation": "AVG",
-              "type": "LINE",
-              "entityType": "SERVICE",
-              "dimensions": [],
-              "sortAscending": false,
-              "sortColumn": false,
-              "aggregationRate": "TOTAL"
-            },
-            {
-              "metric": "builtin:service.requestCount.total",
-              "aggregation": "NONE",
-              "type": "BAR",
-              "entityType": "SERVICE",
-              "dimensions": [],
-              "sortAscending": false,
-              "sortColumn": false,
-              "aggregationRate": "TOTAL"
-            },
-            {
-              "metric": "builtin:service.errors.total.count",
-              "aggregation": "NONE",
-              "type": "BAR",
-              "entityType": "SERVICE",
-              "dimensions": [],
-              "sortAscending": false,
-              "sortColumn": true,
-              "aggregationRate": "TOTAL"
-            }
-          ],
-          "resultMetadata": {
-            "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE": {
-              "lastModified": 1595275720776,
-              "customColor": "#008cdb"
-            },
-            "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE": {
-              "lastModified": 1595275955999,
-              "customColor": "#ef651f"
-            },
-            "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE": {
-              "lastModified": 1595275686773,
-              "customColor": "#b4e5f9"
-            }
-          }
-        },
-        "filtersPerEntityType": {
-          "SERVICE": {
-            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
-            ]
-          }
-        }
-      }
-    },
-    {
-      "name": "Markdown",
-      "tileType": "MARKDOWN",
-      "configured": true,
-      "bounds": {
-        "top": 190,
-        "left": 38,
-        "width": 1064,
-        "height": 38
-      },
-      "tileFilter": {},
-      "markdown": "---\n"
-    },
-    {
-      "name": "",
-      "tileType": "DATABASES_OVERVIEW",
-      "configured": true,
-      "bounds": {
-        "top": 38,
-        "left": 646,
-        "width": 190,
-        "height": 152
-      },
-      "tileFilter": {},
-      "filterConfig": {
-        "type": "DATABASE",
-        "customName": "Databases",
-        "defaultName": "Databases",
-        "chartConfig": {
-          "legendShown": true,
-          "type": "TIMESERIES",
-          "series": [],
-          "resultMetadata": {}
-        },
-        "filtersPerEntityType": {
-          "DATABASE": {
-            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
-            ]
-          }
-        }
-      },
-      "chartVisible": true
-    },
-    {
-      "name": "",
-      "tileType": "SERVICES",
-      "configured": true,
-      "bounds": {
-        "top": 38,
-        "left": 342,
-        "width": 190,
-        "height": 152
-      },
-      "tileFilter": {},
-      "filterConfig": {
-        "type": "SERVICE",
-        "customName": "Services",
-        "defaultName": "Services",
-        "chartConfig": {
-          "legendShown": true,
-          "type": "TIMESERIES",
-          "series": [],
-          "resultMetadata": {}
-        },
-        "filtersPerEntityType": {
-          "SERVICE": {
-            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
-            ]
-          }
-        }
-      },
-      "chartVisible": true
-    },
-    {
-      "name": "",
-      "tileType": "HOSTS",
-      "configured": true,
-      "bounds": {
-        "top": 38,
-        "left": 38,
-        "width": 190,
-        "height": 152
-      },
-      "tileFilter": {},
-      "filterConfig": {
-        "type": "HOST",
-        "customName": "Hosts",
-        "defaultName": "Hosts",
-        "chartConfig": {
-          "legendShown": true,
-          "type": "TIMESERIES",
-          "series": [],
-          "resultMetadata": {}
-        },
-        "filtersPerEntityType": {
-          "HOST": {
-            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
-            ]
-          }
-        }
-      },
-      "chartVisible": true
-    }
-  ]
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bti/management-zone/README.md b/BMW-Dynatrace-config/CD_ts-bti/management-zone/README.md
deleted file mode 100644
index 3716858c..00000000
--- a/BMW-Dynatrace-config/CD_ts-bti/management-zone/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure management zones?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Management+Zones) page to configure your management zones.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bti/management-zone/default.json b/BMW-Dynatrace-config/CD_ts-bti/management-zone/default.json
deleted file mode 100644
index bffa0c3b..00000000
--- a/BMW-Dynatrace-config/CD_ts-bti/management-zone/default.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
- "dimensionalRules": [],
- "name": "{{.name}}",
- "rules": [
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "negate": false,
-      "operator": "EQUALS",
-      "type": "TAG",
-      "value": {
-       "context": "CONTEXTLESS",
-       "key": "Component",
-       "value": "{{.tag}}"
-      }
-     },
-     "key": {
-      "attribute": "SERVICE_TAGS"
-     }
-    }
-   ],
-   "enabled": true,
-   "propagationTypes": [
-    "SERVICE_TO_PROCESS_GROUP_LIKE",
-    "SERVICE_TO_HOST_LIKE"
-   ],
-   "type": "SERVICE"
-  },
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "negate": false,
-      "operator": "EQUALS",
-      "type": "TAG",
-      "value": {
-       "context": "CONTEXTLESS",
-       "key": "Component",
-       "value": "{{.tag}}"
-      }
-     },
-     "key": {
-      "attribute": "PROCESS_GROUP_TAGS"
-     }
-    }
-   ],
-   "enabled": true,
-   "propagationTypes": [
-    "PROCESS_GROUP_TO_HOST"
-   ],
-   "type": "PROCESS_GROUP"
-  },
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "negate": false,
-      "operator": "EQUALS",
-      "type": "TAG",
-      "value": {
-       "context": "CONTEXTLESS",
-       "key": "Component",
-       "value": "{{.tag}}"
-      }
-     },
-     "key": {
-      "attribute": "HOST_TAGS"
-     }
-    }
-   ],
-   "enabled": true,
-   "type": "HOST"
-  },
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "caseSensitive": true,
-      "negate": false,
-      "operator": "CONTAINS",
-      "type": "STRING",
-      "value": "{{.tag}}"
-     },
-     "key": {
-      "attribute": "CLOUD_APPLICATION_NAMESPACE_NAME"
-     }
-    }
-   ],
-   "enabled": true,
-   "propagationTypes": [],
-   "type": "CLOUD_APPLICATION_NAMESPACE"
-  },
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "caseSensitive": true,
-      "negate": false,
-      "operator": "CONTAINS",
-      "type": "STRING",
-      "value": "{{.tag}}"
-     },
-     "key": {
-      "attribute": "CLOUD_APPLICATION_NAME"
-     }
-    }
-   ],
-   "enabled": true,
-   "propagationTypes": [],
-   "type": "CLOUD_APPLICATION"
-  }
- ]
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-bti/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_ts-bti/management-zone/management-zone.yaml
deleted file mode 100644
index 88cd17de..00000000
--- a/BMW-Dynatrace-config/CD_ts-bti/management-zone/management-zone.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-config:
-- CDts-bti: default.json
-
-CDts-bti:
-- name: CD_ts-bti
-- tag: ts-bti
diff --git a/BMW-Dynatrace-config/CD_ts-tsp/dashboard/README.md b/BMW-Dynatrace-config/CD_ts-tsp/dashboard/README.md
deleted file mode 100644
index f2f821ec..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsp/dashboard/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure dashboards?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Dashboards) page to configure your dashboards.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsp/dashboard/dashboard.yaml b/BMW-Dynatrace-config/CD_ts-tsp/dashboard/dashboard.yaml
deleted file mode 100644
index 4d6561bf..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsp/dashboard/dashboard.yaml
+++ /dev/null
@@ -1,125 +0,0 @@
-config:
-- CDts-tsp-PROD: default.json
-- CDts-tsp-E2E: default.json
-- CDts-tsp-INT: default.json
-- CDts-tsp-TEST: default.json
-
-#PROD dashboards for EMEA/NA/CN Prod
-CDts-tsp-PROD:
-- name: CD_ts-tsp PROD
-- mzName: CD_ts-tsp/management-zone/CDts-tsp.name
-- mzId: CD_ts-tsp/management-zone/CDts-tsp.id
-- tag: ts-tsp
-- env: PROD
-- skipDeployment: "true"
-CDts-tsp-PROD.EMEA-Prod:
-- name: CD_ts-tsp PROD
-- mzName: CD_ts-tsp/management-zone/CDts-tsp.name
-- mzId: CD_ts-tsp/management-zone/CDts-tsp.id
-- tag: ts-tsp
-- env: PROD
-- skipDeployment: "false"
-CDts-tsp-PROD.NA-Prod:
-- name: CD_ts-tsp PROD
-- mzName: CD_ts-tsp/management-zone/CDts-tsp.name
-- mzId: CD_ts-tsp/management-zone/CDts-tsp.id
-- tag: ts-tsp
-- env: PROD
-- skipDeployment: "false"
-CDts-tsp-PROD.CN-Prod:
-- name: CD_ts-tsp PROD
-- mzName: CD_ts-tsp/management-zone/CDts-tsp.name
-- mzId: CD_ts-tsp/management-zone/CDts-tsp.id
-- tag: ts-tsp
-- env: PROD
-- skipDeployment: "false"
-
-#E2E dashboards for EMEA/NA/CN Prod
-CDts-tsp-E2E:
-- name: CD_ts-tsp E2E
-- mzName: CD_ts-tsp/management-zone/CDts-tsp.name
-- mzId: CD_ts-tsp/management-zone/CDts-tsp.id
-- tag: ts-tsp
-- env: E2E
-- skipDeployment: "true"
-CDts-tsp-E2E.EMEA-Prod:
-- name: CD_ts-tsp E2E
-- mzName: CD_ts-tsp/management-zone/CDts-tsp.name
-- mzId: CD_ts-tsp/management-zone/CDts-tsp.id
-- tag: ts-tsp
-- env: E2E
-- skipDeployment: "false"
-CDts-tsp-E2E.NA-Prod:
-- name: CD_ts-tsp E2E
-- mzName: CD_ts-tsp/management-zone/CDts-tsp.name
-- mzId: CD_ts-tsp/management-zone/CDts-tsp.id
-- tag: ts-tsp
-- env: E2E
-- skipDeployment: "false"
-CDts-tsp-E2E.CN-Prod:
-- name: CD_ts-tsp E2E
-- mzName: CD_ts-tsp/management-zone/CDts-tsp.name
-- mzId: CD_ts-tsp/management-zone/CDts-tsp.id
-- tag: ts-tsp
-- env: E2E
-- skipDeployment: "false"
-
-#INT dashboards for EMEA/NA/CN PreProd
-CDts-tsp-INT:
-- name: CD_ts-tsp INT
-- mzName: CD_ts-tsp/management-zone/CDts-tsp.name
-- mzId: CD_ts-tsp/management-zone/CDts-tsp.id
-- tag: ts-tsp
-- env: INT
-- skipDeployment: "true"
-CDts-tsp-INT.EMEA-PreProd:
-- name: CD_ts-tsp INT
-- mzName: CD_ts-tsp/management-zone/CDts-tsp.name
-- mzId: CD_ts-tsp/management-zone/CDts-tsp.id
-- tag: ts-tsp
-- env: INT
-- skipDeployment: "false"
-CDts-tsp-INT.NA-PreProd:
-- name: CD_ts-tsp INT
-- mzName: CD_ts-tsp/management-zone/CDts-tsp.name
-- mzId: CD_ts-tsp/management-zone/CDts-tsp.id
-- tag: ts-tsp
-- env: INT
-- skipDeployment: "false"
-CDts-tsp-INT.CN-PreProd:
-- name: CD_ts-tsp INT
-- mzName: CD_ts-tsp/management-zone/CDts-tsp.name
-- mzId: CD_ts-tsp/management-zone/CDts-tsp.id
-- tag: ts-tsp
-- env: INT
-- skipDeployment: "false"
-
-#TEST dashboards for EMEA/NA/CN PreProd
-CDts-tsp-TEST:
-- name: CD_ts-tsp TEST
-- mzName: CD_ts-tsp/management-zone/CDts-tsp.name
-- mzId: CD_ts-tsp/management-zone/CDts-tsp.id
-- tag: ts-tsp
-- env: TEST
-- skipDeployment: "true"
-CDts-tsp-TEST.EMEA-PreProd:
-- name: CD_ts-tsp TEST
-- mzName: CD_ts-tsp/management-zone/CDts-tsp.name
-- mzId: CD_ts-tsp/management-zone/CDts-tsp.id
-- tag: ts-tsp
-- env: TEST
-- skipDeployment: "false"
-CDts-tsp-TEST.NA-PreProd:
-- name: CD_ts-tsp TEST
-- mzName: CD_ts-tsp/management-zone/CDts-tsp.name
-- mzId: CD_ts-tsp/management-zone/CDts-tsp.id
-- tag: ts-tsp
-- env: TEST
-- skipDeployment: "false"
-CDts-tsp-TEST.CN-PreProd:
-- name: CD_ts-tsp TEST
-- mzName: CD_ts-tsp/management-zone/CDts-tsp.name
-- mzId: CD_ts-tsp/management-zone/CDts-tsp.id
-- tag: ts-tsp
-- env: TEST
-- skipDeployment: "false"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsp/dashboard/default.json b/BMW-Dynatrace-config/CD_ts-tsp/dashboard/default.json
deleted file mode 100644
index 6c685810..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsp/dashboard/default.json
+++ /dev/null
@@ -1,308 +0,0 @@
-{
-  "metadata": {
-    "configurationVersions": [
-      3
-    ],
-    "clusterVersion": "1.214.107.20210407-223952"
-  },
-  "dashboardMetadata": {
-    "name": "{{.name}}",
-    "shared": true,
-    "owner": "Ignacio.Goldman@partner.bmwgroup.com",
-    "dashboardFilter": {
-      "timeframe": "-24h to now"
-    },
-    "tags": [
-      "{{.tag}}"
-    ]
-  },
-  "tiles": [
-    {
-      "name": "Custom chart",
-      "tileType": "CUSTOM_CHARTING",
-      "configured": true,
-      "bounds": {
-        "top": 228,
-        "left": 38,
-        "width": 1064,
-        "height": 304
-      },
-      "tileFilter": {},
-      "filterConfig": {
-        "type": "MIXED",
-        "customName": "Failure rate (HTTP 4xx/5xx  errors)",
-        "defaultName": "Custom chart",
-        "chartConfig": {
-          "legendShown": true,
-          "type": "TIMESERIES",
-          "series": [
-            {
-              "metric": "builtin:service.errors.fourxx.rate",
-              "aggregation": "AVG",
-              "type": "BAR",
-              "entityType": "SERVICE",
-              "dimensions": [],
-              "sortAscending": false,
-              "sortColumn": false,
-              "aggregationRate": "TOTAL"
-            },
-            {
-              "metric": "builtin:service.errors.fivexx.rate",
-              "aggregation": "AVG",
-              "type": "BAR",
-              "entityType": "SERVICE",
-              "dimensions": [],
-              "sortAscending": false,
-              "sortColumn": true,
-              "aggregationRate": "TOTAL"
-            }
-          ],
-          "resultMetadata": {
-            "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE": {
-              "lastModified": 1617956393463,
-              "customColor": "#ff0000"
-            },
-            "nullbuiltin:service.errors.fourxx.rate|AVG|TOTAL|BAR|SERVICE": {
-              "lastModified": 1617956441725,
-              "customColor": "#fff29a"
-            }
-          }
-        },
-        "filtersPerEntityType": {
-          "SERVICE": {
-            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
-            ]
-          }
-        }
-      }
-    },
-    {
-      "name": "Problems",
-      "tileType": "OPEN_PROBLEMS",
-      "configured": true,
-      "bounds": {
-        "top": 38,
-        "left": 950,
-        "width": 152,
-        "height": 152
-      },
-      "tileFilter": {
-        "managementZone": {
-          "id": "{{.mzId}}",
-          "name": "{{.mzName}}"
-        }
-      }
-    },
-    {
-      "name": "Overall Health",
-      "tileType": "HEADER",
-      "configured": true,
-      "bounds": {
-        "top": 0,
-        "left": 38,
-        "width": 1064,
-        "height": 38
-      },
-      "tileFilter": {}
-    },
-    {
-      "name": "Markdown",
-      "tileType": "MARKDOWN",
-      "configured": true,
-      "bounds": {
-        "top": 532,
-        "left": 38,
-        "width": 1064,
-        "height": 38
-      },
-      "tileFilter": {},
-      "markdown": "---\n"
-    },
-    {
-      "name": "Custom chart",
-      "tileType": "CUSTOM_CHARTING",
-      "configured": true,
-      "bounds": {
-        "top": 570,
-        "left": 38,
-        "width": 1064,
-        "height": 304
-      },
-      "tileFilter": {},
-      "filterConfig": {
-        "type": "MIXED",
-        "customName": "Response time, Request Count and Number of Errors",
-        "defaultName": "Custom chart",
-        "chartConfig": {
-          "legendShown": true,
-          "type": "TIMESERIES",
-          "series": [
-            {
-              "metric": "builtin:service.response.time",
-              "aggregation": "AVG",
-              "type": "LINE",
-              "entityType": "SERVICE",
-              "dimensions": [],
-              "sortAscending": false,
-              "sortColumn": false,
-              "aggregationRate": "TOTAL"
-            },
-            {
-              "metric": "builtin:service.requestCount.total",
-              "aggregation": "NONE",
-              "type": "BAR",
-              "entityType": "SERVICE",
-              "dimensions": [],
-              "sortAscending": false,
-              "sortColumn": false,
-              "aggregationRate": "TOTAL"
-            },
-            {
-              "metric": "builtin:service.errors.total.count",
-              "aggregation": "NONE",
-              "type": "BAR",
-              "entityType": "SERVICE",
-              "dimensions": [],
-              "sortAscending": false,
-              "sortColumn": true,
-              "aggregationRate": "TOTAL"
-            }
-          ],
-          "resultMetadata": {
-            "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE": {
-              "lastModified": 1595275720776,
-              "customColor": "#008cdb"
-            },
-            "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE": {
-              "lastModified": 1595275955999,
-              "customColor": "#ef651f"
-            },
-            "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE": {
-              "lastModified": 1595275686773,
-              "customColor": "#b4e5f9"
-            }
-          }
-        },
-        "filtersPerEntityType": {
-          "SERVICE": {
-            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
-            ]
-          }
-        }
-      }
-    },
-    {
-      "name": "Markdown",
-      "tileType": "MARKDOWN",
-      "configured": true,
-      "bounds": {
-        "top": 190,
-        "left": 38,
-        "width": 1064,
-        "height": 38
-      },
-      "tileFilter": {},
-      "markdown": "---\n"
-    },
-    {
-      "name": "",
-      "tileType": "DATABASES_OVERVIEW",
-      "configured": true,
-      "bounds": {
-        "top": 38,
-        "left": 646,
-        "width": 190,
-        "height": 152
-      },
-      "tileFilter": {},
-      "filterConfig": {
-        "type": "DATABASE",
-        "customName": "Databases",
-        "defaultName": "Databases",
-        "chartConfig": {
-          "legendShown": true,
-          "type": "TIMESERIES",
-          "series": [],
-          "resultMetadata": {}
-        },
-        "filtersPerEntityType": {
-          "DATABASE": {
-            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
-            ]
-          }
-        }
-      },
-      "chartVisible": true
-    },
-    {
-      "name": "",
-      "tileType": "SERVICES",
-      "configured": true,
-      "bounds": {
-        "top": 38,
-        "left": 342,
-        "width": 190,
-        "height": 152
-      },
-      "tileFilter": {},
-      "filterConfig": {
-        "type": "SERVICE",
-        "customName": "Services",
-        "defaultName": "Services",
-        "chartConfig": {
-          "legendShown": true,
-          "type": "TIMESERIES",
-          "series": [],
-          "resultMetadata": {}
-        },
-        "filtersPerEntityType": {
-          "SERVICE": {
-            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
-            ]
-          }
-        }
-      },
-      "chartVisible": true
-    },
-    {
-      "name": "",
-      "tileType": "HOSTS",
-      "configured": true,
-      "bounds": {
-        "top": 38,
-        "left": 38,
-        "width": 190,
-        "height": 152
-      },
-      "tileFilter": {},
-      "filterConfig": {
-        "type": "HOST",
-        "customName": "Hosts",
-        "defaultName": "Hosts",
-        "chartConfig": {
-          "legendShown": true,
-          "type": "TIMESERIES",
-          "series": [],
-          "resultMetadata": {}
-        },
-        "filtersPerEntityType": {
-          "HOST": {
-            "AUTO_TAGS": [
-              "Environment:{{.env}}",
-              "Component:{{.tag}}"
-            ]
-          }
-        }
-      },
-      "chartVisible": true
-    }
-  ]
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsp/management-zone/README.md b/BMW-Dynatrace-config/CD_ts-tsp/management-zone/README.md
deleted file mode 100644
index 3716858c..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsp/management-zone/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-
-### How to configure management zones?
-
-Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Management+Zones) page to configure your management zones.
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsp/management-zone/default.json b/BMW-Dynatrace-config/CD_ts-tsp/management-zone/default.json
deleted file mode 100644
index bffa0c3b..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsp/management-zone/default.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
- "dimensionalRules": [],
- "name": "{{.name}}",
- "rules": [
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "negate": false,
-      "operator": "EQUALS",
-      "type": "TAG",
-      "value": {
-       "context": "CONTEXTLESS",
-       "key": "Component",
-       "value": "{{.tag}}"
-      }
-     },
-     "key": {
-      "attribute": "SERVICE_TAGS"
-     }
-    }
-   ],
-   "enabled": true,
-   "propagationTypes": [
-    "SERVICE_TO_PROCESS_GROUP_LIKE",
-    "SERVICE_TO_HOST_LIKE"
-   ],
-   "type": "SERVICE"
-  },
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "negate": false,
-      "operator": "EQUALS",
-      "type": "TAG",
-      "value": {
-       "context": "CONTEXTLESS",
-       "key": "Component",
-       "value": "{{.tag}}"
-      }
-     },
-     "key": {
-      "attribute": "PROCESS_GROUP_TAGS"
-     }
-    }
-   ],
-   "enabled": true,
-   "propagationTypes": [
-    "PROCESS_GROUP_TO_HOST"
-   ],
-   "type": "PROCESS_GROUP"
-  },
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "negate": false,
-      "operator": "EQUALS",
-      "type": "TAG",
-      "value": {
-       "context": "CONTEXTLESS",
-       "key": "Component",
-       "value": "{{.tag}}"
-      }
-     },
-     "key": {
-      "attribute": "HOST_TAGS"
-     }
-    }
-   ],
-   "enabled": true,
-   "type": "HOST"
-  },
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "caseSensitive": true,
-      "negate": false,
-      "operator": "CONTAINS",
-      "type": "STRING",
-      "value": "{{.tag}}"
-     },
-     "key": {
-      "attribute": "CLOUD_APPLICATION_NAMESPACE_NAME"
-     }
-    }
-   ],
-   "enabled": true,
-   "propagationTypes": [],
-   "type": "CLOUD_APPLICATION_NAMESPACE"
-  },
-  {
-   "conditions": [
-    {
-     "comparisonInfo": {
-      "caseSensitive": true,
-      "negate": false,
-      "operator": "CONTAINS",
-      "type": "STRING",
-      "value": "{{.tag}}"
-     },
-     "key": {
-      "attribute": "CLOUD_APPLICATION_NAME"
-     }
-    }
-   ],
-   "enabled": true,
-   "propagationTypes": [],
-   "type": "CLOUD_APPLICATION"
-  }
- ]
-}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_ts-tsp/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_ts-tsp/management-zone/management-zone.yaml
deleted file mode 100644
index 241eb5a8..00000000
--- a/BMW-Dynatrace-config/CD_ts-tsp/management-zone/management-zone.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-config:
-- CDts-tsp: default.json
-
-CDts-tsp:
-- name: CD_ts-tsp
-- tag: ts-tsp