diff --git a/config/services.yaml b/config/services.yaml
index 34fd7498..8fe325e4 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -158,48 +158,48 @@ services:
             - { name: kernel.event_listener, event: kernel.controller, method: onKernelController }
 
     # CMB invoice generator
-    #App\Service\InvoiceGenerator\CMBInvoiceGenerator: ~
+    App\Service\InvoiceGenerator\CMBInvoiceGenerator: ~
 
     # Resq invoice generator
-    App\Service\InvoiceGenerator\ResqInvoiceGenerator: ~
+    #App\Service\InvoiceGenerator\ResqInvoiceGenerator: ~
 
     # invoice generator interface
-    #App\Service\InvoiceGeneratorInterface: "@App\\Service\\InvoiceGenerator\\CMBInvoiceGenerator"
-    App\Service\InvoiceGeneratorInterface: "@App\\Service\\InvoiceGenerator\\ResqInvoiceGenerator"
+    App\Service\InvoiceGeneratorInterface: "@App\\Service\\InvoiceGenerator\\CMBInvoiceGenerator"
+    #App\Service\InvoiceGeneratorInterface: "@App\\Service\\InvoiceGenerator\\ResqInvoiceGenerator"
 
     # Resq job order generator
-    App\Service\JobOrderHandler\ResqJobOrderHandler:
-        arguments:
-            $country_code: "%env(COUNTRY_CODE)%" 
+    #App\Service\JobOrderHandler\ResqJobOrderHandler:
+    #    arguments:
+    #        $country_code: "%env(COUNTRY_CODE)%" 
 
     # CMB job order generator
-    #App\Service\JobOrderHandler\CMBJobOrderHandler:
-    #    arguments:
-    #        $country_code: "%env(COUNTRY_CODE)%"
-
-    #job order generator interface
-    #App\Service\JobOrderHandlerInterface: "@App\\Service\\JobOrderHandler\\CMBJobOrderHandler"
-    App\Service\JobOrderHandlerInterface: "@App\\Service\\JobOrderHandler\\ResqJobOrderHandler"
-
-    # CMB customer generator
-    #App\Service\CustomerHandler\CMBCustomerHandler:
-    #    arguments:
-    #       $country_code: "%env(COUNTRY_CODE)%"
-
-    # Resq customer generator
-    App\Service\CustomerHandler\ResqCustomerHandler:
+    App\Service\JobOrderHandler\CMBJobOrderHandler:
         arguments:
             $country_code: "%env(COUNTRY_CODE)%"
 
+    #job order generator interface
+    App\Service\JobOrderHandlerInterface: "@App\\Service\\JobOrderHandler\\CMBJobOrderHandler"
+    #App\Service\JobOrderHandlerInterface: "@App\\Service\\JobOrderHandler\\ResqJobOrderHandler"
+
+    # CMB customer generator
+    App\Service\CustomerHandler\CMBCustomerHandler:
+        arguments:
+           $country_code: "%env(COUNTRY_CODE)%"
+
+    # Resq customer generator
+    #App\Service\CustomerHandler\ResqCustomerHandler:
+    #    arguments:
+    #        $country_code: "%env(COUNTRY_CODE)%"
+
     # customer generator interface
-    #App\Service\CustomerHandlerInterface: "@App\\Service\\CustomerHandler\\CMBCustomerHandler"
-    App\Service\CustomerHandlerInterface: "@App\\Service\\CustomerHandler\\ResqCustomerHandler"
+    App\Service\CustomerHandlerInterface: "@App\\Service\\CustomerHandler\\CMBCustomerHandler"
+    #App\Service\CustomerHandlerInterface: "@App\\Service\\CustomerHandler\\ResqCustomerHandler"
 
     # rider assignment 
     #App\Service\RiderAssignmentHandler\CMBRiderAssignmentHandler: ~
 
     # rider assignment interface
-    #App\Service\RiderAssignmentHandlerInterface: "@App\\Service\\RiderAssignmentHandler\\CMBRiderAssignmentHandler"
+    App\Service\RiderAssignmentHandlerInterface: "@App\\Service\\RiderAssignmentHandler\\CMBRiderAssignmentHandler"
 
     # rider API service
     App\Service\RiderAPIHandler\CMBRiderAPIHandler: