diff --git a/playbooks/cleanup_rabbitmq_start.yml b/playbooks/cleanup_rabbitmq_start.yml
index f858346..c075f69 100644
--- a/playbooks/cleanup_rabbitmq_start.yml
+++ b/playbooks/cleanup_rabbitmq_start.yml
@@ -18,12 +18,12 @@
   ignore_errors: yes
   register: rabbit_cluster_test
 - name: Collect names of post-configure.d rabbitmq files
-  shell: ls /opt/stack/os-config-refresh/post-configure.d/|grep '\-rabbitmq$'
+  shell: ls "{{os_refresh_config_folder}}/post-configure.d/"|grep '\-rabbitmq$'
   register: test_rabbitmq_script_list
   when: single_controller is not defined and rabbit_cluster_test.rc == 0
 - name: If node rabbitmq cluster config was present, re-enable os-refresh-config post-configure.d.
   sudo: yes
-  file: mode=0755 path="/opt/stack/os-config-refresh/post-configure.d/{{item}}"
+  file: mode=0755 path="{{os_refresh_config_folder}}/post-configure.d/{{item}}"
   when: single_controller is not defined and rabbit_cluster_test.rc == 0
   with_items: test_rabbitmq_script_list.stdout_lines
 - name: "Removing temporary rabbitmq-server override"
diff --git a/playbooks/rabbitmq_occ_disable.yml b/playbooks/rabbitmq_occ_disable.yml
index dde687e..c8de6bc 100644
--- a/playbooks/rabbitmq_occ_disable.yml
+++ b/playbooks/rabbitmq_occ_disable.yml
@@ -17,10 +17,10 @@
   ignore_errors: yes
   register: rabbit_cluster_test
 - name: Collect names of post-configure.d rabbitmq files
-  shell: ls /opt/stack/os-config-refresh/post-configure.d/|grep '\-rabbitmq$'
+  shell: ls "{{os_refresh_config_folder}}/post-configure.d/"|grep '\-rabbitmq$'
   register: test_rabbitmq_script_list
   when: rabbit_cluster_test.rc == 0
 - name: If node rabbitmq cluster config was present, prevent os-refresh-config post-configure.d job from executing.
-  file: mode=0644 path="/opt/stack/os-config-refresh/post-configure.d/{{item}}"
+  file: mode=0644 path="{{os_refresh_config_folder}}/post-configure.d/{{item}}"
   when: rabbit_cluster_test.rc == 0
   with_items: test_rabbitmq_script_list.stdout_lines
diff --git a/playbooks/rebuild.yml b/playbooks/rebuild.yml
index 34460ce..817a687 100644
--- a/playbooks/rebuild.yml
+++ b/playbooks/rebuild.yml
@@ -31,3 +31,11 @@
     wait_for: 900
   delegate_to: localhost
   when: force_rebuild is defined
+  register: test_rebuild_forced
+- name: "Record that instance was rebuilt under normal circumstances"
+  set_fact: instance_rebuilt=true
+  when: test_rebuild_forced.changed == true
+- name: "If we did not rebuild, and the image IDs already match, trigger the ephemeral disk to remount."
+  sudo: yes
+  command: "{{os_refresh_config_folder}}/pre-configure.d/00-fix-ephemeral-mount"
+  when: instance_image_id == rebuild_image_id and force_rebuild is not defined or instance_rebuilt == false
diff --git a/playbooks/start_rabbitmq.yml b/playbooks/start_rabbitmq.yml
index ba5efff..f0d9a96 100644
--- a/playbooks/start_rabbitmq.yml
+++ b/playbooks/start_rabbitmq.yml
@@ -17,11 +17,11 @@
   ignore_errors: yes
   register: rabbit_cluster_test
 - name: Collect names of post-configure.d rabbitmq files
-  shell: ls /opt/stack/os-config-refresh/post-configure.d/|grep '\-rabbitmq$'
+  shell: ls "{{os_refresh_config_folder}}/post-configure.d/"|grep '\-rabbitmq$'
   register: test_rabbitmq_script_list
   when: rabbit_cluster_test.rc == 0
 - name: If node rabbitmq cluster config was present, prevent os-refresh-config post-configure.d job from executing.
-  file: mode=0644 path="/opt/stack/os-config-refresh/post-configure.d/{{item}}"
+  file: mode=0644 path="{{os_refresh_config_folder}}/post-configure.d/{{item}}"
   when: rabbit_cluster_test.rc == 0
   with_items: test_rabbitmq_script_list.stdout_lines
   sudo: yes
diff --git a/playbooks/step_generate_hosts_file.yml b/playbooks/step_generate_hosts_file.yml
index 8c6ca1a..789c8f4 100644
--- a/playbooks/step_generate_hosts_file.yml
+++ b/playbooks/step_generate_hosts_file.yml
@@ -21,4 +21,4 @@
 # to have the same end effect.
 - name: Trigger hosts file generation
   sudo: yes
-  command: /opt/stack/os-config-refresh/configure.d/51-hosts
+  command: "{{os_refresh_config_folder}}/configure.d/51-hosts"
diff --git a/plugins/inventory/group_vars/all b/plugins/inventory/group_vars/all
index 93f0f5d..9c59c43 100644
--- a/plugins/inventory/group_vars/all
+++ b/plugins/inventory/group_vars/all
@@ -17,6 +17,7 @@ key_name: ansible_key
 #helion: True
 #force_rebuild: True
 wait_for_hostkey: True
+os_refresh_config_folder: /usr/libexec/os-refresh-config/
 # This overcloud controller list is for upstream openstack
 #single_controller: True
 # This option adjusts logic to enable single controllers to be upgraded