diff --git a/CN_PROD/slo/Wirkkette__RSU__-_Reliability_of_key_requests.tf b/CN_PROD/slo/Wirkkette__RSU__-_Reliability_of_key_requests.tf
index 9e3f998..b7de3c6 100644
--- a/CN_PROD/slo/Wirkkette__RSU__-_Reliability_of_key_requests.tf
+++ b/CN_PROD/slo/Wirkkette__RSU__-_Reliability_of_key_requests.tf
@@ -10,12 +10,58 @@ module Wirkkette__RSU__-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-377E4E1ABDDB99D8\",\"SERVICE_METHOD-68DAAEF95DD2FAAE\",\"SERVICE_METHOD-BFABC791A0681CB5\",\"SERVICE_METHOD-36A7BE9A88451E76\",\"SERVICE_METHOD-A965F7F2B2B9089B\",\"SERVICE_METHOD-3DE7492449C0C534\",\"SERVICE_METHOD-E852026F09F006AC\",\"SERVICE_METHOD-A1A6107CF8782AD0\",\"SERVICE_METHOD-58B150DCF684E386\",\"SERVICE_METHOD-77A9E64812520490\")" 
+    filter                      = "" 
     
             
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*(builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy())" 
+    metric_expression           = <<EOT
+        (100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+			fromRelationship.isServiceMethodOfService(
+				type(~"SERVICE~"),entityName.in(
+                                        ~"UpdateRequestResource - rsu - prod~",
+                                        ~"UpdateManifestResource - rsu - prod~",
+                                        ~"SendReportResource - rsu - prod~",
+                                        ~"MessageEndpointProxy - rsu - prod~"
+                                )
+			)
+			,entityName.in(
+                                ~"askForUpdate~",
+                                ~"askForUpdateManifest~",
+                                ~"sendReport~",
+                                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
+                                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
+                                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
+                                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
+                                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
+                                ~"Queue: BMW.RSU.RSA_PIPELINE~",
+                                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
+                                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~"
+                                )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+			fromRelationship.isServiceMethodOfService(
+				type(~"SERVICE~"),entityName.in(
+                                        ~"UpdateRequestResource - rsu - prod~",
+                                        ~"UpdateManifestResource - rsu - prod~",
+                                        ~"SendReportResource - rsu - prod~",
+                                        ~"MessageEndpointProxy - rsu - prod~"
+                                )
+			)
+			,entityName.in(
+				~"askForUpdate~",
+                                ~"askForUpdateManifest~",
+                                ~"sendReport~",
+                                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
+                                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
+                                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
+                                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
+                                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
+                                ~"Queue: BMW.RSU.RSA_PIPELINE~",
+                                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
+                                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~"
+                                )"))))):splitBy()))
+    EOT
  
 
     #if not set (removed) it's defaulted to "-1d" 
@@ -26,9 +72,7 @@ module Wirkkette__RSU__-_Reliability_of_key_requests {
     evaluation                  = "AGGREGATE"           
 
     #Target and warning percentage of the SLO as double
-    target                      = 98 
-            #if not set(removed) it's defaulted to 98
-    warning                     = 99 
-           #if not set(removed) it's defaulted to 99
+    target                      = 98            #if not set(removed) it's defaulted to 98
+    warning                     = 99            #if not set(removed) it's defaulted to 99
     
 }
\ No newline at end of file
diff --git a/EMEA_PROD/slo/Wirkkette__RSU__-_Reliability_of_key_requests.tf b/EMEA_PROD/slo/Wirkkette__RSU__-_Reliability_of_key_requests.tf
index c3a86d9..1cc7028 100644
--- a/EMEA_PROD/slo/Wirkkette__RSU__-_Reliability_of_key_requests.tf
+++ b/EMEA_PROD/slo/Wirkkette__RSU__-_Reliability_of_key_requests.tf
@@ -10,12 +10,56 @@ module Wirkkette__RSU__-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-D326B245FDB9D1ED\",\"SERVICE_METHOD-9302D3E7A92ADDFA\",\"SERVICE_METHOD-906DE650C315D350\",\"SERVICE_METHOD-D8A1844CE8071821\",\"SERVICE_METHOD-0DA998BAE52F2411\",\"SERVICE_METHOD-A4E2775F8C482FAA\",\"SERVICE_METHOD-134EDF22BE9DD08C\",\"SERVICE_METHOD-F88AA0117B1EAFE8\",\"SERVICE_METHOD-66102B135997AC0F\",\"SERVICE_METHOD-09E14021A51BFE1E\",\"SERVICE_METHOD-2C35BCA5F6C89C41\")" 
-    #filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-360C23BA44FD151A\",\"SERVICE_METHOD-9AF7A9302E71A3BE\",\"SERVICE_METHOD-BC4D2349C378287A\",\"SERVICE_METHOD-DD5CDB7B683E508E\",\"SERVICE_METHOD-BBD8F64F76C87670\",\"SERVICE_METHOD-674F670A27DDAB92\",\"SERVICE_METHOD-892AFAED1C4C45C2\",\"SERVICE_METHOD-7B91EB6EF6AAABD0\",\"SERVICE_METHOD-C291996956CD2A5E\",\"SERVICE_METHOD-A96EF549D37C4AD7\",\"SERVICE_METHOD-BDCD96EFA6AFF21F\")" 
-            
+    filter                      = ""             
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*(builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy())" 
+    metric_expression           = <<EOT
+        (100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+			fromRelationship.isServiceMethodOfService(
+				type(~"SERVICE~"),entityName.in(
+                                        ~"UpdateRequestResource - rsu - prod~",
+                                        ~"UpdateManifestResource - rsu - prod~",
+                                        ~"SendReportResource~",
+                                        ~"MessageEndpointProxy - rsu - prod~"	
+                                )
+			)
+			,entityName.in(
+				~"askForUpdate~",
+                                ~"askForUpdateManifest~",
+                                ~"sendReport~",
+                                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
+                                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
+                                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
+                                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~",
+                                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
+                                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
+                                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
+                                ~"Queue: BMW.RSU.RSA_PIPELINE~"
+                                )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+		        fromRelationship.isServiceMethodOfService(
+			        type(~"SERVICE~"),entityName.in(
+                                        ~"UpdateRequestResource - rsu - prod~",
+                                        ~"UpdateManifestResource - rsu - prod~",
+                                        ~"SendReportResource~",
+                                        ~"MessageEndpointProxy - rsu - prod~"
+                                )
+			)
+			,entityName.in(
+				~"askForUpdate~",
+                                ~"askForUpdateManifest~",
+                                ~"sendReport~",
+                                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
+                                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
+                                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
+                                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~",
+                                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
+                                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
+                                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
+                                ~"Queue: BMW.RSU.RSA_PIPELINE~"
+				)"))))):splitBy()))
+    EOT 
  
 
     #if not set (removed) it's defaulted to "-1d" 
@@ -26,9 +70,7 @@ module Wirkkette__RSU__-_Reliability_of_key_requests {
     evaluation                  = "AGGREGATE"           
 
     #Target and warning percentage of the SLO as double
-    target                      = 98 
-            #if not set(removed) it's defaulted to 98
-    warning                     = 99 
-           #if not set(removed) it's defaulted to 99
+    target                      = 98            #if not set(removed) it's defaulted to 98
+    warning                     = 99            #if not set(removed) it's defaulted to 99
     
 }
\ No newline at end of file
diff --git a/NA_PROD/slo/Wirkkette__RSU__-_Reliability_of_key_requests.tf b/NA_PROD/slo/Wirkkette__RSU__-_Reliability_of_key_requests.tf
index e374acc..d003f56 100644
--- a/NA_PROD/slo/Wirkkette__RSU__-_Reliability_of_key_requests.tf
+++ b/NA_PROD/slo/Wirkkette__RSU__-_Reliability_of_key_requests.tf
@@ -10,11 +10,57 @@ module Wirkkette__RSU__-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-6860EF7FE7E8C9C3\",\"SERVICE_METHOD-C2344A4CB98BEEEB\",\"SERVICE_METHOD-BDAEB2DCCD300CD3\",\"SERVICE_METHOD-11049CE6B5E3B03F\",\"SERVICE_METHOD-79A0EEF7ECB1818A\",\"SERVICE_METHOD-BC753BA99698B5DD\",\"SERVICE_METHOD-9BBF50FD19051A12\",\"SERVICE_METHOD-A0DBC32A08EBE5E1\",\"SERVICE_METHOD-7D3786B7658309D2\",\"SERVICE_METHOD-E0D0EF56C0E8141C\",\"SERVICE_METHOD-4711361A434C11E8\")" 
+    filter                      = ""
             
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*(builtin:service.keyRequest.errors.server.successCount:splitBy())/(builtin:service.keyRequest.count.server:splitBy())" 
+    metric_expression           = <<EOT
+        (100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+			fromRelationship.isServiceMethodOfService(
+				type(~"SERVICE~"),entityName.in(
+                                        ~"UpdateRequestResource - rsu - prod~",
+                                        ~"UpdateManifestResource - rsu - prod~",
+                                        ~"SendReportResource - rsu - prod~",
+                                        ~"MessageEndpointProxy - rsu - prod~"
+                                )
+			)
+			,entityName.in(
+                                ~"askForUpdate~",
+                                ~"askForUpdateManifest~",
+                                ~"sendReport~",
+                                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
+                                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
+                                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
+                                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
+                                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
+                                ~"Queue: BMW.RSU.RSA_PIPELINE~",
+                                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
+                                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~"
+                                )"))))):splitBy())
+	/
+	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+		        fromRelationship.isServiceMethodOfService(
+			        type(~"SERVICE~"),entityName.in(
+                                        ~"UpdateRequestResource - rsu - prod~",
+                                        ~"UpdateManifestResource - rsu - prod~",
+                                        ~"SendReportResource - rsu - prod~",
+                                        ~"MessageEndpointProxy - rsu - prod~"
+                                )
+			)
+			,entityName.in(
+				~"askForUpdate~",
+                                ~"askForUpdateManifest~",
+                                ~"sendReport~",
+                                ~"Queue: BMW.RSU.ZFUS_MPG_OUTPUT~",
+                                ~"Queue: BMW.RSU.DEC_VEHICLE_REQUEST.ASBC_TO_RSA~",
+                                ~"Queue: BMW.RSU.UPDATEMANIFEST.ZFUS_TO_RSA~",
+                                ~"Queue: BMW.RSU.ENC_UPDATEMANIFEST.ASBC_TO_RSA~",
+                                ~"Queue: BMW.RSU.VEHICLE_TRIGGER~",
+                                ~"Queue: BMW.RSU.RSA_PIPELINE~",
+                                ~"Queue: BMW.RSU.RN.RNB_TO_RSA~",
+                                ~"Queue: BMW.RSA.VEHICLE_MESSAGES~"
+                                )"))))):splitBy()))
+    EOT 
  
 
     #if not set (removed) it's defaulted to "-1d" 
@@ -25,9 +71,7 @@ module Wirkkette__RSU__-_Reliability_of_key_requests {
     evaluation                  = "AGGREGATE"           
 
     #Target and warning percentage of the SLO as double
-    target                      = 98 
-            #if not set(removed) it's defaulted to 98
-    warning                     = 99 
-           #if not set(removed) it's defaulted to 99
+    target                      = 98            #if not set(removed) it's defaulted to 98
+    warning                     = 99            #if not set(removed) it's defaulted to 99
     
 }
\ No newline at end of file