diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000..13566b81
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/cd_e2e_monitoring_config.iml b/.idea/cd_e2e_monitoring_config.iml
new file mode 100644
index 00000000..d6ebd480
--- /dev/null
+++ b/.idea/cd_e2e_monitoring_config.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 00000000..919ce1f1
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,7 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <ScalaCodeStyleSettings>
+      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
+    </ScalaCodeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 00000000..a55e7a17
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..4c8da30b
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/cd_e2e_monitoring_config.iml" filepath="$PROJECT_DIR$/.idea/cd_e2e_monitoring_config.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 00000000..797acea5
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..35eb1ddf
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeCNE2E.json b/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeCNE2E.json
index b1b96a87..4c35194d 100644
--- a/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeCNE2E.json
+++ b/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeCNE2E.json
@@ -3,11 +3,11 @@
     "configurationVersions": [
       5
     ],
-    "clusterVersion": "1.224.79.20210830-074711"
+    "clusterVersion": "1.224.83.20210902-162137"
   },
   "dashboardMetadata": {
     "name": "CD_b2v-com-fe CN E2E",
-    "shared": false,
+    "shared": true,
     "owner": "sebastian.sedziejowski@partner.bmwgroup.com",
     "dashboardFilter": {
       "timeframe": "-24h to now"
@@ -319,4 +319,4 @@
       "markdown": "[Total requests per Application](https://dynatracemgd-cn.bmwgroup.net/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b/ui/diagnostictools/mda?gtf=-24h%20to%20now&gf=all&mdaId=cd2cb2d3-67da-4598-8bb4-7a48bc0ce3bc)\n\n[Average response time per application](https://dynatracemgd-cn.bmwgroup.net/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b/ui/diagnostictools/mda?gtf=-24h%20to%20now&gf=all&mdaId=c00d5c3e-3013-48f4-958d-2753cfdddd59)\n\n[Successful requests per application](https://dynatracemgd-cn.bmwgroup.net/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b/ui/diagnostictools/mda?gtf=-24h%20to%20now&gf=all&mdaId=9bef7be0-9924-4276-868f-06aa3004394c)\n\n[Failed requests per application](https://dynatracemgd-cn.bmwgroup.net/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b/ui/diagnostictools/mda?gtf=-24h%20to%20now&gf=all&mdaId=3803db02-b997-429a-9414-5ec70cf913de)"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeCNPROD.json b/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeCNPROD.json
index b81f31bc..5bb4787e 100644
--- a/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeCNPROD.json
+++ b/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeCNPROD.json
@@ -3,11 +3,11 @@
     "configurationVersions": [
       5
     ],
-    "clusterVersion": "1.224.79.20210830-074711"
+    "clusterVersion": "1.224.83.20210902-162137"
   },
   "dashboardMetadata": {
     "name": "CD_b2v-com-fe CN PROD",
-    "shared": false,
+    "shared": true,
     "owner": "sebastian.sedziejowski@partner.bmwgroup.com",
     "dashboardFilter": {
       "timeframe": "-24h to now"
diff --git a/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeEMEAE2E.json b/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeEMEAE2E.json
index f47b08ec..ae5ac068 100644
--- a/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeEMEAE2E.json
+++ b/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeEMEAE2E.json
@@ -3,11 +3,11 @@
     "configurationVersions": [
       5
     ],
-    "clusterVersion": "1.223.89.20210810-150941"
+    "clusterVersion": "1.225.109.20210907-135400"
   },
   "dashboardMetadata": {
     "name": "CD_b2v-com-fe EMEA E2E",
-    "shared": false,
+    "shared": true,
     "owner": "Sebastian.Sedziejowski@partner.bmwgroup.com",
     "dashboardFilter": {
       "timeframe": "-24h to now"
@@ -216,11 +216,11 @@
                 "nestedFilters": [],
                 "criteria": [
                   {
-                    "value": "Environment:E2E",
+                    "value": "b2v-com-fe",
                     "evaluator": "IN"
                   },
                   {
-                    "value": "b2v-com-fe",
+                    "value": "Environment:E2E",
                     "evaluator": "IN"
                   }
                 ]
@@ -245,11 +245,11 @@
                 "nestedFilters": [],
                 "criteria": [
                   {
-                    "value": "Environment:E2E",
+                    "value": "b2v-com-fe",
                     "evaluator": "IN"
                   },
                   {
-                    "value": "b2v-com-fe",
+                    "value": "Environment:E2E",
                     "evaluator": "IN"
                   }
                 ]
@@ -446,4 +446,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeEMEAPROD.json b/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeEMEAPROD.json
index c2e479b3..a9d072ad 100644
--- a/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeEMEAPROD.json
+++ b/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeEMEAPROD.json
@@ -3,17 +3,19 @@
     "configurationVersions": [
       5
     ],
-    "clusterVersion": "1.223.89.20210810-150941"
+    "clusterVersion": "1.225.109.20210907-135400"
   },
+  "id": "52ebed85-1d61-475f-aafc-9fe52dc5454b",
   "dashboardMetadata": {
-    "name": "CD_b2v-com-fe PROD",
-    "shared": false,
+    "name": "CD_b2v-com-fe EMEA PROD",
+    "shared": true,
     "owner": "Sebastian.Sedziejowski@partner.bmwgroup.com",
     "dashboardFilter": {
       "timeframe": "-24h to now"
     },
     "tags": [
       "PROD",
+      "EMEA",
       "b2v-com-fe"
     ]
   },
@@ -97,8 +99,8 @@
         "filtersPerEntityType": {
           "DATABASE": {
             "AUTO_TAGS": [
-              "Environment:{{.tag}}",
-              "Component:{{.env}}"
+              "Component:b2v-com-fe",
+              "Environment:PROD"
             ]
           }
         }
@@ -203,11 +205,11 @@
                 "nestedFilters": [],
                 "criteria": [
                   {
-                    "value": "Environment:PROD",
+                    "value": "Component:b2v-com-fe",
                     "evaluator": "IN"
                   },
                   {
-                    "value": "Component:b2v-com-fe",
+                    "value": "Environment:PROD",
                     "evaluator": "IN"
                   }
                 ]
@@ -346,11 +348,11 @@
                 "nestedFilters": [],
                 "criteria": [
                   {
-                    "value": "Environment:PROD",
+                    "value": "Component:b2v-com-fe",
                     "evaluator": "IN"
                   },
                   {
-                    "value": "Component:b2v-com-fe",
+                    "value": "Environment:PROD",
                     "evaluator": "IN"
                   }
                 ]
@@ -375,11 +377,11 @@
                 "nestedFilters": [],
                 "criteria": [
                   {
-                    "value": "Environment:PROD",
+                    "value": "Component:b2v-com-fe",
                     "evaluator": "IN"
                   },
                   {
-                    "value": "Component:b2v-com-fe",
+                    "value": "Environment:PROD",
                     "evaluator": "IN"
                   }
                 ]
@@ -471,4 +473,4 @@
       "markdown": "[Total requests per Application](https://xxu26128.live.dynatrace.com/ui/diagnostictools/mda?gtf=-24h%20to%20now&gf=-5651984742855815750&mdaId=476e06cc-d784-4cd9-9afb-09751df4ef31)\n\n[Average response time per application](https://xxu26128.live.dynatrace.com/ui/diagnostictools/mda?gtf=-24h%20to%20now&gf=-5651984742855815750&mdaId=309c5639-0689-4805-8573-53357b2e56d0)\n\n[Sucessful requests per application](https://xxu26128.live.dynatrace.com/ui/diagnostictools/mda?gtf=-24h%20to%20now&gf=-5651984742855815750&mdaId=79cc0b20-532e-4a4f-81b6-ca4979984113)\n\n[Failed requests per application](https://xxu26128.live.dynatrace.com/ui/diagnostictools/mda?gtf=-24h%20to%20now&gf=-5651984742855815750&mdaId=e3ca5c36-dd56-4ce9-8ee7-aea98668f26e)"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeUSE2E.json b/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeUSE2E.json
index 672eb730..5fea5940 100644
--- a/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeUSE2E.json
+++ b/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeUSE2E.json
@@ -3,11 +3,11 @@
     "configurationVersions": [
       5
     ],
-    "clusterVersion": "1.223.89.20210810-150941"
+    "clusterVersion": "1.225.109.20210907-135400"
   },
   "dashboardMetadata": {
     "name": "CD_b2v-com-fe US E2E",
-    "shared": false,
+    "shared": true,
     "owner": "Sebastian.Sedziejowski@partner.bmwgroup.com",
     "dashboardFilter": {
       "timeframe": "-24h to now"
@@ -28,7 +28,12 @@
         "width": 152,
         "height": 152
       },
-      "tileFilter": {}
+      "tileFilter": {
+        "managementZone": {
+          "id": "5354690048511482357",
+          "name": "CD_b2v-com-fe"
+        }
+      }
     },
     {
       "name": "Overall Health",
@@ -206,11 +211,11 @@
                 "nestedFilters": [],
                 "criteria": [
                   {
-                    "value": "b2v-com-fe",
+                    "value": "Environment:E2E",
                     "evaluator": "IN"
                   },
                   {
-                    "value": "Environment:E2E",
+                    "value": "b2v-com-fe",
                     "evaluator": "IN"
                   }
                 ]
diff --git a/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeUSPROD.json b/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeUSPROD.json
index 2c38341f..ed564499 100644
--- a/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeUSPROD.json
+++ b/BMW-Dynatrace-config/CD_b2v-com-fe/dashboard/CDb2vcomfeUSPROD.json
@@ -3,11 +3,11 @@
     "configurationVersions": [
       5
     ],
-    "clusterVersion": "1.223.89.20210810-150941"
+    "clusterVersion": "1.225.109.20210907-135400"
   },
   "dashboardMetadata": {
     "name": "CD_b2v-com-fe US PROD",
-    "shared": false,
+    "shared": true,
     "owner": "Sebastian.Sedziejowski@partner.bmwgroup.com",
     "dashboardFilter": {
       "timeframe": "-24h to now"
@@ -319,4 +319,4 @@
       "markdown": "[Total requests per Application](https://wgv50241.live.dynatrace.com/ui/diagnostictools/mda?gtf=-24h%20to%20now&gf=all&mdaId=8eb4ad67-1e2a-49dd-9620-df30cda86de9)\n\n[Average response time per application](https://wgv50241.live.dynatrace.com/ui/diagnostictools/mda?gtf=-24h%20to%20now&gf=all&mdaId=d1e6c8e0-3e8b-4c78-8e54-a95c003f31ec)\n\n[Successful requests per application](https://wgv50241.live.dynatrace.com/ui/diagnostictools/mda?gtf=-24h%20to%20now&gf=all&mdaId=8664eb57-f9ff-45e7-8792-abeff873ff83)\n\n[Failed requests per application](https://wgv50241.live.dynatrace.com/ui/diagnostictools/mda?gtf=-24h%20to%20now&gf=all&mdaId=69ae43ca-0f7b-4ed3-90f8-5e8125fd4849)"
     }
   ]
-}
+}
\ No newline at end of file