diff --git a/EMEA_PROD/slo/Wirkkette__Login__-_Reliability_of_key_requests.tf b/EMEA_PROD/slo/Wirkkette__Login__-_Reliability_of_key_requests.tf
index 723ab2d..b749215 100644
--- a/EMEA_PROD/slo/Wirkkette__Login__-_Reliability_of_key_requests.tf
+++ b/EMEA_PROD/slo/Wirkkette__Login__-_Reliability_of_key_requests.tf
@@ -10,11 +10,24 @@ module Wirkkette__Login__-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-6858B9373C1B3C9A\",\"SERVICE_METHOD-1313A2ED47A33278\",\"SERVICE_METHOD-E8483228CE13A2AE\")" 
+    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.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), 
+                        fromRelationship.isServiceMethodOfService(
+                            type(~"SERVICE~"),entityName.in(
+                                ~"btc-user-composite-service - PROD~",
+                                ~"btc-connected-oauth-service - PROD~"
+                                )
+                        )
+                        ,entityName.in(
+                                ~"GET /api/v1/presentation/oauth/config~",
+                                ~"GET /api/v1/presentation/profile-tab~",
+                                ~"POST /api/v1/oauth/token/identifier~"
+                                )"))))):splitBy())
+    EOT
  
 
     #if not set (removed) it's defaulted to "-1d" 
diff --git a/NA_PROD/slo/Wirkkette__Login__-_Reliability_of_key_requests.tf b/NA_PROD/slo/Wirkkette__Login__-_Reliability_of_key_requests.tf
index bf8800c..2cce8fb 100644
--- a/NA_PROD/slo/Wirkkette__Login__-_Reliability_of_key_requests.tf
+++ b/NA_PROD/slo/Wirkkette__Login__-_Reliability_of_key_requests.tf
@@ -10,12 +10,25 @@ module Wirkkette__Login__-_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-815317A2EE6C6431\",\"SERVICE_METHOD-4CF61F6E154C4163\",\"SERVICE_METHOD-63D160475CF45F7B\")" 
+    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.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), 
+                        fromRelationship.isServiceMethodOfService(
+                            type(~"SERVICE~"),entityName.in(
+                                ~"btc-user-composite-service - PROD~",
+                                ~"btc-connected-oauth-service - PROD~"
+                                )
+                        )
+                        ,entityName.in(
+                                ~"GET /api/v1/presentation/oauth/config~",
+                                ~"GET /api/v1/presentation/profile-tab~",
+                                ~"POST /api/v1/oauth/token/identifier~"
+                                )"))))):splitBy())
+
+    EOT
 
     #if not set (removed) it's defaulted to "-1d" 
     timeframe                   = "-1d"