diff --git a/elements/cinder/install.d/72-cinder b/elements/cinder/install.d/72-cinder
index 20915628..fff7dd8a 100755
--- a/elements/cinder/install.d/72-cinder
+++ b/elements/cinder/install.d/72-cinder
@@ -4,9 +4,9 @@ set -eux
 install-packages lvm2
 os-svc-install -n cinder -u cinder -r https://github.com/openstack/cinder.git -c cinder-all
 
-os-svc-upstart cinder-api cinder /usr/local/bin/cinder-api "--config-dir /etc/cinder"
-os-svc-upstart cinder-volume cinder /usr/local/bin/cinder-volume "--config-dir /etc/cinder"
-os-svc-upstart cinder-scheduler cinder /usr/local/bin/cinder-scheduler "--config-dir /etc/cinder"
+os-svc-daemon cinder-api cinder cinder-api "--config-dir /etc/cinder"
+os-svc-daemon cinder-volume cinder cinder-volume "--config-dir /etc/cinder"
+os-svc-daemon cinder-scheduler cinder cinder-scheduler "--config-dir /etc/cinder"
 mkdir -p /etc/tgt/conf.d
 echo 'include /etc/tgt/conf.d/cinder_tgt.conf' > /etc/tgt/targets.conf
 echo 'include /var/run/cinder/volumes/*' > /etc/tgt/conf.d/cinder_tgt.conf
diff --git a/elements/keystone/install.d/70-keystone b/elements/keystone/install.d/70-keystone
index 42d02253..7aa40ce6 100755
--- a/elements/keystone/install.d/70-keystone
+++ b/elements/keystone/install.d/70-keystone
@@ -2,7 +2,7 @@
 set -eux
 
 os-svc-install -n keystone -u keystone -r https://github.com/openstack/keystone.git
-os-svc-daemon keystone keystone /usr/local/bin/keystone-all "--config-dir /etc/keystone --log-config /etc/keystone/logging.conf"
+os-svc-daemon keystone keystone keystone-all "--config-dir /etc/keystone --log-config /etc/keystone/logging.conf"
 install -m 0755 -o keystone -g keystone -d /etc/keystone/ssl
 
 install -m 0755 -o root -g root $(dirname $0)/../post-configure \