diff --git a/CN_PROD/slo/TP_Mobile_CD_Store.tf b/CN_PROD/slo/TP_Mobile_CD_Store.tf
index 33acc02..20ef1ad 100644
--- a/CN_PROD/slo/TP_Mobile_CD_Store.tf
+++ b/CN_PROD/slo/TP_Mobile_CD_Store.tf
@@ -17,9 +17,6 @@ module TP_Mobile_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~"
                                 )
diff --git a/CN_PROD/slo/TP_Vehicle_CD_Store.tf b/CN_PROD/slo/TP_Vehicle_CD_Store.tf
index e779f43..a5f67c7 100644
--- a/CN_PROD/slo/TP_Vehicle_CD_Store.tf
+++ b/CN_PROD/slo/TP_Vehicle_CD_Store.tf
@@ -17,14 +17,13 @@ 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~"
                                 )
                         )
-                    ")))):splitBy())
+                    ,entityName.in(
+						~"bookedAndBookableCDServices~"
+                        )")))):splitBy())
 
 EOT
 
diff --git a/NA_PROD/slo/TP_Mobile_CD_Store .tf b/NA_PROD/slo/TP_Mobile_CD_Store .tf
index d3c5879..41f4b43 100644
--- a/NA_PROD/slo/TP_Mobile_CD_Store .tf	
+++ b/NA_PROD/slo/TP_Mobile_CD_Store .tf	
@@ -17,17 +17,12 @@ module TP_Mobile_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~",
-								~"StoreResourceV4 - am-store - prod~",
-								~"CdStoreOfferResource - am-store - prod~",
-                                ~"StoreOfferResourceV7 - am-store - prod~",
-
                                 ~"CdStoreOfferResource - cdse - prod~",
 								~"CdStoreOfferResourceV2 - cdse - prod~",
                                 ~"StoreOfferResourceV7 - cdse - prod~"
                                 )
                         )
-                   ")))):splitBy())
+                    ")))):splitBy())
 
 EOT
 
diff --git a/NA_PROD/slo/TP_Vehicle_CD_Store.tf b/NA_PROD/slo/TP_Vehicle_CD_Store.tf
index cfdc4ca..86d2db7 100644
--- a/NA_PROD/slo/TP_Vehicle_CD_Store.tf
+++ b/NA_PROD/slo/TP_Vehicle_CD_Store.tf
@@ -17,11 +17,6 @@ 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~",
-								~"StoreResourceV4 - am-store - prod~",
-								~"CdStoreOfferResource - am-store - prod~",
-                                ~"StoreOfferResourceV7 - am-store - prod~",
-
                                 ~"CdStoreOfferResource - cdse - prod~",
 								~"CdStoreOfferResourceV2 - cdse - prod~",
                                 ~"StoreOfferResourceV7 - cdse - prod~"