diff --git a/elements/os-config-applier/install.d/50-os-config-applier b/elements/os-config-applier/install.d/50-os-config-applier
index d97fe814d..15e63d0fe 100755
--- a/elements/os-config-applier/install.d/50-os-config-applier
+++ b/elements/os-config-applier/install.d/50-os-config-applier
@@ -9,8 +9,10 @@ pip install -U git+https://github.com/tripleo/os-config-applier.git
 mkdir -p /opt/stack
 git clone $TEMPLATES /opt/stack/openstack-config-templates
 
-cat > /etc/init/os-config-applier.conf <<- eof
-start on runlevel [2345]
-task
+runscript=$(os-refresh-config --print-base)/configuration.d/10-os-config-applier
+mkdir -p $(dirname $runscript)
+cat > $runscript <<- eof
+#!/bin/sh
 exec os-config-applier -t /opt/stack/openstack-config-templates/templates
 eof
+chmod 0755 $runscript
diff --git a/elements/os-refresh-config/README.md b/elements/os-refresh-config/README.md
new file mode 100644
index 000000000..a5f97134a
--- /dev/null
+++ b/elements/os-refresh-config/README.md
@@ -0,0 +1,7 @@
+Install os-refresh-config.
+
+os-refresh-config uses run-parts to run scripts in a pre-defined set
+of directories. Its intended purpose is to quiesce (pre-configure.d),
+configure (configure.d), migrate (migration.d), and then activate
+(post-configure.d) a configuration on first boot or in response to Heat
+Metadata changes.
diff --git a/elements/os-refresh-config/element-deps b/elements/os-refresh-config/element-deps
new file mode 100644
index 000000000..2a8c462fd
--- /dev/null
+++ b/elements/os-refresh-config/element-deps
@@ -0,0 +1 @@
+heat-jeos
diff --git a/elements/os-refresh-config/install.d/01-os-refresh-config b/elements/os-refresh-config/install.d/01-os-refresh-config
new file mode 100755
index 000000000..116b47837
--- /dev/null
+++ b/elements/os-refresh-config/install.d/01-os-refresh-config
@@ -0,0 +1,15 @@
+#!/bin/bash
+# We need to install this early in install.d because other elements will
+# need to use os-refresh-config --print-base to know where to put files
+
+set -eux
+
+install-packages git-core python-pip
+
+pip install git+https://github.com/tripleo/os-refresh-config.git
+
+cat > /etc/init/os-refresh-config.conf <<- eof
+start on runlevel [2345]
+task
+exec os-refresh-config
+eof