diff --git a/BMW-Dynatrace-config/CD_APIGW/alerting-profile/default.json b/BMW-Dynatrace-config/CD_APIGW/alerting-profile/default.json
index bb81115c..681a4c64 100644
--- a/BMW-Dynatrace-config/CD_APIGW/alerting-profile/default.json
+++ b/BMW-Dynatrace-config/CD_APIGW/alerting-profile/default.json
@@ -10,6 +10,11 @@
    "tagFilter": {
     "includeMode": "INCLUDE_ALL",
     "tagFilters": [
+     {
+      "context": "CONTEXTLESS",
+      "key": "Component",
+      "value": "{{.tag}}"
+     },
 	 {
       "context": "CONTEXTLESS",
       "key": "Environment",
@@ -24,6 +29,11 @@
    "tagFilter": {
     "includeMode": "INCLUDE_ALL",
     "tagFilters": [
+     {
+      "context": "CONTEXTLESS",
+      "key": "Component",
+      "value": "{{.tag}}"
+     },
 	 {
       "context": "CONTEXTLESS",
       "key": "Environment",
@@ -38,6 +48,11 @@
    "tagFilter": {
     "includeMode": "INCLUDE_ALL",
     "tagFilters": [
+     {
+      "context": "CONTEXTLESS",
+      "key": "Component",
+      "value": "{{.tag}}"
+     },
 	 {
       "context": "CONTEXTLESS",
       "key": "Environment",
@@ -52,6 +67,11 @@
    "tagFilter": {
     "includeMode": "INCLUDE_ALL",
     "tagFilters": [
+     {
+      "context": "CONTEXTLESS",
+      "key": "Component",
+      "value": "{{.tag}}"
+     },
 	 {
       "context": "CONTEXTLESS",
       "key": "Environment",
@@ -66,6 +86,11 @@
    "tagFilter": {
     "includeMode": "INCLUDE_ALL",
     "tagFilters": [
+     {
+      "context": "CONTEXTLESS",
+      "key": "Component",
+      "value": "{{.tag}}"
+     },
 	 {
       "context": "CONTEXTLESS",
       "key": "Environment",