diff --git a/modules/rhizo_base/manifests/osmocom.pp b/modules/rhizo_base/manifests/osmocom.pp
index 41de26c..a4226a9 100644
--- a/modules/rhizo_base/manifests/osmocom.pp
+++ b/modules/rhizo_base/manifests/osmocom.pp
@@ -156,13 +156,14 @@ class rhizo_base::osmocom {
     }
 
   service { [ 'osmo-stp', 'osmo-hlr', 'osmo-bsc',
-              'osmo-msc', 'osmo-mgw', 'osmo-mgw-msc',
+              'osmo-msc', 'osmo-mgw',
               'osmo-sgsn', 'osmo-sip-connector' ]:
-    enable  => true,
-    ensure  => 'running'
+    provider => 'systemd',
+    enable   => true,
+    ensure   => 'running'
   }
 
-  service { 'osmocom-nitb':
+  service { [ 'osmocom-nitb', 'osmo-mgw-msc' ]:
     provider => 'systemd',
     enable   => false,
     ensure   => 'stopped'