diff --git a/CN_PROD/slo/Wirkkette_Podcast_Services_Reliability_of_key_requests.tf b/CN_PROD/slo/Wirkkette_Podcast_Services_Reliability_of_key_requests.tf
index ef08fa1..566d015 100644
--- a/CN_PROD/slo/Wirkkette_Podcast_Services_Reliability_of_key_requests.tf
+++ b/CN_PROD/slo/Wirkkette_Podcast_Services_Reliability_of_key_requests.tf
@@ -10,11 +10,33 @@ module Wirkkette_Podcast_Services_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(SERVICE_METHOD), entityId(\"SERVICE_METHOD-CA79CA63D67DD3C2\",\"SERVICE_METHOD-679EA58E13501E31\",\"SERVICE_METHOD-FB074B8FDBE7B565\",\"SERVICE_METHOD-B45D201697914389\",\"SERVICE_METHOD-CCFCB876D2B2A423\",\"SERVICE_METHOD-01F2B893066F58DA\",\"SERVICE_METHOD-E5162E43721BE186\",\"SERVICE_METHOD-E52D1F8C4D867A90\")" 
+    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.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
+                        fromRelationship.isServiceMethodOfService(
+                                type(~"SERVICE~"),entityName.in(
+                                        ~"XimalayaContentApi - avs~",
+                                        ~"XimalayaLoginApi - avs~",
+                                        ~"XimalayaOpenContentApi - avs~",
+                                        ~"XimalayaPersonalApi - avs~",
+                                        ~"XimalayaSearchApi - avs~"
+                                )
+                        )
+                        ,entityName.in(
+                                        ~"getAudio~",
+                                        ~"getExploreContent~",
+                                        ~"getTracksOfAlbum~",
+                                        ~"getDeviceId~",
+                                        ~"getImage~",
+                                        ~"getOneClickChannelCover~",
+                                        ~"getSubscribedAlbums~",
+                                        ~"search~"
+                        )"))))):splitBy())
+
+    EOT 
  
 
     #if not set (removed) it's defaulted to "-1d" 
@@ -25,9 +47,7 @@ module Wirkkette_Podcast_Services_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_Podcast_Services_Reliability_of_key_requests.tf b/EMEA_PROD/slo/Wirkkette_Podcast_Services_Reliability_of_key_requests.tf
index 7f0c6f7..54ceb62 100644
--- a/EMEA_PROD/slo/Wirkkette_Podcast_Services_Reliability_of_key_requests.tf
+++ b/EMEA_PROD/slo/Wirkkette_Podcast_Services_Reliability_of_key_requests.tf
@@ -10,11 +10,31 @@ module Wirkkette_Podcast_Services_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(\"SERVICE_METHOD\")" 
+    filter                      = "" 
             
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(in(\"dt.entity.service_method\",entitySelector(\"type(service_method),entityId(~\"SERVICE_METHOD-67A6D0075DE9646D~\",~\"SERVICE_METHOD-6C0D31A647BEE7DE~\",~\"SERVICE_METHOD-900C3BE626671A2E~\",~\"SERVICE_METHOD-C23264C72CE4DEA9~\",~\"SERVICE_METHOD-F88E55DE8D43B27C~\",~\"SERVICE_METHOD-86A201652BC468DA~\",~\"SERVICE_METHOD-B8EDFBA29D3C0874~\",~\"SERVICE_METHOD-7662F6848B6484AB~\")\")))):splitBy():avg:auto:sort(value(avg,descending)))/(builtin:service.keyRequest.count.server:filter(and(in(\"dt.entity.service_method\",entitySelector(\"type(service_method),entityId(~\"SERVICE_METHOD-67A6D0075DE9646D~\",~\"SERVICE_METHOD-6C0D31A647BEE7DE~\",~\"SERVICE_METHOD-900C3BE626671A2E~\",~\"SERVICE_METHOD-C23264C72CE4DEA9~\",~\"SERVICE_METHOD-F88E55DE8D43B27C~\",~\"SERVICE_METHOD-86A201652BC468DA~\",~\"SERVICE_METHOD-B8EDFBA29D3C0874~\",~\"SERVICE_METHOD-7662F6848B6484AB~\")\")))):splitBy():avg:auto:sort(value(avg,descending))))"
+    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(
+                                        ~"UserApi - ccis - prod~",
+                                        ~"EpisodeApi - ccis - prod~",
+                                        ~"DownloadApi - ccis - prod~",
+                                        ~"CategoryApi - ccis - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                                        ~"getUser~",
+                                        ~"createUser~",
+                                        ~"deleteUser~",
+                                        ~"getFlashEpisode~",
+                                        ~"getEpisodes~",
+                                        ~"download~",
+                                        ~"getUserCategories~",
+                                        ~"muteCategories~"
+                        )"))))):splitBy())
+    EOT
 
  
     #if not set (removed) it's defaulted to "-1d" 
@@ -25,9 +45,7 @@ module Wirkkette_Podcast_Services_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_Podcast_Services_Reliability_of_key_requests.tf b/NA_PROD/slo/Wirkkette_Podcast_Services_Reliability_of_key_requests.tf
index b86e33a..1c24e80 100644
--- a/NA_PROD/slo/Wirkkette_Podcast_Services_Reliability_of_key_requests.tf
+++ b/NA_PROD/slo/Wirkkette_Podcast_Services_Reliability_of_key_requests.tf
@@ -10,11 +10,32 @@ module Wirkkette_Podcast_Services_Reliability_of_key_requests {
     
     
     #entity selector object 
-    filter                      = "type(\"SERVICE_METHOD\")" 
+    filter                      = "" 
             
 
     #metric expression of the calculation as done in data explorer ui
-    metric_expression           = "(100)*((1)-(builtin:service.keyRequest.errors.fivexx.count:filter(and(in(\"dt.entity.service_method\",entitySelector(\"type(service_method),entityId(~\"SERVICE_METHOD-5345B0560737C694~\",~\"SERVICE_METHOD-4E3118466CEF79A4~\",~\"SERVICE_METHOD-B962971C203739F3~\",~\"SERVICE_METHOD-71714CEF7FD73537~\",~\"SERVICE_METHOD-27BCE96DFD1BB0D9~\",~\"SERVICE_METHOD-6EB5AA6F50FA9B7B~\",~\"SERVICE_METHOD-BAE8FD0CD2F691CB~\",~\"SERVICE_METHOD-BA66A39F27DF2DBA~\")\")))):splitBy():avg:auto:sort(value(avg,descending)))/(builtin:service.keyRequest.count.server:filter(and(in(\"dt.entity.service_method\",entitySelector(\"type(service_method),entityId(~\"SERVICE_METHOD-5345B0560737C694~\",~\"SERVICE_METHOD-4E3118466CEF79A4~\",~\"SERVICE_METHOD-B962971C203739F3~\",~\"SERVICE_METHOD-71714CEF7FD73537~\",~\"SERVICE_METHOD-27BCE96DFD1BB0D9~\",~\"SERVICE_METHOD-6EB5AA6F50FA9B7B~\",~\"SERVICE_METHOD-BAE8FD0CD2F691CB~\",~\"SERVICE_METHOD-BA66A39F27DF2DBA~\")\")))):splitBy():avg:auto:sort(value(avg,descending))))"
+    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(
+                                        ~"UserApi - ccis - prod~",
+                                        ~"EpisodeApi - ccis - prod~",
+                                        ~"DownloadApi - ccis - prod~",
+                                        ~"CategoryApi - ccis - prod~"
+                                )
+                        )
+                        ,entityName.in(
+                                        ~"getUser~",
+                                        ~"createUser~",
+                                        ~"deleteUser~",
+                                        ~"getFlashEpisode~",
+                                        ~"getEpisodes~",
+                                        ~"download~",
+                                        ~"getUserCategories~",
+                                        ~"muteCategories~"
+                        )"))))):splitBy())
+
+    EOT
  
 
     #if not set (removed) it's defaulted to "-1d" 
@@ -25,9 +46,7 @@ module Wirkkette_Podcast_Services_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
     
 }