diff --git a/ceilometer/cmd/agent_notification.py b/ceilometer/cmd/agent_notification.py
index ba924d29..99ad2b3b 100644
--- a/ceilometer/cmd/agent_notification.py
+++ b/ceilometer/cmd/agent_notification.py
@@ -21,8 +21,5 @@ from ceilometer import service
 
 def main():
     service.prepare_service()
-    launcher = os_service.ProcessLauncher()
-    launcher.launch_service(
-        notification.NotificationService(),
-        workers=service.get_workers('notification'))
-    launcher.wait()
+    os_service.launch(notification.NotificationService(),
+                      workers=service.get_workers('notification')).wait()
diff --git a/ceilometer/cmd/collector.py b/ceilometer/cmd/collector.py
index 2a1d9ffb..cc6d1bde 100644
--- a/ceilometer/cmd/collector.py
+++ b/ceilometer/cmd/collector.py
@@ -21,8 +21,5 @@ from ceilometer import service
 
 def main():
     service.prepare_service()
-    launcher = os_service.ProcessLauncher()
-    launcher.launch_service(
-        collector.CollectorService(),
-        workers=service.get_workers('collector'))
-    launcher.wait()
+    os_service.launch(collector.CollectorService(),
+                      workers=service.get_workers('collector')).wait()