diff --git a/elements/os-config-applier/install.d/10-os-config-applier b/elements/os-config-applier/install.d/10-os-config-applier
index ca4446eb..1fe4347c 100755
--- a/elements/os-config-applier/install.d/10-os-config-applier
+++ b/elements/os-config-applier/install.d/10-os-config-applier
@@ -7,8 +7,26 @@ pip install -U git+https://github.com/tripleo/os-config-applier.git
 TEMPLATE_ROOT=$(os-config-applier --print-templates)
 mkdir -p $TEMPLATE_ROOT
 
-cat > /etc/init/os-config-applier.conf <<- eof
+# Upstart
+if [ -d /etc/init ] ; then
+    cat > /etc/init/os-config-applier.conf <<eof
 start on runlevel [2345]
 task
 exec os-config-applier
 eof
+# Systemd
+elif [ -d /etc/systemd/system ] ; then
+    cat > /etc/systemd/system/os-config-applier.service <<eof
+[Unit]
+Description=Apply configs from Heat metadata
+
+[Service]
+ExecStart=os-config-applier
+
+[Install]
+WantedBy=multi-user.target
+eof
+else
+    echo "Only systems with systemd or upstart are supported."
+    exit 1
+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 d4a089be..41abbe4e 100755
--- a/elements/os-refresh-config/install.d/01-os-refresh-config
+++ b/elements/os-refresh-config/install.d/01-os-refresh-config
@@ -12,8 +12,26 @@ for d in pre-configure.d configure.d migration.d post-configure.d; do
   install -m 0755 -o root -g root -d /opt/stack/os-config-refresh/$d
 done
 
-cat > /etc/init/os-refresh-config.conf <<- eof
+# Upstart
+if [ -d /etc/init ] ; then
+    cat > /etc/init/os-refresh-config.conf <<eof
 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
+[Unit]
+Description=Refresh Config on state change
+
+[Service]
+ExecStart=os-refresh-config
+
+[Install]
+WantedBy=multi-user.target
+eof
+else
+    echo Only systems with systemd or upstart are supported.
+    exit 1
+fi