diff --git a/EMEA_PROD/slo/TP_Mobile_CD_Store.tf b/EMEA_PROD/slo/TP_Mobile_CD_Store.tf
index 4f6b909..c7135e2 100644
--- a/EMEA_PROD/slo/TP_Mobile_CD_Store.tf
+++ b/EMEA_PROD/slo/TP_Mobile_CD_Store.tf
@@ -16,17 +16,17 @@ module TP_Mobile_CD_Store {
     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(
-                                "StoreOfferResourceV6 - cdse - prod",
-                                "StoreOfferResourceV7 - cdse - prod",
-                                "CdStoreOfferResource - cdse - prod",
-                                "CdStoreOfferResourceV2 - cdse - prod"
+                                ~"StoreOfferResourceV6 - cdse - prod~",
+                                ~"StoreOfferResourceV7 - cdse - prod~",
+                                ~"CdStoreOfferResource - cdse - prod~",
+                                ~"CdStoreOfferResourceV2 - cdse - prod~"
                                 )
                         ),entityName.in(
-                            "getOffersAndPortfolio",
-                            "bookedAndBookableCDServices",
-                            "retrieveOffer",
-                            "retrieveExternalOffer",
-                            "getOffers"
+                            ~"getOffersAndPortfolio~",
+                            ~"bookedAndBookableCDServices~",
+                            ~"retrieveOffer~",
+                            ~"retrieveExternalOffer~",
+                            ~"getOffers~"
                         )
                     "))))):splitBy())
 EOT
diff --git a/EMEA_PROD/slo/TP_Vehicle_CD_Store.tf b/EMEA_PROD/slo/TP_Vehicle_CD_Store.tf
index b8412d3..66a54be 100644
--- a/EMEA_PROD/slo/TP_Vehicle_CD_Store.tf
+++ b/EMEA_PROD/slo/TP_Vehicle_CD_Store.tf
@@ -16,17 +16,17 @@ module TP_Vehicle_CD_Store {
     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(
-                                "StoreOfferResourceV6 - cdse - prod",
-                                "StoreOfferResourceV7 - cdse - prod",
-                                "CdStoreOfferResource - cdse - prod",
-                                "CdStoreOfferResourceV2 - cdse - prod"
+                                ~"StoreOfferResourceV6 - cdse - prod~",
+                                ~"StoreOfferResourceV7 - cdse - prod~",
+                                ~"CdStoreOfferResource - cdse - prod~",
+                                ~"CdStoreOfferResourceV2 - cdse - prod~"
                                 )
                         ),entityName.in(
-                            "getOffersAndPortfolio",
-                            "bookedAndBookableCDServices",
-                            "retrieveOffer",
-                            "retrieveExternalOffer",
-                            "getOffers"
+                            ~"getOffersAndPortfolio~",
+                            ~"bookedAndBookableCDServices~",
+                            ~"retrieveOffer~",
+                            ~"retrieveExternalOffer~",
+                            ~"getOffers~"
                         )
                     "))))):splitBy())
 EOT