diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
index e0a25e7c44..3cb4c5e5b3 100644
--- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
@@ -220,7 +220,7 @@ outputs:
             user: root
             environment:
               TRIPLEO_MINOR_UPDATE: ''
-            command: /pacemaker_restart_bundle.sh cinder_backup openstack-cinder-backup openstack-cinder-backup _ Started
+            command: /var/lib/container-config-scripts/pacemaker_restart_bundle.sh cinder_backup openstack-cinder-backup openstack-cinder-backup _ Started
             image: {get_param: ContainerCinderBackupImage}
             volumes:
               list_concat:
diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
index 56ee31ea3d..bd513025fa 100644
--- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
@@ -206,7 +206,7 @@ outputs:
             user: root
             environment:
               TRIPLEO_MINOR_UPDATE: ''
-            command: /pacemaker_restart_bundle.sh cinder_volume openstack-cinder-volume openstack-cinder-volume _ Started
+            command: /var/lib/container-config-scripts/pacemaker_restart_bundle.sh cinder_volume openstack-cinder-volume openstack-cinder-volume _ Started
             image: {get_param: ContainerCinderVolumeImage}
             volumes:
               list_concat:
diff --git a/deployment/containers-common.yaml b/deployment/containers-common.yaml
index 725b82b3e7..4c5c7f96f2 100644
--- a/deployment/containers-common.yaml
+++ b/deployment/containers-common.yaml
@@ -155,8 +155,7 @@ outputs:
     value:
       list_concat:
         - *volumes_base
-        - - /var/lib/container-config-scripts/pacemaker_restart_bundle.sh:/pacemaker_restart_bundle.sh:ro
-          - /var/lib/container-config-scripts/pacemaker_wait_bundle.sh:/pacemaker_wait_bundle.sh:ro
+        - - /var/lib/container-config-scripts:/var/lib/container-config-scripts:ro
           - /dev/shm:/dev/shm:rw
           # required for bootstrap_host_exec, facter
           - /etc/puppet:/etc/puppet:ro
diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml
index 1e65926386..bf2c26b052 100644
--- a/deployment/database/mysql-pacemaker-puppet.yaml
+++ b/deployment/database/mysql-pacemaker-puppet.yaml
@@ -301,7 +301,7 @@ outputs:
             user: root
             environment:
               TRIPLEO_MINOR_UPDATE: ''
-            command: /pacemaker_restart_bundle.sh mysql galera galera-bundle Master
+            command: /var/lib/container-config-scripts/pacemaker_restart_bundle.sh mysql galera galera-bundle Master
             image: {get_param: ContainerMysqlImage}
             volumes:
               list_concat:
diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml
index 5c5b133f7b..a8640f967f 100644
--- a/deployment/database/redis-pacemaker-puppet.yaml
+++ b/deployment/database/redis-pacemaker-puppet.yaml
@@ -268,7 +268,7 @@ outputs:
                 user: root
                 environment:
                   TRIPLEO_MINOR_UPDATE: ''
-                command: /pacemaker_restart_bundle.sh redis redis redis-bundle Slave Master
+                command: /var/lib/container-config-scripts/pacemaker_restart_bundle.sh redis redis redis-bundle Slave Master
                 image: {get_param: ContainerRedisConfigImage}
                 volumes:
                   list_concat:
diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml
index ab44ae1ae0..058e9385c1 100644
--- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml
+++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml
@@ -291,7 +291,7 @@ outputs:
             config_volume: haproxy
             environment:
               TRIPLEO_MINOR_UPDATE: ''
-            command: /pacemaker_restart_bundle.sh haproxy haproxy-bundle haproxy-bundle Started
+            command: /var/lib/container-config-scripts/pacemaker_restart_bundle.sh haproxy haproxy-bundle haproxy-bundle Started
             image: {get_param: ContainerHAProxyImage}
             volumes:
               list_concat:
diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml
index 02a8be1ca9..608d6817d9 100644
--- a/deployment/manila/manila-share-pacemaker-puppet.yaml
+++ b/deployment/manila/manila-share-pacemaker-puppet.yaml
@@ -188,7 +188,7 @@ outputs:
             user: root
             environment:
               TRIPLEO_MINOR_UPDATE: ''
-            command: /pacemaker_restart_bundle.sh manila_share openstack-manila-share openstack-manila-share _ Started
+            command: /var/lib/container-config-scripts/pacemaker_restart_bundle.sh manila_share openstack-manila-share openstack-manila-share _ Started
             image: {get_param: ContainerManilaShareImage}
             volumes:
               list_concat:
diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
index cc1aaa2a5a..4740f5969c 100644
--- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
+++ b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
@@ -254,7 +254,7 @@ outputs:
             user: root
             environment:
               TRIPLEO_MINOR_UPDATE: ''
-            command: /pacemaker_restart_bundle.sh ovn_dbs ovndb_servers ovn-dbs-bundle Slave Master
+            command: /var/lib/container-config-scripts/pacemaker_restart_bundle.sh ovn_dbs ovndb_servers ovn-dbs-bundle Slave Master
             image: {get_param: ContainerOvnDbsConfigImage}
             volumes:
               list_concat:
diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
index 1f9473c3a0..f17361b0c3 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
@@ -233,7 +233,7 @@ outputs:
             user: root
             environment:
               TRIPLEO_MINOR_UPDATE: ''
-            command: /pacemaker_restart_bundle.sh oslo_messaging_notify rabbitmq rabbitmq-bundle Started
+            command: /var/lib/container-config-scripts/pacemaker_restart_bundle.sh oslo_messaging_notify rabbitmq rabbitmq-bundle Started
             image: {get_param: ContainerRabbitmqImage}
             volumes:
               list_concat:
diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
index 20538218db..ac1b4ac920 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
@@ -233,7 +233,7 @@ outputs:
             user: root
             environment:
               TRIPLEO_MINOR_UPDATE: ''
-            command: /pacemaker_restart_bundle.sh rabbitmq rabbitmq rabbitmq-bundle Started
+            command: /var/lib/container-config-scripts/pacemaker_restart_bundle.sh rabbitmq rabbitmq rabbitmq-bundle Started
             image: {get_param: ContainerRabbitmqImage}
             volumes:
               list_concat:
diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
index ae2b3eee3d..950c916617 100644
--- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
@@ -239,7 +239,7 @@ outputs:
             user: root
             environment:
               TRIPLEO_MINOR_UPDATE: ''
-            command: /pacemaker_restart_bundle.sh oslo_messaging_rpc rabbitmq rabbitmq-bundle Started
+            command: /var/lib/container-config-scripts/pacemaker_restart_bundle.sh oslo_messaging_rpc rabbitmq rabbitmq-bundle Started
             image: {get_param: ContainerRabbitmqImage}
             volumes:
               list_concat: