diff --git a/CN_PROD/slo/TP_Vehicle_CD_Store.tf b/CN_PROD/slo/TP_Vehicle_CD_Store.tf
index 57fd596..a5f67c7 100644
--- a/CN_PROD/slo/TP_Vehicle_CD_Store.tf
+++ b/CN_PROD/slo/TP_Vehicle_CD_Store.tf
@@ -17,14 +17,12 @@ module TP_Vehicle_CD_Store {
 (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(in("dt.entity.service_method",entitySelector("type(service_method), 
 fromRelationship.isServiceMethodOfService(
                             type(~"SERVICE~"),entityName.in(
-                                ~"StoreOfferResourceV6 - am-store - prod~",
-								~"CdStoreOfferResource - am-store - prod~"
+                                ~"CdStoreOfferResource - cdse - prod~",
+								~"CdStoreOfferResourceV2 - cdse - prod~"
                                 )
                         )
                     ,entityName.in(
-                        ~"getOffersAndPortfolio~",
-						~"bookedAndBookableCDServices~",
-                        ~"bookedAndBookableCDServices 1~"
+						~"bookedAndBookableCDServices~"
                         )")))):splitBy())
 
 EOT
diff --git a/CN_PROD/slo/Wirkkette_Connected_Drive_Store_Mobile_Reliability_of_key_requests.tf b/CN_PROD/slo/Wirkkette_Connected_Drive_Store_Mobile_Reliability_of_key_requests.tf
index 03afefa..f2f9404 100644
--- a/CN_PROD/slo/Wirkkette_Connected_Drive_Store_Mobile_Reliability_of_key_requests.tf
+++ b/CN_PROD/slo/Wirkkette_Connected_Drive_Store_Mobile_Reliability_of_key_requests.tf
@@ -14,18 +14,16 @@ module Wirkkette_Connected_Drive_Store_Mobile_Reliability_of_key_requests {
 
     #metric expression of the calculation as done in data explorer ui
     metric_expression           = <<-EOT
-(100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method), 
+(100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(in("dt.entity.service_method",entitySelector("type(service_method), 
 fromRelationship.isServiceMethodOfService(
                             type(~"SERVICE~"),entityName.in(
-                                ~"StoreOfferResourceV6 - am-store - prod~",
-								~"CdStoreOfferResource - am-store - prod~"
+                                ~"CdStoreOfferResource - cdse - prod~",
+								~"CdStoreOfferResourceV2 - cdse - prod~"
                                 )
                         )
                     ,entityName.in(
-                        ~"getOffersAndPortfolio~",
-                        ~"bookedAndBookableCDServices~",
-                        ~"bookedAndBookableCDServices 1~"
-                        )"))))):splitBy())
+						~"bookedAndBookableCDServices~"
+                        )")))):splitBy())
 
 EOT
 
diff --git a/CN_PROD/slo/Wirkkette_Connected_Drive_Store_Vehicle_Reliability_of_key_requests.tf b/CN_PROD/slo/Wirkkette_Connected_Drive_Store_Vehicle_Reliability_of_key_requests.tf
index ebd70d0..a688a4e 100644
--- a/CN_PROD/slo/Wirkkette_Connected_Drive_Store_Vehicle_Reliability_of_key_requests.tf
+++ b/CN_PROD/slo/Wirkkette_Connected_Drive_Store_Vehicle_Reliability_of_key_requests.tf
@@ -17,14 +17,12 @@ module Wirkkette_Connected_Drive_Store_Vehicle_Reliability_of_key_requests {
 (100)-(builtin:service.keyRequest.errors.fivexx.rate:filter(and(in("dt.entity.service_method",entitySelector("type(service_method), 
 fromRelationship.isServiceMethodOfService(
                             type(~"SERVICE~"),entityName.in(
-                                ~"StoreOfferResourceV6 - am-store - prod~",
-								~"CdStoreOfferResource - am-store - prod~"
+                                ~"CdStoreOfferResource - cdse - prod~",
+								~"CdStoreOfferResourceV2 - cdse - prod~"
                                 )
                         )
                     ,entityName.in(
-                        ~"getOffersAndPortfolio~",
-						~"bookedAndBookableCDServices~",
-                        ~"bookedAndBookableCDServices 1~"
+						~"bookedAndBookableCDServices~"
                         )")))):splitBy())
 
 EOT