diff --git a/elements/cinder-config/install.d/01-cinder-config b/elements/cinder-config/install.d/01-cinder-config
deleted file mode 100755
index 1acd3748..00000000
--- a/elements/cinder-config/install.d/01-cinder-config
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-set -eu
-use-config-templates $(dirname $0)/../config
diff --git a/elements/cinder/install.d/72-cinder b/elements/cinder/install.d/72-cinder
index df00c5c0..20915628 100755
--- a/elements/cinder/install.d/72-cinder
+++ b/elements/cinder/install.d/72-cinder
@@ -2,7 +2,7 @@
 set -eux
 
 install-packages lvm2
-os-svc-install -n cinder -u cinder -r https://github.com/openstack/cinder.git
+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"
@@ -14,9 +14,3 @@ echo 'include /var/run/cinder/volumes/*' > /etc/tgt/conf.d/cinder_tgt.conf
 echo "cinder ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/cinder
 chmod 0440 /etc/sudoers.d/cinder
 visudo -c
-
-os_refresh=$(os-refresh-config --print-base)
-
-for stage in pre-configure migration post-configure; do
-  install -m 0755 -o root -g root $(dirname $0)/../$stage $os_refresh/$stage.d/72-cinder
-done
diff --git a/elements/cinder/migration b/elements/cinder/os-refresh-config/migration.d/72-cinder-resize-volume-groups
similarity index 100%
rename from elements/cinder/migration
rename to elements/cinder/os-refresh-config/migration.d/72-cinder-resize-volume-groups
diff --git a/elements/cinder/post-configure b/elements/cinder/os-refresh-config/post-configure.d/72-cinder
similarity index 100%
rename from elements/cinder/post-configure
rename to elements/cinder/os-refresh-config/post-configure.d/72-cinder
diff --git a/elements/cinder/pre-configure b/elements/cinder/os-refresh-config/pre-configure.d/72-cinder
similarity index 100%
rename from elements/cinder/pre-configure
rename to elements/cinder/os-refresh-config/pre-configure.d/72-cinder
diff --git a/elements/os-refresh-config/install.d/99-os-refresh-config-install-scripts b/elements/os-refresh-config/install.d/99-os-refresh-config-install-scripts
new file mode 100644
index 00000000..3444b995
--- /dev/null
+++ b/elements/os-refresh-config/install.d/99-os-refresh-config-install-scripts
@@ -0,0 +1,4 @@
+#!/bin/bash
+SCRIPT_BASE=$(os-refresh-config --print-base)
+SCRIPT_SOURCE=$(dirname $0)/../os-refresh-config
+rsync -r $SCRIPT_SOURCE/ $SCRIPT_BASE/