diff --git a/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/calculated-metrics-service.yaml b/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/calculated-metrics-service.yaml
index c07d0048..d1a57bab 100644
--- a/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/calculated-metrics-service.yaml
+++ b/BMW-Dynatrace-config/CD_comfy/calculated-metrics-service/calculated-metrics-service.yaml
@@ -1,859 +1,63 @@
 config:
-- Comfy_ActionDuration_TEST: metric-request-attribute-2-attributes.json
-- Comfy_ActionDuration_INT: metric-request-attribute-2-attributes.json
-- Comfy_ActionDuration_E2E: metric-request-attribute-2-attributes.json
-- Comfy_ActionDuration_PROD: metric-request-attribute-2-attributes.json
-- Comfy_AgentIdConsume_TEST: metric-request-count.json
-- Comfy_AgentIdConsume_INT: metric-request-count.json
-- Comfy_AgentIdConsume_E2E: metric-request-count.json
-- Comfy_AgentIdConsume_PROD: metric-request-count.json
-- Comfy_AgentIdPublish_TEST: metric-request-count.json
-- Comfy_AgentIdPublish_INT: metric-request-count.json
-- Comfy_AgentIdPublish_E2E: metric-request-count.json
-- Comfy_AgentIdPublish_PROD: metric-request-count.json
-- Comfy_CompletedCampaigns_TEST: metric-request-attribute-no-split.json
-- Comfy_CompletedCampaigns_INT: metric-request-attribute-no-split.json
-- Comfy_CompletedCampaigns_E2E: metric-request-attribute-no-split.json
-- Comfy_CompletedCampaigns_PROD: metric-request-attribute-no-split.json
-- Comfy_RunningCampaigns_TEST: metric-request-attribute-no-split.json
-- Comfy_RunningCampaigns_INT: metric-request-attribute-no-split.json
-- Comfy_RunningCampaigns_E2E: metric-request-attribute-no-split.json
-- Comfy_RunningCampaigns_PROD: metric-request-attribute-no-split.json
-- Comfy_VehicleActionStatus_TEST: metric-request-count.json
-- Comfy_VehicleActionStatus_INT: metric-request-count.json
-- Comfy_VehicleActionStatus_E2E: metric-request-count.json
-- Comfy_VehicleActionStatus_PROD: metric-request-count.json
-- Comfy_VehicleActionStatus_AgentId_TEST: metric-request-count-2-attributes.json
-- Comfy_VehicleActionStatus_AgentId_INT: metric-request-count-2-attributes.json
-- Comfy_VehicleActionStatus_AgentId_E2E: metric-request-count-2-attributes.json
-- Comfy_VehicleActionStatus_AgentId_PROD: metric-request-count-2-attributes.json
+  - Comfy_ActionDuration: metric-request-attribute-2-attributes.json
+  - Comfy_AgentIdConsume: metric-request-count.json
+  - Comfy_AgentIdPublish: metric-request-count.json
+  - Comfy_CompletedCampaigns: metric-request-attribute-no-split.json
+  - Comfy_RunningCampaigns: metric-request-attribute-no-split.json
+  - Comfy_VehicleActionStatus: metric-request-count.json
+  - Comfy_VehicleActionStatus_AgentId: metric-request-count-2-attributes.json
 
-# Comfy_ActionDuration
-Comfy_ActionDuration_TEST:
-  - name: Comfy_ActionDuration_TEST
-  - metricKey: calc:service.comfy_actionduration_test
-  - env: TEST
+Comfy_ActionDuration:
+  - name: Comfy_ActionDuration
+  - metricKey: calc:service.comfy_actionduration
   - unit: SECOND
   - requestAttribute: Comfy_ActionDuration
   - requestAttribute2: Comfy_AgentIdConsume
   - msId: comfy-orchestration
   - dimension: {RequestAttribute:Comfy_AgentIdConsume}
   - dimensionName: Agent
-  - skipDeployment: "true"
-Comfy_ActionDuration_TEST.EMEA-PreProd:
-  - name: Comfy_ActionDuration_TEST
-  - metricKey: calc:service.comfy_actionduration_test
-  - env: TEST
-  - unit: SECOND
-  - requestAttribute: Comfy_ActionDuration
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_ActionDuration_INT:
-  - name: Comfy_ActionDuration_INT
-  - metricKey: calc:service.comfy_actionduration_int
-  - env: INT
-  - unit: SECOND
-  - requestAttribute: Comfy_ActionDuration
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "true"
-Comfy_ActionDuration_INT.EMEA-PreProd:
-  - name: Comfy_ActionDuration_INT
-  - metricKey: calc:service.comfy_actionduration_int
-  - env: INT
-  - unit: SECOND
-  - requestAttribute: Comfy_ActionDuration
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_ActionDuration_E2E:
-  - name: Comfy_ActionDuration_E2E
-  - metricKey: calc:service.comfy_actionduration_e2e
-  - env: E2E
-  - unit: SECOND
-  - requestAttribute: Comfy_ActionDuration
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "true"
-Comfy_ActionDuration_E2E.EMEA-Prod:
-  - name: Comfy_ActionDuration_E2E
-  - metricKey: calc:service.comfy_actionduration_e2e
-  - env: E2E
-  - unit: SECOND
-  - requestAttribute: Comfy_ActionDuration
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_ActionDuration_E2E.NA-Prod:
-  - name: Comfy_ActionDuration_E2E
-  - metricKey: calc:service.comfy_actionduration_e2e
-  - env: E2E
-  - unit: SECOND
-  - requestAttribute: Comfy_ActionDuration
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_ActionDuration_E2E.CN-Prod:
-  - name: Comfy_ActionDuration_E2E
-  - metricKey: calc:service.comfy_actionduration_e2e
-  - env: E2E
-  - unit: SECOND
-  - requestAttribute: Comfy_ActionDuration
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_ActionDuration_PROD:
-  - name: Comfy_ActionDuration_PROD
-  - metricKey: calc:service.comfy_actionduration_prod
-  - env: PROD
-  - unit: SECOND
-  - requestAttribute: Comfy_ActionDuration
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "true"
-Comfy_ActionDuration_PROD.EMEA-Prod:
-  - name: Comfy_ActionDuration_PROD
-  - metricKey: calc:service.comfy_actionduration_prod
-  - env: PROD
-  - unit: SECOND
-  - requestAttribute: Comfy_ActionDuration
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_ActionDuration_PROD.NAEMEA-Prod:
-  - name: Comfy_ActionDuration_PROD
-  - metricKey: calc:service.comfy_actionduration_prod
-  - env: PROD
-  - unit: SECOND
-  - requestAttribute: Comfy_ActionDuration
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_ActionDuration_PROD.CN-Prod:
-  - name: Comfy_ActionDuration_PROD
-  - metricKey: calc:service.comfy_actionduration_prod
-  - env: PROD
-  - unit: SECOND
-  - requestAttribute: Comfy_ActionDuration
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-
-# Comfy_AgentIdConsume
-Comfy_AgentIdConsume_TEST:
-  - name: Comfy_AgentIdConsume_TEST
-  - metricKey: calc:service.comfy_agentidconsume_test
-  - env: TEST
+Comfy_AgentIdConsume:
+  - name: Comfy_AgentIdConsume
+  - metricKey: calc:service.comfy_agentidconsume
   - unit: COUNT
   - requestAttribute: Comfy_AgentIdConsume
   - msId: comfy-orchestration
   - dimension: {RequestAttribute:Comfy_AgentIdConsume}
   - dimensionName: Agent
-  - skipDeployment: "true"
-Comfy_AgentIdConsume_TEST.EMEA-PreProd:
-  - name: Comfy_AgentIdConsume_TEST
-  - metricKey: calc:service.comfy_agentidconsume_test
-  - env: TEST
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_AgentIdConsume_INT:
-  - name: Comfy_AgentIdConsume_INT
-  - metricKey: calc:service.comfy_agentidconsume_int
-  - env: INT
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "true"
-Comfy_AgentIdConsume_INT.EMEA-PreProd:
-  - name: Comfy_AgentIdConsume_INT
-  - metricKey: calc:service.comfy_agentidconsume_int
-  - env: INT
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_AgentIdConsume_E2E:
-  - name: Comfy_AgentIdConsume_E2E
-  - metricKey: calc:service.comfy_agentidconsume_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "true"
-Comfy_AgentIdConsume_E2E.EMEA-Prod:
-  - name: Comfy_AgentIdConsume_E2E
-  - metricKey: calc:service.comfy_agentidconsume_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_AgentIdConsume_E2E.NA-Prod:
-  - name: Comfy_AgentIdConsume_E2E
-  - metricKey: calc:service.comfy_agentidconsume_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_AgentIdConsume_E2E.CN-Prod:
-  - name: Comfy_AgentIdConsume_E2E
-  - metricKey: calc:service.comfy_agentidconsume_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_AgentIdConsume_PROD:
-  - name: Comfy_AgentIdConsume_PROD
-  - metricKey: calc:service.comfy_agentidconsume_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "true"
-Comfy_AgentIdConsume_PROD.EMEA-Prod:
-  - name: Comfy_AgentIdConsume_PROD
-  - metricKey: calc:service.comfy_agentidconsume_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_AgentIdConsume_PROD.NA-Prod:
-  - name: Comfy_AgentIdConsume_PROD
-  - metricKey: calc:service.comfy_agentidconsume_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_AgentIdConsume_PROD.CN-Prod:
-  - name: Comfy_AgentIdConsume_PROD
-  - metricKey: calc:service.comfy_agentidconsume_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-
-# Comfy_AgentIdPublish
-Comfy_AgentIdPublish_TEST:
-  - name: Comfy_AgentIdPublish_TEST
-  - metricKey: calc:service.comfy_agentidpublish_test
-  - env: TEST
+Comfy_AgentIdPublish:
+  - name: Comfy_AgentIdPublish
+  - metricKey: calc:service.comfy_agentidpublish
   - unit: COUNT
   - requestAttribute: Comfy_AgentIdPublish
   - msId: comfy-orchestration
   - dimension: {RequestAttribute:Comfy_AgentIdPublish}
   - dimensionName: Agent
-  - skipDeployment: "true"
-Comfy_AgentIdPublish_TEST.EMEA-PreProd:
-  - name: Comfy_AgentIdPublish_TEST
-  - metricKey: calc:service.comfy_agentidpublish_test
-  - env: TEST
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdPublish
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdPublish}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_AgentIdPublish_INT:
-  - name: Comfy_AgentIdPublish_INT
-  - metricKey: calc:service.comfy_agentidpublish_int
-  - env: INT
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdPublish
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdPublish}
-  - dimensionName: Agent
-  - skipDeployment: "true"
-Comfy_AgentIdPublish_INT.EMEA-PreProd:
-  - name: Comfy_AgentIdPublish_INT
-  - metricKey: calc:service.comfy_agentidpublish_int
-  - env: INT
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdPublish
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdPublish}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_AgentIdPublish_E2E:
-  - name: Comfy_AgentIdPublish_E2E
-  - metricKey: calc:service.comfy_agentidpublish_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdPublish
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdPublish}
-  - dimensionName: Agent
-  - skipDeployment: "true"
-Comfy_AgentIdPublish_E2E.EMEA-Prod:
-  - name: Comfy_AgentIdPublish_E2E
-  - metricKey: calc:service.comfy_agentidpublish_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdPublish
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdPublish}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_AgentIdPublish_E2E.NA-Prod:
-  - name: Comfy_AgentIdPublish_E2E
-  - metricKey: calc:service.comfy_agentidpublish_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdPublish
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdPublish}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_AgentIdPublish_E2E.CN-Prod:
-  - name: Comfy_AgentIdPublish_E2E
-  - metricKey: calc:service.comfy_agentidpublish_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdPublish
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdPublish}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_AgentIdPublish_PROD:
-  - name: Comfy_AgentIdPublish_PROD
-  - metricKey: calc:service.comfy_agentidpublish_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdPublish
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdPublish}
-  - dimensionName: Agent
-  - skipDeployment: "true"
-Comfy_AgentIdPublish_PROD.EMEA-Prod:
-  - name: Comfy_AgentIdPublish_PROD
-  - metricKey: calc:service.comfy_agentidpublish_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdPublish
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdPublish}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_AgentIdPublish_PROD.NA-Prod:
-  - name: Comfy_AgentIdPublish_PROD
-  - metricKey: calc:service.comfy_agentidpublish_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdPublish
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdPublish}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-Comfy_AgentIdPublish_PROD.CN-Prod:
-  - name: Comfy_AgentIdPublish_PROD
-  - metricKey: calc:service.comfy_agentidpublish_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_AgentIdPublish
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdPublish}
-  - dimensionName: Agent
-  - skipDeployment: "false"
-
-# Comfy_CompletedCampaigns
-Comfy_CompletedCampaigns_TEST:
-  - name: Comfy_CompletedCampaigns_TEST
-  - metricKey: calc:service.comfy_completedcampaigns_test
-  - env: TEST
+Comfy_CompletedCampaigns:
+  - name: Comfy_CompletedCampaigns
+  - metricKey: calc:service.comfy_completedcampaigns
   - unit: COUNT
   - requestAttribute: Comfy_CompletedCampaigns
   - msId: comfy-orchestration
-  - skipDeployment: "true"
-Comfy_CompletedCampaigns_TEST.EMEA-PreProd:
-  - name: Comfy_CompletedCampaigns_TEST
-  - metricKey: calc:service.comfy_completedcampaigns_test
-  - env: TEST
-  - unit: COUNT
-  - requestAttribute: Comfy_CompletedCampaigns
-  - msId: comfy-orchestration
-  - skipDeployment: "false"
-Comfy_CompletedCampaigns_INT:
-  - name: Comfy_CompletedCampaigns_INT
-  - metricKey: calc:service.comfy_completedcampaigns_int
-  - env: INT
-  - unit: COUNT
-  - requestAttribute: Comfy_CompletedCampaigns
-  - msId: comfy-orchestration
-  - skipDeployment: "true"
-Comfy_CompletedCampaigns_INT.EMEA-PreProd:
-  - name: Comfy_CompletedCampaigns_INT
-  - metricKey: calc:service.comfy_completedcampaigns_int
-  - env: INT
-  - unit: COUNT
-  - requestAttribute: Comfy_CompletedCampaigns
-  - msId: comfy-orchestration
-  - skipDeployment: "false"
-Comfy_CompletedCampaigns_E2E:
-  - name: Comfy_CompletedCampaigns_E2E
-  - metricKey: calc:service.comfy_completedcampaigns_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_CompletedCampaigns
-  - msId: comfy-orchestration
-  - skipDeployment: "true"
-Comfy_CompletedCampaigns_E2E.EMEA-Prod:
-  - name: Comfy_CompletedCampaigns_E2E
-  - metricKey: calc:service.comfy_completedcampaigns_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_CompletedCampaigns
-  - msId: comfy-orchestration
-  - skipDeployment: "false"
-Comfy_CompletedCampaigns_E2E.NA-Prod:
-  - name: Comfy_CompletedCampaigns_E2E
-  - metricKey: calc:service.comfy_completedcampaigns_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_CompletedCampaigns
-  - msId: comfy-orchestration
-  - skipDeployment: "false"
-Comfy_CompletedCampaigns_E2E.CN-Prod:
-  - name: Comfy_CompletedCampaigns_E2E
-  - metricKey: calc:service.comfy_completedcampaigns_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_CompletedCampaigns
-  - msId: comfy-orchestration
-  - skipDeployment: "false"
-Comfy_CompletedCampaigns_PROD:
-  - name: Comfy_CompletedCampaigns_PROD
-  - metricKey: calc:service.comfy_completedcampaigns_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_CompletedCampaigns
-  - msId: comfy-orchestration
-  - skipDeployment: "true"
-Comfy_CompletedCampaigns_PROD.EMEA-Prod:
-  - name: Comfy_CompletedCampaigns_PROD
-  - metricKey: calc:service.comfy_completedcampaigns_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_CompletedCampaigns
-  - msId: comfy-orchestration
-  - skipDeployment: "false"
-Comfy_CompletedCampaigns_PROD.NA-Prod:
-  - name: Comfy_CompletedCampaigns_PROD
-  - metricKey: calc:service.comfy_completedcampaigns_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_CompletedCampaigns
-  - msId: comfy-orchestration
-  - skipDeployment: "false"
-Comfy_CompletedCampaigns_PROD.CN-Prod:
-  - name: Comfy_CompletedCampaigns_PROD
-  - metricKey: calc:service.comfy_completedcampaigns_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_CompletedCampaigns
-  - msId: comfy-orchestration
-  - skipDeployment: "false"
-
-# Comfy_RunningCampaigns
-Comfy_RunningCampaigns_TEST:
-  - name: Comfy_RunningCampaigns_TEST
-  - metricKey: calc:service.comfy_runningcampaigns_test
-  - env: TEST
+Comfy_RunningCampaigns:
+  - name: Comfy_RunningCampaigns
+  - metricKey: calc:service.comfy_runningcampaigns
   - unit: COUNT
   - requestAttribute: Comfy_RunningCampaigns
   - msId: comfy-management
-  - skipDeployment: "true"
-Comfy_RunningCampaigns_TEST.EMEA-PreProd:
-  - name: Comfy_RunningCampaigns_TEST
-  - metricKey: calc:service.comfy_runningcampaigns_test
-  - env: TEST
-  - unit: COUNT
-  - requestAttribute: Comfy_RunningCampaigns
-  - msId: comfy-management
-  - skipDeployment: "false"
-Comfy_RunningCampaigns_INT:
-  - name: Comfy_RunningCampaigns_INT
-  - metricKey: calc:service.comfy_runningcampaigns_int
-  - env: INT
-  - unit: COUNT
-  - requestAttribute: Comfy_RunningCampaigns
-  - msId: comfy-management
-  - skipDeployment: "true"
-Comfy_RunningCampaigns_INT.EMEA-PreProd:
-  - name: Comfy_RunningCampaigns_INT
-  - metricKey: calc:service.comfy_runningcampaigns_int
-  - env: INT
-  - unit: COUNT
-  - requestAttribute: Comfy_RunningCampaigns
-  - msId: comfy-management
-  - skipDeployment: "false"
-Comfy_RunningCampaigns_E2E:
-  - name: Comfy_RunningCampaigns_E2E
-  - metricKey: calc:service.comfy_runningcampaigns_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_RunningCampaigns
-  - msId: comfy-management
-  - skipDeployment: "true"
-Comfy_RunningCampaigns_E2E.EMEA-Prod:
-  - name: Comfy_RunningCampaigns_E2E
-  - metricKey: calc:service.comfy_runningcampaigns_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_RunningCampaigns
-  - msId: comfy-management
-  - skipDeployment: "false"
-Comfy_RunningCampaigns_E2E.NA-Prod:
-  - name: Comfy_RunningCampaigns_E2E
-  - metricKey: calc:service.comfy_runningcampaigns_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_RunningCampaigns
-  - msId: comfy-management
-  - skipDeployment: "false"
-Comfy_RunningCampaigns_E2E.CN-Prod:
-  - name: Comfy_RunningCampaigns_E2E
-  - metricKey: calc:service.comfy_runningcampaigns_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_RunningCampaigns
-  - msId: comfy-management
-  - skipDeployment: "false"
-Comfy_RunningCampaigns_PROD:
-  - name: Comfy_RunningCampaigns_PROD
-  - metricKey: calc:service.comfy_runningcampaigns_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_RunningCampaigns
-  - msId: comfy-management
-  - skipDeployment: "true"
-Comfy_RunningCampaigns_PROD.EMEA-Prod:
-  - name: Comfy_RunningCampaigns_PROD
-  - metricKey: calc:service.comfy_runningcampaigns_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_RunningCampaigns
-  - msId: comfy-management
-  - skipDeployment: "false"
-Comfy_RunningCampaigns_PROD.NA-Prod:
-  - name: Comfy_RunningCampaigns_PROD
-  - metricKey: calc:service.comfy_runningcampaigns_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_RunningCampaigns
-  - msId: comfy-management
-  - skipDeployment: "false"
-Comfy_RunningCampaigns_PROD.CN-Prod:
-  - name: Comfy_RunningCampaigns_PROD
-  - metricKey: calc:service.comfy_runningcampaigns_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_RunningCampaigns
-  - msId: comfy-management
-  - skipDeployment: "false"
-
-# Comfy_VehicleActionStatus
-Comfy_VehicleActionStatus_TEST:
-  - name: Comfy_VehicleActionStatus_TEST
-  - metricKey: calc:service.comfy_vehicleactionstatus_test
-  - env: TEST
+Comfy_VehicleActionStatus:
+  - name: Comfy_VehicleActionStatus
+  - metricKey: calc:service.comfy_vehicleactionstatus
   - unit: COUNT
   - requestAttribute: Comfy_VehicleActionStatus
   - msId: comfy-orchestration
   - dimension: {RequestAttribute:Comfy_VehicleActionStatus}
   - dimensionName: Status
-  - skipDeployment: "true"
-Comfy_VehicleActionStatus_TEST.EMEA-PreProd:
-  - name: Comfy_VehicleActionStatus_TEST
-  - metricKey: calc:service.comfy_vehicleactionstatus_test
-  - env: TEST
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: Status
-  - skipDeployment: "false"
-Comfy_VehicleActionStatus_INT:
-  - name: Comfy_VehicleActionStatus_INT
-  - metricKey: calc:service.comfy_vehicleactionstatus_int
-  - env: INT
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: Status
-  - skipDeployment: "true"
-Comfy_VehicleActionStatus_INT.EMEA-PreProd:
-  - name: Comfy_VehicleActionStatus_INT
-  - metricKey: calc:service.comfy_vehicleactionstatus_int
-  - env: INT
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: Status
-  - skipDeployment: "false"
-Comfy_VehicleActionStatus_E2E:
-  - name: Comfy_VehicleActionStatus_E2E
-  - metricKey: calc:service.comfy_vehicleactionstatus_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: Status
-  - skipDeployment: "true"
-Comfy_VehicleActionStatus_E2E.EMEA-Prod:
-  - name: Comfy_VehicleActionStatus_E2E
-  - metricKey: calc:service.comfy_vehicleactionstatus_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: Status
-  - skipDeployment: "false"
-Comfy_VehicleActionStatus_E2E.NA-Prod:
-  - name: Comfy_VehicleActionStatus_E2E
-  - metricKey: calc:service.comfy_vehicleactionstatus_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: Status
-  - skipDeployment: "false"
-Comfy_VehicleActionStatus_E2E.CN-Prod:
-  - name: Comfy_VehicleActionStatus_E2E
-  - metricKey: calc:service.comfy_vehicleactionstatus_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: Status
-  - skipDeployment: "false"
-Comfy_VehicleActionStatus_PROD:
-  - name: Comfy_VehicleActionStatus_PROD
-  - metricKey: calc:service.comfy_vehicleactionstatus_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: Status
-  - skipDeployment: "true"
-Comfy_VehicleActionStatus_PROD.EMEA-Prod:
-  - name: Comfy_VehicleActionStatus_PROD
-  - metricKey: calc:service.comfy_vehicleactionstatus_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: Status
-  - skipDeployment: "false"
-Comfy_VehicleActionStatus_PROD.NA-Prod:
-  - name: Comfy_VehicleActionStatus_PROD
-  - metricKey: calc:service.comfy_vehicleactionstatus_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: Status
-  - skipDeployment: "false"
-Comfy_VehicleActionStatus_PROD.CN-Prod:
-  - name: Comfy_VehicleActionStatus_PROD
-  - metricKey: calc:service.comfy_vehicleactionstatus_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: Status
-  - skipDeployment: "false"
-
-# Comfy_VehicleActionStatus_AgentId
-Comfy_VehicleActionStatus_AgentId_TEST:
-  - name: Comfy_VehicleActionStatus_AgentId_TEST
-  - metricKey: calc:service.comfy_vehicleactionstatus_agentid_test
-  - env: TEST
+Comfy_VehicleActionStatus_AgentId:
+  - name: Comfy_VehicleActionStatus_AgentId
+  - metricKey: calc:service.comfy_vehicleactionstatus_agentid
   - unit: COUNT
   - requestAttribute: Comfy_VehicleActionStatus
   - requestAttribute2: Comfy_AgentIdConsume
   - msId: comfy-orchestration
   - dimension: {RequestAttribute:Comfy_AgentIdConsume} : {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: "Agent : Status"
-  - skipDeployment: "true"
-Comfy_VehicleActionStatus_AgentId_TEST.EMEA-PreProd:
-  - name: Comfy_VehicleActionStatus_AgentId_TEST
-  - metricKey: calc:service.comfy_vehicleactionstatus_agentid_test
-  - env: TEST
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume} : {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: "Agent : Status"
-  - skipDeployment: "false"
-Comfy_VehicleActionStatus_AgentId_INT:
-  - name: Comfy_VehicleActionStatus_AgentId_INT
-  - metricKey: calc:service.comfy_vehicleactionstatus_agentid_int
-  - env: INT
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume} : {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: "Agent : Status"
-  - skipDeployment: "true"
-Comfy_VehicleActionStatus_AgentId_INT.EMEA-PreProd:
-  - name: Comfy_VehicleActionStatus_AgentId_INT
-  - metricKey: calc:service.comfy_vehicleactionstatus_agentid_int
-  - env: INT
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume} : {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: "Agent : Status"
-  - skipDeployment: "false"
-Comfy_VehicleActionStatus_AgentId_E2E:
-  - name: Comfy_VehicleActionStatus_AgentId_E2E
-  - metricKey: calc:service.comfy_vehicleactionstatus_agentid_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume} : {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: "Agent : Status"
-  - skipDeployment: "true"
-Comfy_VehicleActionStatus_AgentId_E2E.EMEA-Prod:
-  - name: Comfy_VehicleActionStatus_AgentId_E2E
-  - metricKey: calc:service.comfy_vehicleactionstatus_agentid_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume} : {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: "Agent : Status"
-  - skipDeployment: "false"
-Comfy_VehicleActionStatus_AgentId_E2E.NA-Prod:
-  - name: Comfy_VehicleActionStatus_AgentId_E2E
-  - metricKey: calc:service.comfy_vehicleactionstatus_agentid_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume} : {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: "Agent : Status"
-  - skipDeployment: "false"
-Comfy_VehicleActionStatus_AgentId_E2E.CN-Prod:
-  - name: Comfy_VehicleActionStatus_AgentId_E2E
-  - metricKey: calc:service.comfy_vehicleactionstatus_agentid_e2e
-  - env: E2E
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume} : {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: "Agent : Status"
-  - skipDeployment: "false"
-Comfy_VehicleActionStatus_AgentId_PROD:
-  - name: Comfy_VehicleActionStatus_AgentId_PROD
-  - metricKey: calc:service.comfy_vehicleactionstatus_agentid_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume} : {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: "Agent : Status"
-  - skipDeployment: "true"
-Comfy_VehicleActionStatus_AgentId_PROD.EMEA-Prod:
-  - name: Comfy_VehicleActionStatus_AgentId_PROD
-  - metricKey: calc:service.comfy_vehicleactionstatus_agentid_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume} : {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: "Agent : Status"
-  - skipDeployment: "false"
-Comfy_VehicleActionStatus_AgentId_PROD.NA-Prod:
-  - name: Comfy_VehicleActionStatus_AgentId_PROD
-  - metricKey: calc:service.comfy_vehicleactionstatus_agentid_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume} : {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: "Agent : Status"
-  - skipDeployment: "false"
-Comfy_VehicleActionStatus_AgentId_PROD.CN-Prod:
-  - name: Comfy_VehicleActionStatus_AgentId_PROD
-  - metricKey: calc:service.comfy_vehicleactionstatus_agentid_prod
-  - env: PROD
-  - unit: COUNT
-  - requestAttribute: Comfy_VehicleActionStatus
-  - requestAttribute2: Comfy_AgentIdConsume
-  - msId: comfy-orchestration
-  - dimension: {RequestAttribute:Comfy_AgentIdConsume} : {RequestAttribute:Comfy_VehicleActionStatus}
-  - dimensionName: "Agent : Status"
-  - skipDeployment: "false"
\ No newline at end of file
+  - dimensionName: "Agent : Status"
\ No newline at end of file
diff --git a/BMW-Dynatrace-config/CD_comfy/dashboard/CDcomfyCampaignMonitoring.json b/BMW-Dynatrace-config/CD_comfy/dashboard/CDcomfyCampaignMonitoring.json
index b6207c58..81a24419 100644
--- a/BMW-Dynatrace-config/CD_comfy/dashboard/CDcomfyCampaignMonitoring.json
+++ b/BMW-Dynatrace-config/CD_comfy/dashboard/CDcomfyCampaignMonitoring.json
@@ -75,7 +75,7 @@
       "queries": [
         {
           "id": "A",
-          "metric": "calc:service.comfy_vehicleactionstatus_{{.envLower}",
+          "metric": "calc:service.comfy_vehicleactionstatus",
           "spaceAggregation": "SUM",
           "timeAggregation": "DEFAULT",
           "splitBy": [
@@ -84,7 +84,20 @@
           "sortBy": "DESC",
           "filterBy": {
             "filterOperator": "AND",
-            "nestedFilters": [],
+            "nestedFilters": [
+              {
+                "filter": "dt.entity.service",
+                "filterType": "TAG",
+                "filterOperator": "OR",
+                "nestedFilters": [],
+                "criteria": [
+                  {
+                    "value": "Environment:{{.env}}",
+                    "evaluator": "IN"
+                  }
+                ]
+              }
+            ],
             "criteria": []
           },
           "limit": 10,
@@ -233,7 +246,7 @@
       "queries": [
         {
           "id": "A",
-          "metric": "calc:service.comfy_vehicleactionstatus_{{.envLower}",
+          "metric": "calc:service.comfy_vehicleactionstatus",
           "spaceAggregation": "SUM",
           "timeAggregation": "DEFAULT",
           "splitBy": [
@@ -243,6 +256,18 @@
           "filterBy": {
             "filterOperator": "AND",
             "nestedFilters": [
+              {
+                "filter": "dt.entity.service",
+                "filterType": "TAG",
+                "filterOperator": "OR",
+                "nestedFilters": [],
+                "criteria": [
+                  {
+                    "value": "Environment:{{.env}}",
+                    "evaluator": "IN"
+                  }
+                ]
+              },
               {
                 "filter": "Status",
                 "filterType": "DIMENSION",
@@ -364,7 +389,7 @@
       "queries": [
         {
           "id": "A",
-          "metric": "calc:service.comfy_vehicleactionstatus_{{.envLower}",
+          "metric": "calc:service.comfy_vehicleactionstatus",
           "spaceAggregation": "SUM",
           "timeAggregation": "DEFAULT",
           "splitBy": [
@@ -374,6 +399,18 @@
           "filterBy": {
             "filterOperator": "AND",
             "nestedFilters": [
+              {
+                "filter": "dt.entity.service",
+                "filterType": "TAG",
+                "filterOperator": "OR",
+                "nestedFilters": [],
+                "criteria": [
+                  {
+                    "value": "Environment:{{.env}}",
+                    "evaluator": "IN"
+                  }
+                ]
+              },
               {
                 "filter": "Status",
                 "filterType": "DIMENSION",
@@ -535,7 +572,7 @@
       "queries": [
         {
           "id": "A",
-          "metric": "calc:service.comfy_agentidpublish_{{.envLower}",
+          "metric": "calc:service.comfy_agentidpublish",
           "spaceAggregation": "SUM",
           "timeAggregation": "DEFAULT",
           "splitBy": [
@@ -543,7 +580,20 @@
           ],
           "sortBy": "DESC",
           "filterBy": {
-            "nestedFilters": [],
+            "nestedFilters": [
+              {
+                "filter": "dt.entity.service",
+                "filterType": "TAG",
+                "filterOperator": "OR",
+                "nestedFilters": [],
+                "criteria": [
+                  {
+                    "value": "Environment:{{.env}}",
+                    "evaluator": "IN"
+                  }
+                ]
+              }
+            ],
             "criteria": []
           },
           "limit": 10,
@@ -631,12 +681,25 @@
       "queries": [
         {
           "id": "A",
-          "metric": "calc:service.comfy_runningcampaigns_{{.envLower}",
+          "metric": "calc:service.comfy_runningcampaigns",
           "spaceAggregation": "SUM",
           "timeAggregation": "DEFAULT",
           "splitBy": [],
           "filterBy": {
-            "nestedFilters": [],
+            "nestedFilters": [
+              {
+                "filter": "dt.entity.service",
+                "filterType": "TAG",
+                "filterOperator": "OR",
+                "nestedFilters": [],
+                "criteria": [
+                  {
+                    "value": "Environment:{{.env}}",
+                    "evaluator": "IN"
+                  }
+                ]
+              }
+            ],
             "criteria": []
           },
           "enabled": true
@@ -718,13 +781,26 @@
       "queries": [
         {
           "id": "A",
-          "metric": "calc:service.comfy_completedcampaigns_{{.envLower}",
+          "metric": "calc:service.comfy_completedcampaigns",
           "spaceAggregation": "SUM",
           "timeAggregation": "DEFAULT",
           "splitBy": [],
           "sortBy": "DESC",
           "filterBy": {
-            "nestedFilters": [],
+            "nestedFilters": [
+              {
+                "filter": "dt.entity.service",
+                "filterType": "TAG",
+                "filterOperator": "OR",
+                "nestedFilters": [],
+                "criteria": [
+                  {
+                    "value": "Environment:{{.env}}",
+                    "evaluator": "IN"
+                  }
+                ]
+              }
+            ],
             "criteria": []
           },
           "limit": 10,
@@ -805,7 +881,7 @@
         {
           "id": "A",
           "timeAggregation": "DEFAULT",
-          "metricSelector": "calc:service.comfy_agentidpublish_{{.envLower}:filter(and(eq(Agent,{{.agent2}}))):rate(1m):value:auto:sort(value(avg,descending)):limit(10)",
+          "metricSelector": "calc:service.comfy_agentidpublish:filter(and(eq(Agent,{{.agent2}}),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:{{.env}}~\")\")))):rate(1m):value:auto:sort(value(avg,descending)):limit(10)",
           "enabled": true
         }
       ],
@@ -898,7 +974,7 @@
       "queries": [
         {
           "id": "A",
-          "metric": "calc:service.comfy_agentidpublish_{{.envLower}",
+          "metric": "calc:service.comfy_agentidpublish",
           "spaceAggregation": "SUM",
           "timeAggregation": "DEFAULT",
           "splitBy": [
@@ -911,7 +987,20 @@
                 "filter": "Agent",
                 "filterType": "DIMENSION",
                 "filterOperator": "OR",
-                "nestedFilters": [],
+                "nestedFilters": [
+                  {
+                    "filter": "dt.entity.service",
+                    "filterType": "TAG",
+                    "filterOperator": "OR",
+                    "nestedFilters": [],
+                    "criteria": [
+                      {
+                        "value": "Environment:{{.env}}",
+                        "evaluator": "IN"
+                      }
+                    ]
+                  }
+                ],
                 "criteria": [
                   {
                     "value": "{{.agent2}}",
@@ -1028,7 +1117,7 @@
       "queries": [
         {
           "id": "A",
-          "metric": "calc:service.comfy_agentidpublish_{{.envLower}",
+          "metric": "calc:service.comfy_agentidpublish",
           "spaceAggregation": "SUM",
           "timeAggregation": "DEFAULT",
           "splitBy": [
@@ -1041,7 +1130,20 @@
                 "filter": "Agent",
                 "filterType": "DIMENSION",
                 "filterOperator": "OR",
-                "nestedFilters": [],
+                "nestedFilters": [
+                  {
+                    "filter": "dt.entity.service",
+                    "filterType": "TAG",
+                    "filterOperator": "OR",
+                    "nestedFilters": [],
+                    "criteria": [
+                      {
+                        "value": "Environment:{{.env}}",
+                        "evaluator": "IN"
+                      }
+                    ]
+                  }
+                ],
                 "criteria": [
                   {
                     "value": "{{.agent3}}",
@@ -1131,7 +1233,7 @@
         {
           "id": "A",
           "timeAggregation": "DEFAULT",
-          "metricSelector": "calc:service.comfy_agentidpublish_{{.envLower}:filter(and(eq(Agent,{{.agent3}}))):rate(1m):value:auto:sort(value(avg,descending)):limit(10)",
+          "metricSelector": "calc:service.comfy_agentidpublish:filter(and(eq(Agent,{{.agent3}}),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:{{.env}}~\")\")))):rate(1m):value:auto:sort(value(avg,descending)):limit(10)",
           "enabled": true
         }
       ],
@@ -1210,7 +1312,7 @@
       "queries": [
         {
           "id": "A",
-          "metric": "calc:service.comfy_actionduration_{{.envLower}",
+          "metric": "calc:service.comfy_actionduration",
           "spaceAggregation": "AVG",
           "timeAggregation": "DEFAULT",
           "splitBy": [
@@ -1223,7 +1325,20 @@
                 "filter": "Agent",
                 "filterType": "DIMENSION",
                 "filterOperator": "OR",
-                "nestedFilters": [],
+                "nestedFilters": [
+                  {
+                    "filter": "dt.entity.service",
+                    "filterType": "TAG",
+                    "filterOperator": "OR",
+                    "nestedFilters": [],
+                    "criteria": [
+                      {
+                        "value": "Environment:{{.env}}",
+                        "evaluator": "IN"
+                      }
+                    ]
+                  }
+                ],
                 "criteria": [
                   {
                     "value": "{{.agent3}}",
@@ -1312,7 +1427,7 @@
       "queries": [
         {
           "id": "A",
-          "metric": "calc:service.comfy_agentidpublish_{{.envLower}",
+          "metric": "calc:service.comfy_agentidpublish",
           "spaceAggregation": "SUM",
           "timeAggregation": "DEFAULT",
           "splitBy": [
@@ -1325,7 +1440,20 @@
                 "filter": "Agent",
                 "filterType": "DIMENSION",
                 "filterOperator": "OR",
-                "nestedFilters": [],
+                "nestedFilters": [
+                  {
+                    "filter": "dt.entity.service",
+                    "filterType": "TAG",
+                    "filterOperator": "OR",
+                    "nestedFilters": [],
+                    "criteria": [
+                      {
+                        "value": "Environment:{{.env}}",
+                        "evaluator": "IN"
+                      }
+                    ]
+                  }
+                ],
                 "criteria": [
                   {
                     "value": "{{.agent1}}",
@@ -1415,7 +1543,7 @@
         {
           "id": "A",
           "timeAggregation": "DEFAULT",
-          "metricSelector": "calc:service.comfy_agentidpublish_{{.envLower}:filter(and(eq(Agent,{{.agent1}}))):rate(1m):value:auto:sort(value(avg,descending)):limit(10)",
+          "metricSelector": "calc:service.comfy_agentidpublish:filter(and(eq(Agent,{{.agent1}}),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:{{.env}}~\")\")))):rate(1m):value:auto:sort(value(avg,descending)):limit(10)",
           "enabled": true
         }
       ],
@@ -1494,7 +1622,7 @@
       "queries": [
         {
           "id": "A",
-          "metric": "calc:service.comfy_actionduration_{{.envLower}",
+          "metric": "calc:service.comfy_actionduration",
           "spaceAggregation": "AVG",
           "timeAggregation": "DEFAULT",
           "splitBy": [
@@ -1507,7 +1635,20 @@
                 "filter": "Agent",
                 "filterType": "DIMENSION",
                 "filterOperator": "OR",
-                "nestedFilters": [],
+                "nestedFilters": [
+                  {
+                    "filter": "dt.entity.service",
+                    "filterType": "TAG",
+                    "filterOperator": "OR",
+                    "nestedFilters": [],
+                    "criteria": [
+                      {
+                        "value": "Environment:{{.env}}",
+                        "evaluator": "IN"
+                      }
+                    ]
+                  }
+                ],
                 "criteria": [
                   {
                     "value": "{{.agent1}}",
@@ -1623,7 +1764,7 @@
       "queries": [
         {
           "id": "A",
-          "metric": "calc:service.comfy_actionduration_{{.envLower}",
+          "metric": "calc:service.comfy_actionduration",
           "spaceAggregation": "MEDIAN",
           "timeAggregation": "DEFAULT",
           "splitBy": [
@@ -1636,7 +1777,20 @@
                 "filter": "Agent",
                 "filterType": "DIMENSION",
                 "filterOperator": "OR",
-                "nestedFilters": [],
+                "nestedFilters": [
+                  {
+                    "filter": "dt.entity.service",
+                    "filterType": "TAG",
+                    "filterOperator": "OR",
+                    "nestedFilters": [],
+                    "criteria": [
+                      {
+                        "value": "Environment:{{.env}}",
+                        "evaluator": "IN"
+                      }
+                    ]
+                  }
+                ],
                 "criteria": [
                   {
                     "value": "{{.agent2}}",
@@ -1725,7 +1879,7 @@
       "queries": [
         {
           "id": "A",
-          "metric": "calc:service.comfy_vehicleactionstatus_agentid_{{.envLower}",
+          "metric": "calc:service.comfy_vehicleactionstatus_agentid",
           "spaceAggregation": "SUM",
           "timeAggregation": "DEFAULT",
           "splitBy": [
@@ -1735,6 +1889,18 @@
           "filterBy": {
             "filterOperator": "AND",
             "nestedFilters": [
+              {
+                "filter": "dt.entity.service",
+                "filterType": "TAG",
+                "filterOperator": "OR",
+                "nestedFilters": [],
+                "criteria": [
+                  {
+                    "value": "Environment:{{.env}}",
+                    "evaluator": "IN"
+                  }
+                ]
+              },
               {
                 "filter": "Agent : Status",
                 "filterType": "DIMENSION",
@@ -1859,7 +2025,7 @@
       "queries": [
         {
           "id": "A",
-          "metric": "calc:service.comfy_vehicleactionstatus_agentid_{{.envLower}",
+          "metric": "calc:service.comfy_vehicleactionstatus_agentid",
           "spaceAggregation": "SUM",
           "timeAggregation": "DEFAULT",
           "splitBy": [
@@ -1869,6 +2035,18 @@
           "filterBy": {
             "filterOperator": "AND",
             "nestedFilters": [
+              {
+                "filter": "dt.entity.service",
+                "filterType": "TAG",
+                "filterOperator": "OR",
+                "nestedFilters": [],
+                "criteria": [
+                  {
+                    "value": "Environment:{{.env}}",
+                    "evaluator": "IN"
+                  }
+                ]
+              },
               {
                 "filter": "Agent : Status",
                 "filterType": "DIMENSION",
@@ -1994,7 +2172,7 @@
       "queries": [
         {
           "id": "A",
-          "metric": "calc:service.comfy_vehicleactionstatus_agentid_{{.envLower}",
+          "metric": "calc:service.comfy_vehicleactionstatus_agentid",
           "spaceAggregation": "SUM",
           "timeAggregation": "DEFAULT",
           "splitBy": [
@@ -2004,6 +2182,18 @@
           "filterBy": {
             "filterOperator": "AND",
             "nestedFilters": [
+              {
+                "filter": "dt.entity.service",
+                "filterType": "TAG",
+                "filterOperator": "OR",
+                "nestedFilters": [],
+                "criteria": [
+                  {
+                    "value": "Environment:{{.env}}",
+                    "evaluator": "IN"
+                  }
+                ]
+              },
               {
                 "filter": "Agent : Status",
                 "filterType": "DIMENSION",
@@ -2128,7 +2318,7 @@
       "queries": [
         {
           "id": "A",
-          "metric": "calc:service.comfy_agentidconsume_{{.envLower}",
+          "metric": "calc:service.comfy_agentidconsume",
           "spaceAggregation": "SUM",
           "timeAggregation": "DEFAULT",
           "splitBy": [
@@ -2136,7 +2326,20 @@
           ],
           "sortBy": "DESC",
           "filterBy": {
-            "nestedFilters": [],
+            "nestedFilters": [
+              {
+                "filter": "dt.entity.service",
+                "filterType": "TAG",
+                "filterOperator": "OR",
+                "nestedFilters": [],
+                "criteria": [
+                  {
+                    "value": "Environment:{{.env}}",
+                    "evaluator": "IN"
+                  }
+                ]
+              }
+            ],
             "criteria": []
           },
           "limit": 10,