diff --git a/NA_PROD/slo/TP_Vehicle_Provisioning.tf b/NA_PROD/slo/TP_Vehicle_Provisioning.tf
index 0084013..5377c71 100644
--- a/NA_PROD/slo/TP_Vehicle_Provisioning.tf
+++ b/NA_PROD/slo/TP_Vehicle_Provisioning.tf
@@ -18,43 +18,83 @@ module TP_Vehicle_Provisioning {
         (100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
 			fromRelationship.isServiceMethodOfService(
 				type(~"SERVICE~"),entityName.in(
-                                        ~"WorkshopProvisioningService - provisioning - prod~",
-                                       ~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-                                       ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-                                       ~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-                                       ~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-                                       ~"VpsJoynrApi - provisioning - prod~"
+  ~"WorkshopProvisioningService - provisioning - prod~",
+ ~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+ ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+ ~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+ ~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+ ~"VpsJoynrApi - provisioning - prod~",
+
+ ~"WorkshopProvisioningService - vps-prov - us~",
+  ~"MQSession$FacadeMessageListener - vps-prov - us~",
+  ~"MQSession$FacadeMessageListener - vps-trigger - us~",
+  ~"VpsJoynrApi - vps-prov - us~",
+  ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+  ~"ProvisioningService - nopprov - prod~",
+  ~"NOP-Provisioning (/nop-prov) - nopprov - prod~"
                                 )
 			)
                         ,entityName.in(
-                                ~"vpsObtainProvisioningSync~",
-                                    ~"Queue: PROV_TRIGGER_ACK-prod~",
-                                    ~"Queue: PROV_TRIGGER_INTERNAL-prod~",
-                                    ~"Queue: PROV_Trigger_IN-prod~",
-                                    ~"Queue: PROV_ARCHIVE_IN-prod~",
-                                    ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
-                                    ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~"
+~"vpsObtainProvisioningSync~",
+~"Queue: PROV_TRIGGER_ACK-prod~",
+~"Queue: PROV_TRIGGER_INTERNAL-prod~",
+~"Queue: PROV_Trigger_IN-prod~",
+~"Queue: PROV_ARCHIVE_IN-prod~",
+~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+
+~"vpsObtainProvisioningSync~",
+~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNALQueue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNAL~",
+~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_IN~",
+~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
+~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_IN~",
+~"getNOPProvisioningDataForVehicle~",
+~"acknowledgeNOPProvisioningDownload~",
+~"getNOPProvisioningDataForVehicleBase64~",
+~"/nop-prov/v2/mainprov/prov.do~"
                                 )"))))):splitBy())
 	/
 	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
                         fromRelationship.isServiceMethodOfService(
                                 type(~"SERVICE~"),entityName.in(
-                                        ~"WorkshopProvisioningService - provisioning - prod~",
-                                       ~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-                                       ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-                                       ~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-                                       ~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
-                                       ~"VpsJoynrApi - provisioning - prod~"			
+  ~"WorkshopProvisioningService - provisioning - prod~",
+ ~"TriggerProvAckInternalMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+ ~"InternalTriggerMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+ ~"TriggerInputMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+ ~"ProvArchiveInMessageListener$Proxy$_$$_Weld$EnterpriseProxy$ - provisioning - prod~",
+ ~"VpsJoynrApi - provisioning - prod~",
+
+~"WorkshopProvisioningService - vps-prov - us~",
+  ~"MQSession$FacadeMessageListener - vps-prov - us~",
+  ~"MQSession$FacadeMessageListener - vps-trigger - us~",
+  ~"VpsJoynrApi - vps-prov - us~",
+  ~"MQSession$FacadeMessageListener - noptrigger - prod~",
+  ~"ProvisioningService - nopprov - prod~",
+  ~"NOP-Provisioning (/nop-prov) - nopprov - prod~" 			
                                 )
 			)
 			,entityName.in(
-				    ~"vpsObtainProvisioningSync~",
-                                    ~"Queue: PROV_TRIGGER_ACK-prod~",
-                                    ~"Queue: PROV_TRIGGER_INTERNAL-prod~",
-                                    ~"Queue: PROV_Trigger_IN-prod~",
-                                    ~"Queue: PROV_ARCHIVE_IN-prod~",
-                                    ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
-                                    ~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~"
+				~"vpsObtainProvisioningSync~",
+~"Queue: PROV_TRIGGER_ACK-prod~",
+~"Queue: PROV_TRIGGER_INTERNAL-prod~",
+~"Queue: PROV_Trigger_IN-prod~",
+~"Queue: PROV_ARCHIVE_IN-prod~",
+~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+
+~"vpsObtainProvisioningSync~",
+~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNALQueue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_INTERNAL~",
+~"Queue: B2VUSPROD.BMW.B2VUS.PROV_TRIGGER_IN~",
+~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningHeadUnit~",
+~"ProvisioningVehicleProvider.sendVehicleDataForProvisioningComUnit~",
+~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_INTERNAL~",
+~"Queue: B2VUSPROD.BMW.B2VUS.NOP_TRIGGER_IN~",
+~"getNOPProvisioningDataForVehicle~",
+~"acknowledgeNOPProvisioningDownload~",
+~"getNOPProvisioningDataForVehicleBase64~",
+~"/nop-prov/v2/mainprov/prov.do~"
                                 )"))))):splitBy()))
     EOT