diff --git a/CN_PROD/dashboard/CD_nop_vdm_standard_E2E.tf b/CN_PROD/dashboard/CD_nop_vdm_standard_E2E.tf
new file mode 100644
index 00000000..4bf1a53d
--- /dev/null
+++ b/CN_PROD/dashboard/CD_nop_vdm_standard_E2E.tf
@@ -0,0 +1,50 @@
+# ID cc530e70-7fbf-432e-9b94-b508a0eaa56a
+module CD_nop_vdm_standard_E2E {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_NOP - CN E2E - VDM Standard Dashboard"
+  tag                = "nop"
+  environment        = "E2E"
+  managementZoneName = "CD_provisioning"
+  sloName            = "VDM - NOP - CN E2E"
+  appId              = "APP-543"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-Provisioning(NOP)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                    fromRelationship.isServiceMethodOfService(
+                            type(~"SERVICE~"),entityName.in(
+                                ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"ProvisioningService - provisioning - e2e~",
+                                ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
+                                ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
+                                ~"MQSession$FacadeMessageListener - nopprov - e2e~",
+                                ~"MQSession$FacadeMessageListener - noparchive - e2e~",
+                                ~"ProvisioningService - nopprov - e2e~",
+                                ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
+                            )
+                    )
+                    ,entityName.in(
+                        ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
+                        ~"Queue: NOP_Trigger_IN-e2e~",
+                        ~"Queue: NOP_TRIGGER_ACK-e2e~",
+                        ~"Queue: NOP_ARCHIVE_IN-e2e~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~",
+                        ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_INTERNAL~",
+                        ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_IN~",
+                        ~"Queue: B2VCNINT.BMW.B2VCN.NOP_TRIGGER_ACK_IN~",
+                        ~"Queue: B2VCNINT.BMW.B2VCN.NOP_ARCHIV_IN~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~"
+                    )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(15))
+  EOT
+}
\ No newline at end of file
diff --git a/CN_PROD/dashboard/CD_nop_vdm_standard_PROD.tf b/CN_PROD/dashboard/CD_nop_vdm_standard_PROD.tf
new file mode 100644
index 00000000..a53c39f5
--- /dev/null
+++ b/CN_PROD/dashboard/CD_nop_vdm_standard_PROD.tf
@@ -0,0 +1,50 @@
+# ID 00d49ca5-9b4a-4c25-a35d-35d4bd849b0e
+module CD_nop_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_NOP - CN PROD - VDM Standard Dashboard"
+  tag                = "nop"
+  environment        = "PROD"
+  managementZoneName = "CD_provisioning"
+  sloName            = "VDM - NOP - CN PROD"
+  appId              = "APP-543"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-Provisioning(NOP)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                    fromRelationship.isServiceMethodOfService(
+                            type(~"SERVICE~"),entityName.in(
+                                ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                ~"ProvisioningService - provisioning - prod~",
+                                ~"NOP-Provisioning (/nop-prov) - provisioning - prod~",
+                                ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                ~"MQSession$FacadeMessageListener - nopprov - prod~",
+                                ~"MQSession$FacadeMessageListener - noparchive - prod~",
+                                ~"ProvisioningService - nopprov - prod~",
+                                ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
+                            )
+                    )
+                    ,entityName.in(
+                        ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
+                        ~"Queue: NOP_Trigger_IN-prod~",
+                        ~"Queue: NOP_TRIGGER_ACK-prod~",
+                        ~"Queue: NOP_ARCHIVE_IN-prod~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~",
+                        ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_INTERNAL~",
+                        ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_IN~",
+                        ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_TRIGGER_ACK_IN~",
+                        ~"Queue: B2VCNPROD.BMW.B2VCN.NOP_ARCHIV_IN~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~"
+                    )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(15))
+  EOT
+}
\ No newline at end of file
diff --git a/CN_PROD/dashboard/CD_nots_vdm_standard_E2E.tf b/CN_PROD/dashboard/CD_nots_vdm_standard_E2E.tf
new file mode 100644
index 00000000..6b850832
--- /dev/null
+++ b/CN_PROD/dashboard/CD_nots_vdm_standard_E2E.tf
@@ -0,0 +1,27 @@
+# ID ce31efe3-a657-4b1b-beb5-b84931b1740c
+module CD_nots_vdm_standard_E2E {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_NOTS - CN E2E - VDM Standard Dashboard"
+  tag                = "b2v-nots"
+  environment        = "E2E"
+  managementZoneName = "CD_provisioning"
+  sloName            = "VDM - NOTS - CN E2E"
+  appId              = "APP-17840"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/x/xzB-VQ#ReliabilityMeasurement-Provisioning(NOTS)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                fromRelationship.isServiceMethodOfService(
+                        type(~"SERVICE~"),entityName.in(
+                            ~"server (/nots) - provisioning - e2e~",
+                            ~"NotificationApiResource - provisioning - e2e~"
+                        )
+                )
+                ,entityName.in(
+                    ~"/nots/poll~",
+                    ~"notifyVehicles~"
+                )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(2))
+  EOT
+}
\ No newline at end of file
diff --git a/CN_PROD/dashboard/CD_nots_vdm_standard_PROD.tf b/CN_PROD/dashboard/CD_nots_vdm_standard_PROD.tf
new file mode 100644
index 00000000..0f7c6585
--- /dev/null
+++ b/CN_PROD/dashboard/CD_nots_vdm_standard_PROD.tf
@@ -0,0 +1,27 @@
+# ID cb444d92-70e4-4dfb-bbbf-fddce516637e
+module CD_nots_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_NOTS - CN PROD - VDM Standard Dashboard"
+  tag                = "b2v-nots"
+  environment        = "PROD"
+  managementZoneName = "CD_provisioning"
+  sloName            = "VDM - NOTS - CN PROD"
+  appId              = "APP-17840"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/x/xzB-VQ#ReliabilityMeasurement-Provisioning(NOTS)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                fromRelationship.isServiceMethodOfService(
+                        type(~"SERVICE~"),entityName.in(
+                            ~"server (/nots) - provisioning - prod~",
+                            ~"NotificationApiResource - provisioning - prod~"
+                        )
+                )
+                ,entityName.in(
+                    ~"/nots/poll~",
+                    ~"notifyVehicles~"
+                )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(2))
+  EOT
+}
\ No newline at end of file
diff --git a/CN_PROD/dashboard/CD_vps_vdm_standard_E2E.tf b/CN_PROD/dashboard/CD_vps_vdm_standard_E2E.tf
new file mode 100644
index 00000000..ae45fb33
--- /dev/null
+++ b/CN_PROD/dashboard/CD_vps_vdm_standard_E2E.tf
@@ -0,0 +1,47 @@
+# ID 9412652e-2af4-4cde-a302-d351214d2db3
+module CD_vps_vdm_standard_E2E {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_VPS - CN E2E - VDM Standard Dashboard"
+  tag                = "vps"
+  environment        = "E2E"
+  managementZoneName = "CD_provisioning"
+  sloName            = "VDM - VPS - CN E2E"
+  appId              = "APP-17848"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-Provisioning(VPS)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"WorkshopProvisioningService - provisioning - e2e~",
+                                    ~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"VpsJoynrApi - provisioning - e2e~",
+
+                                    ~"WorkshopProvisioningService - vps-prov - cn~",
+                                    ~"MQSession$FacadeMessageListener - vps-prov - cn~",
+                                    ~"MQSession$FacadeMessageListener - vps-trigger - cn~",
+                                    ~"VpsJoynrApi - vps-prov - cn~",
+                                )
+                        )
+                        ,entityName.in(
+                            ~"vpsObtainProvisioningSync~",
+                            ~"Queue: PROV_TRIGGER_ACK-e2e~",
+                            ~"Queue: PROV_TRIGGER_INTERNAL-e2e~",
+                            ~"Queue: PROV_Trigger_IN-e2e~",
+                            ~"Queue: PROV_ARCHIVE_IN-e2e~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+
+                            ~"vpsObtainProvisioningSync~",
+                            ~"Queue: B2VCNINT.BMW.B2VCN.PROV_TRIGGER_INTERNAL~",
+                            ~"Queue: B2VCNINT.BMW.B2VCN.PROV_TRIGGER_IN~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~"
+                        )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(12))
+  EOT
+}
\ No newline at end of file
diff --git a/CN_PROD/dashboard/CD_vps_vdm_standard_PROD.tf b/CN_PROD/dashboard/CD_vps_vdm_standard_PROD.tf
new file mode 100644
index 00000000..981e6a74
--- /dev/null
+++ b/CN_PROD/dashboard/CD_vps_vdm_standard_PROD.tf
@@ -0,0 +1,47 @@
+# ID 07d1b6a9-3a79-44d9-89da-4cfa3c85c582
+module CD_vps_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_VPS - CN PROD - VDM Standard Dashboard"
+  tag                = "vps"
+  environment        = "PROD"
+  managementZoneName = "CD_provisioning"
+  sloName            = "VDM - VPS - CN PROD"
+  appId              = "APP-17848"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-Provisioning(VPS)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"WorkshopProvisioningService - provisioning - prod~",
+                                    ~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"VpsJoynrApi - provisioning - prod~",
+
+                                    ~"WorkshopProvisioningService - vps-prov - cn~",
+                                    ~"MQSession$FacadeMessageListener - vps-prov - cn~",
+                                    ~"MQSession$FacadeMessageListener - vps-trigger - cn~",
+                                    ~"VpsJoynrApi - vps-prov - cn~",
+                                )
+                        )
+                        ,entityName.in(
+                            ~"vpsObtainProvisioningSync~",
+                            ~"Queue: PROV_TRIGGER_ACK-prod~",
+                            ~"Queue: PROV_TRIGGER_INTERNAL-prod~",
+                            ~"Queue: PROV_Trigger_IN-prod~",
+                            ~"Queue: PROV_ARCHIVE_IN-prod~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+
+                            ~"vpsObtainProvisioningSync~",
+                            ~"Queue: B2VCNPROD.BMW.B2VCN.PROV_TRIGGER_INTERNAL~",
+                            ~"Queue: B2VCNPROD.BMW.B2VCN.PROV_TRIGGER_IN~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~"
+                        )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(12))
+  EOT
+}
\ No newline at end of file
diff --git a/EMEA_PROD/dashboard/CD_nop_vdm_standard_E2E.tf b/EMEA_PROD/dashboard/CD_nop_vdm_standard_E2E.tf
new file mode 100644
index 00000000..10eb78c1
--- /dev/null
+++ b/EMEA_PROD/dashboard/CD_nop_vdm_standard_E2E.tf
@@ -0,0 +1,50 @@
+# ID eb991b24-ad47-465c-be3c-1688e962c348
+module CD_nop_vdm_standard_E2E {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_NOP - EMEA E2E - VDM Standard Dashboard"
+  tag                = "nop"
+  environment        = "E2E"
+  managementZoneName = "CD_provisioning"
+  sloName            = "VDM - NOP - EMEA E2E"
+  appId              = "APP-543"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-Provisioning(NOP)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                    fromRelationship.isServiceMethodOfService(
+                            type(~"SERVICE~"),entityName.in(
+                                ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"ProvisioningService - provisioning - e2e~",
+                                ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
+                                ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
+                                ~"MQSession$FacadeMessageListener - nopprov - e2e~",
+                                ~"MQSession$FacadeMessageListener - noparchive - e2e~",
+                                ~"ProvisioningService - nopprov - e2e~",
+                                ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
+                            )
+                    )
+                    ,entityName.in(
+                        ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
+                        ~"Queue: NOP_Trigger_IN-e2e~",
+                        ~"Queue: NOP_TRIGGER_ACK-e2e~",
+                        ~"Queue: NOP_ARCHIVE_IN-e2e~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~",
+                        ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_INTERNAL~",
+                        ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_IN~",
+                        ~"Queue: B2VINT.BMW.B2V.NOP_TRIGGER_ACK_IN~",
+                        ~"Queue: B2VINT.BMW.B2V.NOP_ARCHIV_IN~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~"
+                    )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(15))
+  EOT
+}
\ No newline at end of file
diff --git a/EMEA_PROD/dashboard/CD_nop_vdm_standard_PROD.tf b/EMEA_PROD/dashboard/CD_nop_vdm_standard_PROD.tf
new file mode 100644
index 00000000..0c61de93
--- /dev/null
+++ b/EMEA_PROD/dashboard/CD_nop_vdm_standard_PROD.tf
@@ -0,0 +1,50 @@
+# ID 32100ea5-4211-4ebf-a71f-d99ddd9beffc
+module CD_nop_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_NOP - EMEA PROD - VDM Standard Dashboard"
+  tag                = "nop"
+  environment        = "PROD"
+  managementZoneName = "CD_provisioning"
+  sloName            = "VDM - NOP - EMEA PROD"
+  appId              = "APP-543"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-Provisioning(NOP)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                    fromRelationship.isServiceMethodOfService(
+                            type(~"SERVICE~"),entityName.in(
+                                ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                ~"ProvisioningService - provisioning - prod~",
+                                ~"NOP-Provisioning (/nop-prov) - provisioning - prod~",
+                                ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                ~"MQSession$FacadeMessageListener - nopprov - prod~",
+                                ~"MQSession$FacadeMessageListener - noparchive - prod~",
+                                ~"ProvisioningService - nopprov - prod~",
+                                ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
+                            )
+                    )
+                    ,entityName.in(
+                        ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
+                        ~"Queue: NOP_Trigger_IN-prod~",
+                        ~"Queue: NOP_TRIGGER_ACK-prod~",
+                        ~"Queue: NOP_ARCHIVE_IN-prod~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~",
+                        ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_INTERNAL~",
+                        ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_IN~",
+                        ~"Queue: B2VPROD.BMW.B2V.NOP_TRIGGER_ACK_IN~",
+                        ~"Queue: B2VPROD.BMW.B2V.NOP_ARCHIV_IN~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~"
+                    )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(15))
+  EOT
+}
\ No newline at end of file
diff --git a/EMEA_PROD/dashboard/CD_nots_vdm_standard_E2E.tf b/EMEA_PROD/dashboard/CD_nots_vdm_standard_E2E.tf
index 65623eed..fbcafa66 100644
--- a/EMEA_PROD/dashboard/CD_nots_vdm_standard_E2E.tf
+++ b/EMEA_PROD/dashboard/CD_nots_vdm_standard_E2E.tf
@@ -11,7 +11,7 @@ module CD_nots_vdm_standard_E2E {
   appId              = "APP-17840"
   reliabilityLink    = "https://atc.bmwgroup.net/confluence/x/xzB-VQ#ReliabilityMeasurement-Provisioning(NOTS)"
 
-  reliabilityOverTime = <<EOT
+  reliabilityMetricSelector = <<EOT
     (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
                 fromRelationship.isServiceMethodOfService(
                         type(~"SERVICE~"),entityName.in(
@@ -22,20 +22,6 @@ module CD_nots_vdm_standard_E2E {
                 ,entityName.in(
                     ~"/nots/poll~",
                     ~"notifyVehicles~"
-                )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(1))
-  EOT
-
-  reliabilityPerKeyRequest = <<EOT
-    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-            fromRelationship.isServiceMethodOfService(
-                    type(~"SERVICE~"),entityName.in(
-                        ~"server (/nots) - provisioning - e2e~",
-                        ~"NotificationApiResource - provisioning - e2e~"
-                    )
-            )
-            ,entityName.in(
-                ~"/nots/poll~",
-                ~"notifyVehicles~"
-            )"))))):splitBy("dt.entity.service_method"):avg:auto:sort(value(avg,ascending)):limit(1))
+                )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(2))
   EOT
 }
\ No newline at end of file
diff --git a/EMEA_PROD/dashboard/CD_nots_vdm_standard_PROD.tf b/EMEA_PROD/dashboard/CD_nots_vdm_standard_PROD.tf
new file mode 100644
index 00000000..cd2f52ad
--- /dev/null
+++ b/EMEA_PROD/dashboard/CD_nots_vdm_standard_PROD.tf
@@ -0,0 +1,27 @@
+# ID 8dd7704f-9f9c-435f-bc3d-ae932d00c50e
+module CD_nots_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_NOTS - EMEA PROD - VDM Standard Dashboard"
+  tag                = "b2v-nots"
+  environment        = "PROD"
+  managementZoneName = "CD_provisioning"
+  sloName            = "VDM - NOTS - EMEA PROD"
+  appId              = "APP-17840"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/x/xzB-VQ#ReliabilityMeasurement-Provisioning(NOTS)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                fromRelationship.isServiceMethodOfService(
+                        type(~"SERVICE~"),entityName.in(
+                            ~"server (/nots) - provisioning - prod~",
+                            ~"NotificationApiResource - provisioning - prod~"
+                        )
+                )
+                ,entityName.in(
+                    ~"/nots/poll~",
+                    ~"notifyVehicles~"
+                )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(2))
+  EOT
+}
\ No newline at end of file
diff --git a/EMEA_PROD/dashboard/CD_vps_vdm_standard_E2E.tf b/EMEA_PROD/dashboard/CD_vps_vdm_standard_E2E.tf
new file mode 100644
index 00000000..cda70ba0
--- /dev/null
+++ b/EMEA_PROD/dashboard/CD_vps_vdm_standard_E2E.tf
@@ -0,0 +1,47 @@
+# ID 26ab32fb-b312-49da-a4fc-180658ac8668
+module CD_vps_vdm_standard_E2E {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_VPS - EMEA E2E - VDM Standard Dashboard"
+  tag                = "vps"
+  environment        = "E2E"
+  managementZoneName = "CD_provisioning"
+  sloName            = "VDM - VPS - EMEA E2E"
+  appId              = "APP-17848"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-Provisioning(VPS)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"WorkshopProvisioningService - provisioning - e2e~",
+                                    ~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"VpsJoynrApi - provisioning - e2e~",
+
+                                    ~"WorkshopProvisioningService - vps-prov - e2e~",
+                                    ~"MQSession$FacadeMessageListener - vps-prov - e2e~",
+                                    ~"MQSession$FacadeMessageListener - vps-trigger - e2e~",
+                                    ~"VpsJoynrApi - vps-prov - e2e~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"vpsObtainProvisioningSync~",
+                            ~"Queue: PROV_TRIGGER_ACK-e2e~",
+                            ~"Queue: PROV_TRIGGER_INTERNAL-e2e~",
+                            ~"Queue: PROV_Trigger_IN-e2e~",
+                            ~"Queue: PROV_ARCHIVE_IN-e2e~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+
+                            ~"vpsObtainProvisioningSync~",
+                            ~"Queue: B2VINT.BMW.B2V.PROV_TRIGGER_INTERNAL~",
+                            ~"Queue: B2VINT.BMW.B2V.PROV_TRIGGER_IN~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~"
+                        )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(12))
+  EOT
+}
\ No newline at end of file
diff --git a/EMEA_PROD/dashboard/CD_vps_vdm_standard_PROD.tf b/EMEA_PROD/dashboard/CD_vps_vdm_standard_PROD.tf
new file mode 100644
index 00000000..26e46779
--- /dev/null
+++ b/EMEA_PROD/dashboard/CD_vps_vdm_standard_PROD.tf
@@ -0,0 +1,48 @@
+# ID e8065d80-8ca6-49ac-9c40-12672187f868
+module CD_vps_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_VPS - EMEA PROD - VDM Standard Dashboard"
+  tag                = "vps"
+  environment        = "PROD"
+  managementZoneName = "CD_provisioning"
+  sloName            = "VDM - VPS - EMEA PROD"
+  appId              = "APP-17848"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-Provisioning(VPS)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"WorkshopProvisioningService - provisioning - prod~",
+                                    ~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"VpsJoynrApi - provisioning - prod~",
+
+                                    ~"WorkshopProvisioningService - vps-prov - prod~",
+                                    ~"MQSession$FacadeMessageListener - vps-prov - prod~",
+                                    ~"MQSession$FacadeMessageListener - vps-trigger - prod~",
+                                    ~"VpsJoynrApi - vps-prov - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"vpsObtainProvisioningSync~",
+                            ~"Queue: PROV_TRIGGER_ACK-prod~",
+                            ~"Queue: PROV_TRIGGER_INTERNAL-prod~",
+                            ~"Queue: PROV_Trigger_IN-prod~",
+                            ~"Queue: PROV_ARCHIVE_IN-prod~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+
+                            ~"vpsObtainProvisioningSync~",
+                            ~"Queue: B2VPROD.BMW.B2V.PROV_TRIGGER_INTERNAL~",
+                            ~"Queue: B2VPROD.BMW.B2V.PROV_TRIGGER_IN~",
+                            ~"Queue: B2VPROD.BMW.CASA_CN.NOP_OUT~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~"
+                        )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(13))
+  EOT
+}
\ No newline at end of file
diff --git a/NA_PROD/dashboard/CD_nop_vdm_standard_E2E.tf b/NA_PROD/dashboard/CD_nop_vdm_standard_E2E.tf
new file mode 100644
index 00000000..3d43712e
--- /dev/null
+++ b/NA_PROD/dashboard/CD_nop_vdm_standard_E2E.tf
@@ -0,0 +1,50 @@
+# ID 9acf635b-ee8c-4bda-b937-788b5e68bb1f
+module CD_nop_vdm_standard_E2E {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_NOP - US E2E - VDM Standard Dashboard"
+  tag                = "nop"
+  environment        = "E2E"
+  managementZoneName = "CD_provisioning"
+  sloName            = "VDM - NOP - US E2E"
+  appId              = "APP-543"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-Provisioning(NOP)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                    fromRelationship.isServiceMethodOfService(
+                            type(~"SERVICE~"),entityName.in(
+                                ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                ~"ProvisioningService - provisioning - e2e~",
+                                ~"NOP-Provisioning (/nop-prov) - provisioning - e2e~",
+                                ~"MQSession$FacadeMessageListener - noptrigger - e2e~",
+                                ~"MQSession$FacadeMessageListener - nopprov - e2e~",
+                                ~"MQSession$FacadeMessageListener - noparchive - e2e~",
+                                ~"ProvisioningService - nopprov - e2e~",
+                                ~"NOP-Provisioning (/nop-prov) - nopprov - e2e~"
+                            )
+                    )
+                    ,entityName.in(
+                        ~"Queue: NOP_TRIGGER_INTERNAL-e2e~",
+                        ~"Queue: NOP_Trigger_IN-e2e~",
+                        ~"Queue: NOP_TRIGGER_ACK-e2e~",
+                        ~"Queue: NOP_ARCHIVE_IN-e2e~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~",
+                        ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
+                        ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_IN~",
+                        ~"Queue: B2VUSINT.BMW.B2VUS.NOP_TRIGGER_ACK_IN~",
+                        ~"Queue: B2VUSINT.BMW.B2VUS.NOP_ARCHIV_IN~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~"
+                    )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(15))
+  EOT
+}
\ No newline at end of file
diff --git a/NA_PROD/dashboard/CD_nop_vdm_standard_PROD.tf b/NA_PROD/dashboard/CD_nop_vdm_standard_PROD.tf
new file mode 100644
index 00000000..08fab420
--- /dev/null
+++ b/NA_PROD/dashboard/CD_nop_vdm_standard_PROD.tf
@@ -0,0 +1,50 @@
+# ID 4c072d5b-bf77-4c3a-acdd-2697b7149102
+module CD_nop_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_NOP - US PROD - VDM Standard Dashboard"
+  tag                = "nop"
+  environment        = "PROD"
+  managementZoneName = "CD_provisioning"
+  sloName            = "VDM - NOP - US PROD"
+  appId              = "APP-543"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-Provisioning(NOP)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                    fromRelationship.isServiceMethodOfService(
+                            type(~"SERVICE~"),entityName.in(
+                                ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                ~"TriggeringListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                ~"NopTriggerAckMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                ~"ProvProtocolMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                ~"ProvisioningService - provisioning - prod~",
+                                ~"NOP-Provisioning (/nop-prov) - provisioning - prod~",
+                                ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+                                ~"MQSession$FacadeMessageListener - nopprov - prod~",
+                                ~"MQSession$FacadeMessageListener - noparchive - prod~",
+                                ~"ProvisioningService - nopprov - prod~",
+                                ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
+                            )
+                    )
+                    ,entityName.in(
+                        ~"Queue: NOP_TRIGGER_INTERNAL-prod~",
+                        ~"Queue: NOP_Trigger_IN-prod~",
+                        ~"Queue: NOP_TRIGGER_ACK-prod~",
+                        ~"Queue: NOP_ARCHIVE_IN-prod~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~",
+                        ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
+                        ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_IN~",
+                        ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_ACK_IN~",
+                        ~"Queue: B2VUSPROD.BMW.B2VUS.NOP_ARCHIV_IN~",
+                        ~"getNOPProvisioningDataForVehicle~",
+                        ~"getNOPProvisioningDataForVehicleBase64~",
+                        ~"acknowledgeNOPProvisioningDownload~",
+                        ~"/nop-prov/v2/mainprov/prov.do~"
+                    )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(15))
+  EOT
+}
\ No newline at end of file
diff --git a/NA_PROD/dashboard/CD_nots_vdm_standard_E2E.tf b/NA_PROD/dashboard/CD_nots_vdm_standard_E2E.tf
new file mode 100644
index 00000000..314c11b2
--- /dev/null
+++ b/NA_PROD/dashboard/CD_nots_vdm_standard_E2E.tf
@@ -0,0 +1,27 @@
+# ID c44e94cb-2833-417f-ab53-f8f62f8bfc64
+module CD_nots_vdm_standard_E2E {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_NOTS - US E2E - VDM Standard Dashboard"
+  tag                = "b2v-nots"
+  environment        = "E2E"
+  managementZoneName = "CD_provisioning"
+  sloName            = "VDM - NOTS - US E2E"
+  appId              = "APP-17840"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/x/xzB-VQ#ReliabilityMeasurement-Provisioning(NOTS)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                fromRelationship.isServiceMethodOfService(
+                        type(~"SERVICE~"),entityName.in(
+                            ~"server (/nots) - provisioning - e2e~",
+                            ~"NotificationApiResource - provisioning - e2e~"
+                        )
+                )
+                ,entityName.in(
+                    ~"/nots/poll~",
+                    ~"notifyVehicles~"
+                )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(2))
+  EOT
+}
\ No newline at end of file
diff --git a/NA_PROD/dashboard/CD_nots_vdm_standard_PROD.tf b/NA_PROD/dashboard/CD_nots_vdm_standard_PROD.tf
new file mode 100644
index 00000000..35cf6c31
--- /dev/null
+++ b/NA_PROD/dashboard/CD_nots_vdm_standard_PROD.tf
@@ -0,0 +1,27 @@
+# ID 40da2cb9-8833-4cff-98b1-e5746ac5878c
+module CD_nots_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_NOTS - US PROD - VDM Standard Dashboard"
+  tag                = "b2v-nots"
+  environment        = "PROD"
+  managementZoneName = "CD_provisioning"
+  sloName            = "VDM - NOTS - US PROD"
+  appId              = "APP-17840"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/x/xzB-VQ#ReliabilityMeasurement-Provisioning(NOTS)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                fromRelationship.isServiceMethodOfService(
+                        type(~"SERVICE~"),entityName.in(
+                            ~"server (/nots) - provisioning - prod~",
+                            ~"NotificationApiResource - provisioning - prod~"
+                        )
+                )
+                ,entityName.in(
+                    ~"/nots/poll~",
+                    ~"notifyVehicles~"
+                )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(2))
+  EOT
+}
\ No newline at end of file
diff --git a/NA_PROD/dashboard/CD_vps_vdm_standard_E2E.tf b/NA_PROD/dashboard/CD_vps_vdm_standard_E2E.tf
new file mode 100644
index 00000000..98853390
--- /dev/null
+++ b/NA_PROD/dashboard/CD_vps_vdm_standard_E2E.tf
@@ -0,0 +1,47 @@
+# ID fea21bff-99b2-465a-b347-5a3ff8bd2deb
+module CD_vps_vdm_standard_E2E {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_VPS - US E2E - VDM Standard Dashboard"
+  tag                = "vps"
+  environment        = "E2E"
+  managementZoneName = "CD_provisioning"
+  sloName            = "VDM - VPS - US E2E"
+  appId              = "APP-17848"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-Provisioning(VPS)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"WorkshopProvisioningService - provisioning - e2e~",
+                                    ~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - e2e~",
+                                    ~"VpsJoynrApi - provisioning - e2e~",
+
+                                    ~"WorkshopProvisioningService - vps-prov - us~",
+                                    ~"MQSession$FacadeMessageListener - vps-prov - us~",
+                                    ~"MQSession$FacadeMessageListener - vps-trigger - us~",
+                                    ~"VpsJoynrApi - vps-prov - us~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"vpsObtainProvisioningSync~",
+                            ~"Queue: PROV_TRIGGER_ACK-e2e~",
+                            ~"Queue: PROV_TRIGGER_INTERNAL-e2e~",
+                            ~"Queue: PROV_Trigger_IN-e2e~",
+                            ~"Queue: PROV_ARCHIVE_IN-e2e~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+
+                            ~"vpsObtainProvisioningSync~",
+                            ~"Queue: B2VUSINT.BMW.B2VUS.PROV_TRIGGER_INTERNAL~",
+                            ~"Queue: B2VUSINT.BMW.B2VUS.PROV_TRIGGER_IN~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~"
+                        )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(12))
+  EOT
+}
\ No newline at end of file
diff --git a/NA_PROD/dashboard/CD_vps_vdm_standard_PROD.tf b/NA_PROD/dashboard/CD_vps_vdm_standard_PROD.tf
new file mode 100644
index 00000000..2cc23dc7
--- /dev/null
+++ b/NA_PROD/dashboard/CD_vps_vdm_standard_PROD.tf
@@ -0,0 +1,47 @@
+# ID 3637c620-ad68-419b-8395-e1c7a7a89c03
+module CD_vps_vdm_standard_PROD {
+
+  source = "../../_custom_modules/vdm_standard_dashboard"
+
+  dashboardName      = "CD_VPS - US PROD - VDM Standard Dashboard"
+  tag                = "vps"
+  environment        = "PROD"
+  managementZoneName = "CD_provisioning"
+  sloName            = "VDM - VPS - US PROD"
+  appId              = "APP-17848"
+  reliabilityLink    = "https://atc.bmwgroup.net/confluence/display/CDRVC/Reliability+Measurement#ReliabilityMeasurement-Provisioning(VPS)"
+
+  reliabilityMetricSelector = <<EOT
+    (100)-(builtin:service.keyRequest.errors.server.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                    ~"WorkshopProvisioningService - provisioning - prod~",
+                                    ~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+                                    ~"VpsJoynrApi - provisioning - prod~",
+
+                                    ~"WorkshopProvisioningService - vps-prov - us~",
+                                    ~"MQSession$FacadeMessageListener - vps-prov - us~",
+                                    ~"MQSession$FacadeMessageListener - vps-trigger - us~",
+                                    ~"VpsJoynrApi - vps-prov - us~"
+                                )
+                        )
+                        ,entityName.in(
+                            ~"vpsObtainProvisioningSync~",
+                            ~"Queue: PROV_TRIGGER_ACK-prod~",
+                            ~"Queue: PROV_TRIGGER_INTERNAL-prod~",
+                            ~"Queue: PROV_Trigger_IN-prod~",
+                            ~"Queue: PROV_ARCHIVE_IN-prod~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+
+                            ~"vpsObtainProvisioningSync~",
+                            ~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNAL~",
+                            ~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_IN~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+                            ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~"
+                        )"))))):splitBy():avg:auto:sort(value(avg,ascending)):limit(12))
+  EOT
+}
\ No newline at end of file
diff --git a/_custom_modules/vdm_standard_dashboard/_interface.tf b/_custom_modules/vdm_standard_dashboard/_interface.tf
index 3e880dcf..debda0f2 100644
--- a/_custom_modules/vdm_standard_dashboard/_interface.tf
+++ b/_custom_modules/vdm_standard_dashboard/_interface.tf
@@ -10,8 +10,12 @@ variable "sloName" { default = null }
 
 variable "appId" { default = "" }
 
+variable "appFilter" { default = null }
+
 variable "reliabilityLink" { default = "https://atc.bmwgroup.net/confluence/x/xzB-VQ" }
 
-variable "reliabilityOverTime" { default = "" }
+variable "reliabilityMetricSelector" { default = "" }
 
-variable "reliabilityPerKeyRequest" { default = "" }
\ No newline at end of file
+locals {
+  appFilter = var.appFilter != null ? var.appFilter : "app-id:${var.appId}"
+}
\ No newline at end of file
diff --git a/_custom_modules/vdm_standard_dashboard/vdm_standard_dashboard.tf b/_custom_modules/vdm_standard_dashboard/vdm_standard_dashboard.tf
index f5f95df8..c7599f5d 100644
--- a/_custom_modules/vdm_standard_dashboard/vdm_standard_dashboard.tf
+++ b/_custom_modules/vdm_standard_dashboard/vdm_standard_dashboard.tf
@@ -158,7 +158,7 @@ resource "dynatrace_dashboard" main {
           entity_type = "SERVICE"
           match {
             key    = "AUTO_TAGS"
-            values = ["Environment:${var.environment}", "app-id:${var.appId}"]
+            values = ["Environment:${var.environment}", local.appFilter]
           }
         }
       }
@@ -672,7 +672,7 @@ resource "dynatrace_dashboard" main {
             "id" : "A",
             "limit" : null,
             "metric" : null,
-            "metricSelector" : trimspace("${var.reliabilityOverTime}"),
+            "metricSelector" : trimspace(var.reliabilityMetricSelector),
             "rate" : "NONE",
             "sortBy" : null,
             "sortByDimension" : null,
@@ -789,7 +789,7 @@ resource "dynatrace_dashboard" main {
             "id" : "A",
             "limit" : null,
             "metric" : null,
-            "metricSelector" : trimspace("${var.reliabilityPerKeyRequest}"),
+            "metricSelector" : replace(trimspace(var.reliabilityMetricSelector), "splitBy()", "splitBy(\"dt.entity.service_method\")"),
             "rate" : "NONE",
             "sortBy" : null,
             "sortByDimension" : null,
@@ -891,7 +891,7 @@ resource "dynatrace_dashboard" main {
     tile_type                   = "DATA_EXPLORER"
     unknowns                    = jsonencode({
       "metricExpressions" : [
-        "resolution=null\u0026(builtin:service.response.time:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))))):splitBy():avg:auto:sort(value(avg,descending)):limit(10)):limit(100):names,(builtin:service.requestCount.total:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)):limit(100):names,(builtin:service.errors.total.count:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)):limit(100):names"
+        "resolution=null\u0026(builtin:service.response.time:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))))):splitBy():avg:auto:sort(value(avg,descending)):limit(10)):limit(100):names,(builtin:service.requestCount.total:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)):limit(100):names,(builtin:service.errors.total.count:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)):limit(100):names"
       ],
       "queries" : [
         {
@@ -903,7 +903,7 @@ resource "dynatrace_dashboard" main {
           "id" : "A",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:service.response.time:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))))):splitBy():avg:auto:sort(value(avg,descending)):limit(10)",
+          "metricSelector" : "builtin:service.response.time:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))))):splitBy():avg:auto:sort(value(avg,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -921,7 +921,7 @@ resource "dynatrace_dashboard" main {
           "id" : "B",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:service.requestCount.total:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)",
+          "metricSelector" : "builtin:service.requestCount.total:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -939,7 +939,7 @@ resource "dynatrace_dashboard" main {
           "id" : "C",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:service.errors.total.count:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)",
+          "metricSelector" : "builtin:service.errors.total.count:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -1105,7 +1105,7 @@ resource "dynatrace_dashboard" main {
     tile_type                   = "DATA_EXPLORER"
     unknowns                    = jsonencode({
       "metricExpressions" : [
-        "resolution=null\u0026(builtin:service.response.time:filter(and(in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"WEB_SERVICE~\")\")),and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\"))))):splitBy():avg:auto:sort(value(avg,descending)):limit(10)):limit(100):names,(builtin:service.requestCount.total:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\"))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"WEB_SERVICE~\")\")))):splitBy():value:auto:sort(value(sum,descending)):limit(10)):limit(100):names,(builtin:service.errors.total.count:filter(and(in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"WEB_SERVICE~\")\")),and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)):limit(100):names"
+        "resolution=null\u0026(builtin:service.response.time:filter(and(in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"WEB_SERVICE~\")\")),and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\"))))):splitBy():avg:auto:sort(value(avg,descending)):limit(10)):limit(100):names,(builtin:service.requestCount.total:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\"))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"WEB_SERVICE~\")\")))):splitBy():value:auto:sort(value(sum,descending)):limit(10)):limit(100):names,(builtin:service.errors.total.count:filter(and(in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"WEB_SERVICE~\")\")),and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)):limit(100):names"
       ],
       "queries" : [
         {
@@ -1117,7 +1117,7 @@ resource "dynatrace_dashboard" main {
           "id" : "A",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:service.response.time:filter(and(in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"WEB_SERVICE~\")\")),and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\"))))):splitBy():avg:auto:sort(value(avg,descending)):limit(10)",
+          "metricSelector" : "builtin:service.response.time:filter(and(in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"WEB_SERVICE~\")\")),and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\"))))):splitBy():avg:auto:sort(value(avg,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -1135,7 +1135,7 @@ resource "dynatrace_dashboard" main {
           "id" : "B",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:service.requestCount.total:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\"))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"WEB_SERVICE~\")\")))):splitBy():value:auto:sort(value(sum,descending)):limit(10)",
+          "metricSelector" : "builtin:service.requestCount.total:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\"))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"WEB_SERVICE~\")\")))):splitBy():value:auto:sort(value(sum,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -1153,7 +1153,7 @@ resource "dynatrace_dashboard" main {
           "id" : "C",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:service.errors.total.count:filter(and(in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"WEB_SERVICE~\")\")),and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)",
+          "metricSelector" : "builtin:service.errors.total.count:filter(and(in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"WEB_SERVICE~\")\")),and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -1319,7 +1319,7 @@ resource "dynatrace_dashboard" main {
     tile_type                   = "DATA_EXPLORER"
     unknowns                    = jsonencode({
       "metricExpressions" : [
-        "resolution=null\u0026(builtin:service.response.time:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),databaseName.exists(),toRelationship.calls(type(service),tag(~\"app-id:${var.appId}~\"))\")))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"DATABASE_SERVICE~\")\"))):splitBy():avg:auto:sort(value(avg,descending)):limit(10)):limit(100):names,(builtin:service.requestCount.total:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),databaseName.exists(),toRelationship.calls(type(service),tag(~\"app-id:${var.appId}~\"))\")))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"DATABASE_SERVICE~\")\"))):splitBy():value:auto:sort(value(sum,descending)):limit(10)):limit(100):names,(builtin:service.errors.total.count:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),databaseName.exists(),toRelationship.calls(type(service),tag(~\"app-id:${var.appId}~\"))\")))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"DATABASE_SERVICE~\")\"))):splitBy():value:auto:sort(value(sum,descending)):limit(10)):limit(100):names"
+        "resolution=null\u0026(builtin:service.response.time:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),databaseName.exists(),toRelationship.calls(type(service),tag(~\"${local.appFilter}~\"))\")))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"DATABASE_SERVICE~\")\"))):splitBy():avg:auto:sort(value(avg,descending)):limit(10)):limit(100):names,(builtin:service.requestCount.total:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),databaseName.exists(),toRelationship.calls(type(service),tag(~\"${local.appFilter}~\"))\")))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"DATABASE_SERVICE~\")\"))):splitBy():value:auto:sort(value(sum,descending)):limit(10)):limit(100):names,(builtin:service.errors.total.count:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),databaseName.exists(),toRelationship.calls(type(service),tag(~\"${local.appFilter}~\"))\")))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"DATABASE_SERVICE~\")\"))):splitBy():value:auto:sort(value(sum,descending)):limit(10)):limit(100):names"
       ],
       "queries" : [
         {
@@ -1331,7 +1331,7 @@ resource "dynatrace_dashboard" main {
           "id" : "A",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:service.response.time:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),databaseName.exists(),toRelationship.calls(type(service),tag(~\"app-id:${var.appId}~\"))\")))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"DATABASE_SERVICE~\")\"))):splitBy():avg:auto:sort(value(avg,descending)):limit(10)",
+          "metricSelector" : "builtin:service.response.time:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),databaseName.exists(),toRelationship.calls(type(service),tag(~\"${local.appFilter}~\"))\")))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"DATABASE_SERVICE~\")\"))):splitBy():avg:auto:sort(value(avg,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -1349,7 +1349,7 @@ resource "dynatrace_dashboard" main {
           "id" : "B",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:service.requestCount.total:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),databaseName.exists(),toRelationship.calls(type(service),tag(~\"app-id:${var.appId}~\"))\")))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"DATABASE_SERVICE~\")\"))):splitBy():value:auto:sort(value(sum,descending)):limit(10)",
+          "metricSelector" : "builtin:service.requestCount.total:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),databaseName.exists(),toRelationship.calls(type(service),tag(~\"${local.appFilter}~\"))\")))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"DATABASE_SERVICE~\")\"))):splitBy():value:auto:sort(value(sum,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -1367,7 +1367,7 @@ resource "dynatrace_dashboard" main {
           "id" : "C",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:service.errors.total.count:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),databaseName.exists(),toRelationship.calls(type(service),tag(~\"app-id:${var.appId}~\"))\")))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"DATABASE_SERVICE~\")\"))):splitBy():value:auto:sort(value(sum,descending)):limit(10)",
+          "metricSelector" : "builtin:service.errors.total.count:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),databaseName.exists(),toRelationship.calls(type(service),tag(~\"${local.appFilter}~\"))\")))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"DATABASE_SERVICE~\")\"))):splitBy():value:auto:sort(value(sum,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -1533,7 +1533,7 @@ resource "dynatrace_dashboard" main {
     tile_type                   = "DATA_EXPLORER"
     unknowns                    = jsonencode({
       "metricExpressions" : [
-        "resolution=null\u0026(builtin:service.response.time:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"MESSAGING_SERVICE~\")\")))):splitBy():avg:auto:sort(value(avg,descending)):limit(10)):limit(100):names,(builtin:service.requestCount.total:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"MESSAGING_SERVICE~\")\")))):splitBy():value:auto:sort(value(sum,descending)):limit(10)):limit(100):names,(builtin:service.errors.total.count:filter(and(in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"MESSAGING_SERVICE~\")\")),and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)):limit(100):names"
+        "resolution=null\u0026(builtin:service.response.time:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"MESSAGING_SERVICE~\")\")))):splitBy():avg:auto:sort(value(avg,descending)):limit(10)):limit(100):names,(builtin:service.requestCount.total:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"MESSAGING_SERVICE~\")\")))):splitBy():value:auto:sort(value(sum,descending)):limit(10)):limit(100):names,(builtin:service.errors.total.count:filter(and(in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"MESSAGING_SERVICE~\")\")),and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)):limit(100):names"
       ],
       "queries" : [
         {
@@ -1545,7 +1545,7 @@ resource "dynatrace_dashboard" main {
           "id" : "A",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:service.response.time:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"MESSAGING_SERVICE~\")\")))):splitBy():avg:auto:sort(value(avg,descending)):limit(10)",
+          "metricSelector" : "builtin:service.response.time:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"MESSAGING_SERVICE~\")\")))):splitBy():avg:auto:sort(value(avg,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -1563,7 +1563,7 @@ resource "dynatrace_dashboard" main {
           "id" : "B",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:service.requestCount.total:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"MESSAGING_SERVICE~\")\")))):splitBy():value:auto:sort(value(sum,descending)):limit(10)",
+          "metricSelector" : "builtin:service.requestCount.total:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))),in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"MESSAGING_SERVICE~\")\")))):splitBy():value:auto:sort(value(sum,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -1581,7 +1581,7 @@ resource "dynatrace_dashboard" main {
           "id" : "C",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:service.errors.total.count:filter(and(in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"MESSAGING_SERVICE~\")\")),and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)",
+          "metricSelector" : "builtin:service.errors.total.count:filter(and(in(\"dt.entity.service\",entitySelector(\"type(service),servicetype(~\"MESSAGING_SERVICE~\")\")),and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -1747,7 +1747,7 @@ resource "dynatrace_dashboard" main {
     tile_type                   = "DATA_EXPLORER"
     unknowns                    = jsonencode({
       "metricExpressions" : [
-        "resolution=null\u0026(builtin:service.errors.total.count:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))))):splitBy(\"dt.entity.service\"):value:auto:sort(value(sum,descending)):limit(10)):limit(100):names"
+        "resolution=null\u0026(builtin:service.errors.total.count:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))))):splitBy(\"dt.entity.service\"):value:auto:sort(value(sum,descending)):limit(10)):limit(100):names"
       ],
       "queries" : [
         {
@@ -1759,7 +1759,7 @@ resource "dynatrace_dashboard" main {
           "id" : "A",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:service.errors.total.count:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))))):splitBy(\"dt.entity.service\"):value:auto:sort(value(sum,descending)):limit(10)",
+          "metricSelector" : "builtin:service.errors.total.count:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))))):splitBy(\"dt.entity.service\"):value:auto:sort(value(sum,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -1876,7 +1876,7 @@ resource "dynatrace_dashboard" main {
     tile_type                   = "DATA_EXPLORER"
     unknowns                    = jsonencode({
       "metricExpressions" : [
-        "resolution=Inf\u0026(builtin:service.errors.total.count:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))))):splitBy(\"dt.entity.service\"):value:auto:sort(value(sum,descending)):limit(10)):limit(100):names"
+        "resolution=Inf\u0026(builtin:service.errors.total.count:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))))):splitBy(\"dt.entity.service\"):value:auto:sort(value(sum,descending)):limit(10)):limit(100):names"
       ],
       "queries" : [
         {
@@ -1888,7 +1888,7 @@ resource "dynatrace_dashboard" main {
           "id" : "A",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:service.errors.total.count:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"app-id:${var.appId}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))))):splitBy(\"dt.entity.service\"):value:auto:sort(value(sum,descending)):limit(10)",
+          "metricSelector" : "builtin:service.errors.total.count:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"${local.appFilter}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))))):splitBy(\"dt.entity.service\"):value:auto:sort(value(sum,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -1993,7 +1993,7 @@ resource "dynatrace_dashboard" main {
     tile_type                   = "DATA_EXPLORER"
     unknowns                    = jsonencode({
       "metricExpressions" : [
-        "resolution=null\u0026(builtin:host.cpu.usage:filter(and(and(in(\"dt.entity.host\",entitySelector(\"type(host),tag(~\"app-id:${var.appId}~\")\")),in(\"dt.entity.host\",entitySelector(\"type(host),tag(~\"Environment:${var.environment}~\")\"))))):splitBy(\"dt.entity.host\"):avg:auto:sort(value(avg,descending)):limit(10)):limit(100):names"
+        "resolution=null\u0026(builtin:host.cpu.usage:filter(and(and(in(\"dt.entity.host\",entitySelector(\"type(host),tag(~\"${local.appFilter}~\")\")),in(\"dt.entity.host\",entitySelector(\"type(host),tag(~\"Environment:${var.environment}~\")\"))))):splitBy(\"dt.entity.host\"):avg:auto:sort(value(avg,descending)):limit(10)):limit(100):names"
       ],
       "queries" : [
         {
@@ -2005,7 +2005,7 @@ resource "dynatrace_dashboard" main {
           "id" : "A",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:host.cpu.usage:filter(and(and(in(\"dt.entity.host\",entitySelector(\"type(host),tag(~\"app-id:${var.appId}~\")\")),in(\"dt.entity.host\",entitySelector(\"type(host),tag(~\"Environment:${var.environment}~\")\"))))):splitBy(\"dt.entity.host\"):avg:auto:sort(value(avg,descending)):limit(10)",
+          "metricSelector" : "builtin:host.cpu.usage:filter(and(and(in(\"dt.entity.host\",entitySelector(\"type(host),tag(~\"${local.appFilter}~\")\")),in(\"dt.entity.host\",entitySelector(\"type(host),tag(~\"Environment:${var.environment}~\")\"))))):splitBy(\"dt.entity.host\"):avg:auto:sort(value(avg,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -2127,7 +2127,7 @@ resource "dynatrace_dashboard" main {
     tile_type                   = "DATA_EXPLORER"
     unknowns                    = jsonencode({
       "metricExpressions" : [
-        "resolution=null\u0026(builtin:tech.jvm.memory.pool.max:filter(and(and(in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"app-id:${var.appId}~\")\"))))):splitBy():avg:auto:sort(value(avg,descending)):limit(10)):limit(100):names,(builtin:tech.jvm.memory.pool.used:filter(and(and(in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"app-id:${var.appId}~\")\"))))):splitBy(\"dt.entity.process_group_instance\"):avg:auto:sort(value(avg,descending)):limit(10)):limit(100):names"
+        "resolution=null\u0026(builtin:tech.jvm.memory.pool.max:filter(and(and(in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"${local.appFilter}~\")\"))))):splitBy():avg:auto:sort(value(avg,descending)):limit(10)):limit(100):names,(builtin:tech.jvm.memory.pool.used:filter(and(and(in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"${local.appFilter}~\")\"))))):splitBy(\"dt.entity.process_group_instance\"):avg:auto:sort(value(avg,descending)):limit(10)):limit(100):names"
       ],
       "queries" : [
         {
@@ -2139,7 +2139,7 @@ resource "dynatrace_dashboard" main {
           "id" : "A",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:tech.jvm.memory.pool.max:filter(and(and(in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"app-id:${var.appId}~\")\"))))):splitBy():avg:auto:sort(value(avg,descending)):limit(10)",
+          "metricSelector" : "builtin:tech.jvm.memory.pool.max:filter(and(and(in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"${local.appFilter}~\")\"))))):splitBy():avg:auto:sort(value(avg,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -2157,7 +2157,7 @@ resource "dynatrace_dashboard" main {
           "id" : "B",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:tech.jvm.memory.pool.used:filter(and(and(in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"app-id:${var.appId}~\")\"))))):splitBy(\"dt.entity.process_group_instance\"):avg:auto:sort(value(avg,descending)):limit(10)",
+          "metricSelector" : "builtin:tech.jvm.memory.pool.used:filter(and(and(in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"${local.appFilter}~\")\"))))):splitBy(\"dt.entity.process_group_instance\"):avg:auto:sort(value(avg,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -2291,7 +2291,7 @@ resource "dynatrace_dashboard" main {
     tile_type                   = "DATA_EXPLORER"
     unknowns                    = jsonencode({
       "metricExpressions" : [
-        "resolution=null\u0026(builtin:tech.jvm.memory.gc.suspensionTime:filter(and(and(in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"app-id:${var.appId}~\")\")),in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"Environment:${var.environment}~\")\"))))):splitBy(\"dt.entity.process_group_instance\"):avg:auto:sort(value(avg,descending)):limit(10)):limit(100):names"
+        "resolution=null\u0026(builtin:tech.jvm.memory.gc.suspensionTime:filter(and(and(in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"${local.appFilter}~\")\")),in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"Environment:${var.environment}~\")\"))))):splitBy(\"dt.entity.process_group_instance\"):avg:auto:sort(value(avg,descending)):limit(10)):limit(100):names"
       ],
       "queries" : [
         {
@@ -2303,7 +2303,7 @@ resource "dynatrace_dashboard" main {
           "id" : "A",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:tech.jvm.memory.gc.suspensionTime:filter(and(and(in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"app-id:${var.appId}~\")\")),in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"Environment:${var.environment}~\")\"))))):splitBy(\"dt.entity.process_group_instance\"):avg:auto:sort(value(avg,descending)):limit(10)",
+          "metricSelector" : "builtin:tech.jvm.memory.gc.suspensionTime:filter(and(and(in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"${local.appFilter}~\")\")),in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"Environment:${var.environment}~\")\"))))):splitBy(\"dt.entity.process_group_instance\"):avg:auto:sort(value(avg,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -2425,7 +2425,7 @@ resource "dynatrace_dashboard" main {
     tile_type                   = "DATA_EXPLORER"
     unknowns                    = jsonencode({
       "metricExpressions" : [
-        "resolution=null\u0026(builtin:service.dbconnections.success:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),databaseName.exists(),toRelationship.calls(type(service),tag(~\"app-id:${var.appId}~\"))\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)):limit(100):names,(builtin:service.dbconnections.failure:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),databaseName.exists(),toRelationship.calls(type(service),tag(~\"app-id:${var.appId}~\"))\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)):limit(100):names"
+        "resolution=null\u0026(builtin:service.dbconnections.success:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),databaseName.exists(),toRelationship.calls(type(service),tag(~\"${local.appFilter}~\"))\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)):limit(100):names,(builtin:service.dbconnections.failure:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),databaseName.exists(),toRelationship.calls(type(service),tag(~\"${local.appFilter}~\"))\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)):limit(100):names"
       ],
       "queries" : [
         {
@@ -2437,7 +2437,7 @@ resource "dynatrace_dashboard" main {
           "id" : "A",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:service.dbconnections.success:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),databaseName.exists(),toRelationship.calls(type(service),tag(~\"app-id:${var.appId}~\"))\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)",
+          "metricSelector" : "builtin:service.dbconnections.success:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.service\",entitySelector(\"type(service),databaseName.exists(),toRelationship.calls(type(service),tag(~\"${local.appFilter}~\"))\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -2455,7 +2455,7 @@ resource "dynatrace_dashboard" main {
           "id" : "B",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:service.dbconnections.failure:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),databaseName.exists(),toRelationship.calls(type(service),tag(~\"app-id:${var.appId}~\"))\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)",
+          "metricSelector" : "builtin:service.dbconnections.failure:filter(and(and(in(\"dt.entity.service\",entitySelector(\"type(service),databaseName.exists(),toRelationship.calls(type(service),tag(~\"${local.appFilter}~\"))\")),in(\"dt.entity.service\",entitySelector(\"type(service),tag(~\"Environment:${var.environment}~\")\"))))):splitBy():value:auto:sort(value(sum,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -2594,7 +2594,7 @@ resource "dynatrace_dashboard" main {
     tile_type                   = "DATA_EXPLORER"
     unknowns                    = jsonencode({
       "metricExpressions" : [
-        "resolution=null\u0026(builtin:tech.jvm.threads.avgActiveThreadCount:filter(and(and(in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"app-id:${var.appId}~\")\")),in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"Environment:${var.environment}~\")\"))))):splitBy(\"dt.entity.process_group_instance\"):avg:auto:sort(value(avg,descending)):limit(10)):limit(100):names"
+        "resolution=null\u0026(builtin:tech.jvm.threads.avgActiveThreadCount:filter(and(and(in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"${local.appFilter}~\")\")),in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"Environment:${var.environment}~\")\"))))):splitBy(\"dt.entity.process_group_instance\"):avg:auto:sort(value(avg,descending)):limit(10)):limit(100):names"
       ],
       "queries" : [
         {
@@ -2606,7 +2606,7 @@ resource "dynatrace_dashboard" main {
           "id" : "A",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:tech.jvm.threads.avgActiveThreadCount:filter(and(and(in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"app-id:${var.appId}~\")\")),in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"Environment:${var.environment}~\")\"))))):splitBy(\"dt.entity.process_group_instance\"):avg:auto:sort(value(avg,descending)):limit(10)",
+          "metricSelector" : "builtin:tech.jvm.threads.avgActiveThreadCount:filter(and(and(in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"${local.appFilter}~\")\")),in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"Environment:${var.environment}~\")\"))))):splitBy(\"dt.entity.process_group_instance\"):avg:auto:sort(value(avg,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,
@@ -2723,7 +2723,7 @@ resource "dynatrace_dashboard" main {
     tile_type                   = "DATA_EXPLORER"
     unknowns                    = jsonencode({
       "metricExpressions" : [
-        "resolution=null\u0026(builtin:tech.jvm.threads.avgActiveThreadCount:filter(and(and(in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"app-id:${var.appId}~\")\"))))):splitBy(\"Thread state\"):avg:auto:sort(value(avg,descending)):limit(10)):limit(100):names"
+        "resolution=null\u0026(builtin:tech.jvm.threads.avgActiveThreadCount:filter(and(and(in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"${local.appFilter}~\")\"))))):splitBy(\"Thread state\"):avg:auto:sort(value(avg,descending)):limit(10)):limit(100):names"
       ],
       "queries" : [
         {
@@ -2735,7 +2735,7 @@ resource "dynatrace_dashboard" main {
           "id" : "A",
           "limit" : null,
           "metric" : null,
-          "metricSelector" : "builtin:tech.jvm.threads.avgActiveThreadCount:filter(and(and(in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"app-id:${var.appId}~\")\"))))):splitBy(\"Thread state\"):avg:auto:sort(value(avg,descending)):limit(10)",
+          "metricSelector" : "builtin:tech.jvm.threads.avgActiveThreadCount:filter(and(and(in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"Environment:${var.environment}~\")\")),in(\"dt.entity.process_group_instance\",entitySelector(\"type(process_group_instance),tag(~\"${local.appFilter}~\")\"))))):splitBy(\"Thread state\"):avg:auto:sort(value(avg,descending)):limit(10)",
           "rate" : "NONE",
           "sortBy" : null,
           "sortByDimension" : null,