diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml
index 68d0296e76..0f382d8e4e 100644
--- a/docker/services/cinder-api.yaml
+++ b/docker/services/cinder-api.yaml
@@ -228,8 +228,11 @@ outputs:
         - when: step|int == 0
           tags: common
           block:
+            - name: get bootstrap nodeid
+              command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
+              register: bootstrap_node
             - name: set is_bootstrap_node fact
-              set_fact: is_bootstrap_node={{cinder_api_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+              set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
             - name: Check is cinder_api is deployed
               command: systemctl is-enabled openstack-cinder-api
               ignore_errors: True
diff --git a/docker/services/ironic-api.yaml b/docker/services/ironic-api.yaml
index 7ec43eb7d2..373cc4e00b 100644
--- a/docker/services/ironic-api.yaml
+++ b/docker/services/ironic-api.yaml
@@ -157,8 +157,11 @@ outputs:
         - when: step|int == 0
           tags: common
           block:
+            - name: get bootstrap nodeid
+              command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
+              register: bootstrap_node
             - name: set is_bootstrap_node fact
-              set_fact: is_bootstrap_node={{ironic_api_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+              set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
             - name: Check if ironic_api is deployed
               command: systemctl is-enabled --quiet openstack-ironic-api
               ignore_errors: True
diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml
index 4a7b2419f8..79341c01c7 100644
--- a/docker/services/nova-api.yaml
+++ b/docker/services/nova-api.yaml
@@ -326,8 +326,11 @@ outputs:
         - when: step|int == 0
           tags: common
           block:
+            - name: get bootstrap nodeid
+              command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
+              register: bootstrap_node
             - name: set is_bootstrap_node fact
-              set_fact: is_bootstrap_node={{nova_api_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+              set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
             - name: Check if nova_api is deployed
               command: systemctl is-enabled --quiet openstack-nova-api
               ignore_errors: True
diff --git a/docker/services/pacemaker/cinder-backup.yaml b/docker/services/pacemaker/cinder-backup.yaml
index f98246a87f..a19767d340 100644
--- a/docker/services/pacemaker/cinder-backup.yaml
+++ b/docker/services/pacemaker/cinder-backup.yaml
@@ -328,9 +328,13 @@ outputs:
             - step|int == 1
             - not cinder_backup_containerized|bool
           block:
+            - name: get bootstrap nodeid
+              tags: common
+              command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
+              register: bootstrap_node
             - name: set is_bootstrap_node fact
               tags: common
-              set_fact: is_bootstrap_node={{cinder_backup_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+              set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
             - name: Check cluster resource status
               pacemaker_resource:
                 resource: openstack-cinder-backup
diff --git a/docker/services/pacemaker/cinder-volume.yaml b/docker/services/pacemaker/cinder-volume.yaml
index 3eb7a6bf90..d6e8ed9ae4 100644
--- a/docker/services/pacemaker/cinder-volume.yaml
+++ b/docker/services/pacemaker/cinder-volume.yaml
@@ -353,9 +353,13 @@ outputs:
             - step|int == 1
             - not cinder_volume_containerized|bool
           block:
+            - name: get bootstrap nodeid
+              tags: common
+              command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
+              register: bootstrap_node
             - name: set is_bootstrap_node fact
               tags: common
-              set_fact: is_bootstrap_node={{cinder_volume_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+              set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
             - name: Check cluster resource status
               pacemaker_resource:
                 resource: openstack-cinder-volume
diff --git a/docker/services/pacemaker/database/mysql.yaml b/docker/services/pacemaker/database/mysql.yaml
index 7fea3a30c5..9e7d02d83e 100644
--- a/docker/services/pacemaker/database/mysql.yaml
+++ b/docker/services/pacemaker/database/mysql.yaml
@@ -362,8 +362,11 @@ outputs:
             - name: Check if Mysql is already containerized
               set_fact:
                 mysql_containerized: "{{mysql_kolla_config.stat.isdir | default(false)}}"
+            - name: get bootstrap nodeid
+              command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
+              register: bootstrap_node
             - name: set is_bootstrap_node fact
-              set_fact: is_bootstrap_node={{mysql_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+              set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
             - name: Prepare the switch to new galera container image name in pacemaker
               when: mysql_containerized|bool
               block:
diff --git a/docker/services/pacemaker/database/redis.yaml b/docker/services/pacemaker/database/redis.yaml
index 0c370582f7..62bf36d1af 100644
--- a/docker/services/pacemaker/database/redis.yaml
+++ b/docker/services/pacemaker/database/redis.yaml
@@ -342,8 +342,11 @@ outputs:
             - name: Check if redis is already containerized
               set_fact:
                 redis_containerized: "{{redis_kolla_config.stat.isdir | default(false)}}"
+            - name: get bootstrap nodeid
+              command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
+              register: bootstrap_node
             - name: set is_bootstrap_node fact
-              set_fact: is_bootstrap_node={{redis_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+              set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
             - name: Prepare the switch to new redis container image name in pacemaker
               when: redis_containerized|bool
               block:
diff --git a/docker/services/pacemaker/haproxy.yaml b/docker/services/pacemaker/haproxy.yaml
index 745bd5187c..54f9b093cd 100644
--- a/docker/services/pacemaker/haproxy.yaml
+++ b/docker/services/pacemaker/haproxy.yaml
@@ -315,9 +315,13 @@ outputs:
           - name: Check if haproxy is already containerized
             set_fact:
               haproxy_containerized: "{{haproxy_kolla_config.stat.isdir | default(false)}}"
+          - name: get bootstrap nodeid
+            tags: common
+            command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
+            register: bootstrap_node
           - name: set is_bootstrap_node fact
             tags: common
-            set_fact: is_bootstrap_node={{haproxy_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+            set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
         - name: Mount TLS cert if needed
           when:
             - step|int == 1
diff --git a/docker/services/pacemaker/manila-share.yaml b/docker/services/pacemaker/manila-share.yaml
index 00c8642bc4..11ccb8b3d3 100644
--- a/docker/services/pacemaker/manila-share.yaml
+++ b/docker/services/pacemaker/manila-share.yaml
@@ -295,9 +295,13 @@ outputs:
             - step|int == 1
             - not manila_share_containerized|bool
           block:
+            - name: get bootstrap nodeid
+              tags: common
+              command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
+              register: bootstrap_node
             - name: set is_bootstrap_node fact
               tags: common
-              set_fact: is_bootstrap_node={{manila_share_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+              set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
             - name: Check cluster resource status
               pacemaker_resource:
                 resource: openstack-manila-share
diff --git a/docker/services/pacemaker/notify-rabbitmq.yaml b/docker/services/pacemaker/notify-rabbitmq.yaml
index bc12f1af10..387bce80b6 100644
--- a/docker/services/pacemaker/notify-rabbitmq.yaml
+++ b/docker/services/pacemaker/notify-rabbitmq.yaml
@@ -311,8 +311,11 @@ outputs:
             - name: Check if Rabbitmq is already containerized
               set_fact:
                 rabbit_containerized: "{{rabbit_kolla_config.stat.isdir | default(false)}}"
+            - name: get bootstrap nodeid
+              command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
+              register: bootstrap_node
             - name: set is_bootstrap_node fact
-              set_fact: is_bootstrap_node={{notify_rabbitmq_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+              set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
         - name: Rabbitmq baremetal to container upgrade tasks
           when:
             - step|int == 1
diff --git a/docker/services/pacemaker/ovn-dbs.yaml b/docker/services/pacemaker/ovn-dbs.yaml
index 12038d8d40..203eb8a711 100644
--- a/docker/services/pacemaker/ovn-dbs.yaml
+++ b/docker/services/pacemaker/ovn-dbs.yaml
@@ -221,8 +221,11 @@ outputs:
         - name: Check if ovn-dbs is already containerized
           set_fact:
             ovn_dbs_containerized: "{{ovn_dbs_log_file.stat.exists | default(false)}}"
+        - name: get bootstrap nodeid
+          command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
+          register: bootstrap_node
         - name: set is_bootstrap_node fact
-          set_fact: is_bootstrap_node={{ovn_dbs_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+          set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
         - name: ovn-dbs fetch and retag container image for pacemaker
           when:
             - step|int == 3
@@ -284,8 +287,11 @@ outputs:
           set_fact:
             ovn_dbs_docker_image: {get_param: DockerOvnDbsImage}
             ovn_dbs_docker_image_latest: *ovn_dbs_image_pcmklatest
+        - name: get bootstrap nodeid
+          command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
+          register: bootstrap_node
         - name: set is_bootstrap_node fact
-          set_fact: is_bootstrap_node={{ovn_dbs_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+          set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
         - name: Prepare the switch to new ovn-dbs container image name in pacemaker
           when:
             - step|int == 0
diff --git a/docker/services/pacemaker/rabbitmq.yaml b/docker/services/pacemaker/rabbitmq.yaml
index 0bfa2dd983..c736252b06 100644
--- a/docker/services/pacemaker/rabbitmq.yaml
+++ b/docker/services/pacemaker/rabbitmq.yaml
@@ -307,8 +307,11 @@ outputs:
         - name: Check if Rabbitmq is already containerized
           set_fact:
             rabbit_containerized: "{{rabbit_kolla_config.stat.isdir | default(false)}}"
+        - name: get bootstrap nodeid
+          command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
+          register: bootstrap_node
         - name: set is_bootstrap_node fact
-          set_fact: is_bootstrap_node={{rabbitmq_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+          set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
         - name: Rabbitmq baremetal to container upgrade tasks
           when:
             - step|int == 1
diff --git a/docker/services/pacemaker/rpc-rabbitmq.yaml b/docker/services/pacemaker/rpc-rabbitmq.yaml
index 65fbc9fb70..a2b3311af3 100644
--- a/docker/services/pacemaker/rpc-rabbitmq.yaml
+++ b/docker/services/pacemaker/rpc-rabbitmq.yaml
@@ -308,8 +308,11 @@ outputs:
         - name: Check if Rabbitmq is already containerized
           set_fact:
             rabbit_containerized: "{{rabbit_kolla_config.stat.isdir | default(false)}}"
+        - name: get bootstrap nodeid
+          command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
+          register: bootstrap_node
         - name: set is_bootstrap_node fact
-          set_fact: is_bootstrap_node={{rpc_rabbitmq_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+          set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
         - name: Rabbitmq baremetal to container upgrade tasks
           when:
             - step|int == 1
diff --git a/puppet/services/database/redis-base.yaml b/puppet/services/database/redis-base.yaml
index ffc1c0ad82..bdea9dad9b 100644
--- a/puppet/services/database/redis-base.yaml
+++ b/puppet/services/database/redis-base.yaml
@@ -80,7 +80,7 @@ outputs:
               params:
                 $NETWORK: {get_param: [ServiceNetMap, RedisNetwork]}
         redis::port: 6379
-        redis::sentinel::master_name: "%{hiera('redis_short_bootstrap_node_name')}"
+        redis::sentinel::master_name: "%{hiera('bootstrap_nodeid')}"
         redis::sentinel::redis_host: "%{hiera('bootstrap_nodeid_ip')}"
         redis::sentinel::notification_script: '/usr/local/bin/redis-notifications.sh'
         redis::sentinel::sentinel_bind:
diff --git a/puppet/services/gnocchi-api.yaml b/puppet/services/gnocchi-api.yaml
index 5eaff5344d..b0f6c6dc11 100644
--- a/puppet/services/gnocchi-api.yaml
+++ b/puppet/services/gnocchi-api.yaml
@@ -188,9 +188,13 @@ outputs:
             - name: Stop gnocchi_api service (running under httpd)
               when: step|int == 1
               service: name=httpd state=stopped
+            - name: get bootstrap nodeid
+              tags: common
+              command: hiera bootstrap_nodeid
+              register: bootstrap_node
             - name: set is_bootstrap_node fact
               tags: common
-              set_fact: is_bootstrap_node={{gnocchi_api_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+              set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
             - name: Setup gnocchi db during upgrade
               command: gnocchi-upgrade
               when:
diff --git a/puppet/services/haproxy-public-tls-inject.yaml b/puppet/services/haproxy-public-tls-inject.yaml
index ddc7cb3f19..5cd9fb2a31 100644
--- a/puppet/services/haproxy-public-tls-inject.yaml
+++ b/puppet/services/haproxy-public-tls-inject.yaml
@@ -84,8 +84,12 @@ outputs:
               stat:
                 path: "{{cert_path}}"
 
+            - name: Assign bootstrap node
+              command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
+              register: bootstrap_node
+
             - name: set is_bootstrap_node fact
-              set_fact: is_bootstrap_node={{haproxy_public_tls_inject_short_bootstrap_node_name == ansible_hostname}}
+              set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
 
             - name: get haproxy status
               register: haproxy_state
diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml
index 86200ebc95..add5f032db 100644
--- a/puppet/services/nova-api.yaml
+++ b/puppet/services/nova-api.yaml
@@ -249,9 +249,13 @@ outputs:
         list_concat:
           - get_attr: [ApacheServiceBase, role_data, upgrade_tasks]
           -
+            - name: get bootstrap nodeid
+              tags: common
+              command: hiera bootstrap_nodeid
+              register: bootstrap_node
             - name: set is_bootstrap_node fact
               tags: common
-              set_fact: is_bootstrap_node={{nova_api_short_bootstrap_node_name|lower == ansible_hostname|lower}}
+              set_fact: is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
             - name: Extra migration for nova tripleo/+bug/1656791
               tags: pre-upgrade
               when: