diff --git a/elements/nova-compute/install.d/80-nova-compute b/elements/nova-compute/install.d/80-nova-compute
index 266b200b7..805b9c751 100755
--- a/elements/nova-compute/install.d/80-nova-compute
+++ b/elements/nova-compute/install.d/80-nova-compute
@@ -31,16 +31,18 @@ eof
 }
 
 function install_dnsmasq_systemd {
-  cat > /etc/systemd/system/nova-bm-dnsmasq.conf << eof
+  cat > /lib/systemd/system/nova-bm-dnsmasq.service << eof
 [Unit]
 Description=Nova dnsmasq service
+After=openvswitch.service
 
 [Service]
 Type=forking
-ExecStartPre=mkdir -p /tftpboot
-ExecStartPre=chown -R nova:nova /tftpboot
-ExecStartPre=killall -9 dnsmasq || echo 'no dnsmasq running'
-ExecStart=dnsmasq --conf-file= \\
+ExecStartPre=/bin/mkdir -p /tftpboot
+ExecStartPre=/bin/chown -R nova:nova /tftpboot
+-ExecStartPre=/bin/killall -9 dnsmasq
+ExecStartPre=/sbin/ifup br-ctlplane
+ExecStart=/sbin/dnsmasq --conf-file= \\
                   --port=0 \\
                   --enable-tftp \\
                   --tftp-root=/tftpboot \\
@@ -54,6 +56,13 @@ ExecStart=dnsmasq --conf-file= \\
 WantedBy=multi-user.target
 Alias=nova-bm-dnsmasq.service
 eof
+
+  # Make systemd take notice of it
+  systemctl daemon-reload
+
+  # Enable the service
+  systemctl enable nova-bm-dnsmasq.service
+
 }
 
 # Used by all compute
@@ -71,7 +80,7 @@ usermod -a -G libvirtd nova
 
 if [ -d /etc/init ]; then
   install_dnsmasq_upstart
-elif [ -d /etc/systemd/system ]; then
+elif [ -d /lib/systemd/system ]; then
   install_dnsmasq_systemd
 fi
 
diff --git a/elements/os-refresh-config/install.d/01-os-refresh-config b/elements/os-refresh-config/install.d/01-os-refresh-config
index 80b4d3e6c..789be0d5e 100755
--- a/elements/os-refresh-config/install.d/01-os-refresh-config
+++ b/elements/os-refresh-config/install.d/01-os-refresh-config
@@ -19,18 +19,26 @@ start on runlevel [2345]
 task
 exec os-refresh-config
 eof
+
 # Systemd
-elif [ -d /etc/systemd/system ] ; then
-    cat > /etc/systemd/system/os-refresh-config.service <<eof
+elif [ -d /lib/systemd/system ] ; then
+    cat > /lib/systemd/system/os-refresh-config.service <<eof
 [Unit]
 Description=Refresh Config on state change
 
 [Service]
-ExecStart=os-refresh-config
+ExecStart=/bin/os-refresh-config
 
 [Install]
 WantedBy=multi-user.target
 eof
+
+  # Make systemd take notice of it
+  systemctl daemon-reload
+
+  # Enable the service
+  systemctl enable os-refresh-config.service
+
 else
     echo Only systems with systemd or upstart are supported.
     exit 1
diff --git a/elements/os-svc-install/bin/os-svc-daemon b/elements/os-svc-install/bin/os-svc-daemon
index 2402e2d20..93f05895d 100755
--- a/elements/os-svc-install/bin/os-svc-daemon
+++ b/elements/os-svc-install/bin/os-svc-daemon
@@ -98,18 +98,35 @@ function install_systemd {
   local cmd=$3
   shift; shift; shift
   local args=$*
-  $OUTPUT /etc/systemd/system/$name.service <<EOF
+  $OUTPUT /lib/systemd/system/$name.service <<EOF
 [Unit]
 Description=$name Service
+After=os-refresh-config.service
+Requires=$name-create-dir.service
 
 [Service]
-ExecStart=/opt/stack/venvs/$user/bin/$cmd -- $args
+ExecStart=/opt/stack/venvs/$user/bin/$cmd $args
 User=$user
 
 [Install]
 WantedBy=multi-user.target
 Alias=$name.service
 EOF
+
+  $OUTPUT /lib/systemd/system/$name-create-dir.service <<EOF
+[Unit]
+Description=Create /var/run/$name
+
+[Service]
+ExecStartPre=/bin/mkdir -p /var/run/$user
+ExecStart=/bin/chown -R $user:$user /var/run/$user
+EOF
+
+  # Make systemd take notice of it
+  systemctl daemon-reload
+
+  # Enable the service
+  systemctl enable $name.service
 }
 
 # TODO: SysV init fallback support