diff --git a/BMW-Dynatrace-config/00_Global-Config/auto-tag/Component.json b/BMW-Dynatrace-config/00_Global-Config/auto-tag/Component.json
index 092f80a2..0ea5c686 100644
--- a/BMW-Dynatrace-config/00_Global-Config/auto-tag/Component.json
+++ b/BMW-Dynatrace-config/00_Global-Config/auto-tag/Component.json
@@ -4151,7 +4151,11 @@
    {
     "type": "SERVICE",
     "enabled": true,
+<<<<<<< HEAD
+    "valueFormat": "rsu",
+=======
     "valueFormat": "ASBC-HAL-CL",
+>>>>>>> 66042505f351ff2f91db06a9972f047047e2105c
     "propagationTypes": [],
     "conditions": [
      {
@@ -4171,8 +4175,13 @@
       },
       "comparisonInfo": {
        "type": "STRING",
+<<<<<<< HEAD
+       "operator": "CONTAINS_REGEX",
+       "value": "^(?>cam|disp|fre|rcs|rdh|rmo|rpp|rte|rve|rvi|rvt|rwd|uvm)(?>eu|us|cn)(?>e2e|p)$",
+=======
        "operator": "CONTAINS",
        "value": "asbchal",
+>>>>>>> 66042505f351ff2f91db06a9972f047047e2105c
        "negate": false,
        "caseSensitive": true
       }
diff --git a/BMW-Dynatrace-config/00_Global-Config/auto-tag/Environment.json b/BMW-Dynatrace-config/00_Global-Config/auto-tag/Environment.json
index 7ff9fdc7..92dc3a22 100644
--- a/BMW-Dynatrace-config/00_Global-Config/auto-tag/Environment.json
+++ b/BMW-Dynatrace-config/00_Global-Config/auto-tag/Environment.json
@@ -1126,6 +1126,42 @@
    ],
    "type": "PROCESS_GROUP",
    "valueFormat": "E2E"
+  },
+  {
+   "conditions": [
+    {
+     "comparisonInfo": {
+      "negate": false,
+      "operator": "EQUALS",
+      "type": "SERVICE_TYPE",
+      "value": "DATABASE_SERVICE"
+     },
+     "key": {
+      "attribute": "SERVICE_TYPE",
+      "type": "STATIC"
+     }
+    },
+    {
+     "comparisonInfo": {
+      "caseSensitive": false,
+      "negate": false,
+      "operator": "CONTAINS_REGEX",
+      "type": "STRING",
+      "value": "(?>eu|us|cn)p$"
+     },
+     "key": {
+      "attribute": "SERVICE_DATABASE_NAME",
+      "type": "STATIC"
+     }
+    }
+   ],
+   "enabled": true,
+   "propagationTypes": [
+    "SERVICE_TO_PROCESS_GROUP_LIKE",
+    "SERVICE_TO_HOST_LIKE"
+   ],
+   "type": "SERVICE",
+   "valueFormat": "PROD"
   }
  ]
 }
\ No newline at end of file