diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index dafc5bf615..4744fe2db6 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -918,17 +918,6 @@ outputs:
                   when: tripleo_role_name == '{{role.name}}'
                   name: Run Fast Forward Upgrade Prep Workarounds for {{role.name}}
 {%- endfor %}
-{% raw %}
-                - name: get bootstrap nodeid
-                  tags: common
-                  command: hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid
-                  register: bootstrap_node
-                - name: set is_bootstrap_node ffu_packages_bootstrap_only facts
-                  tags: common
-                  set_fact:
-                    is_bootstrap_node={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
-                    ffu_packages_apply={{bootstrap_node.stdout|lower == ansible_hostname|lower}}
-{% endraw %}
                 - name: Create /var/lib/docker-puppet
                   file: path=/var/lib/docker-puppet state=directory setype=svirt_sandbox_file_t selevel=s0 recurse=true
                 - name: Write docker-puppet.py
diff --git a/puppet/services/tripleo-packages.yaml b/puppet/services/tripleo-packages.yaml
index 4bdd93cf02..6a1440b594 100644
--- a/puppet/services/tripleo-packages.yaml
+++ b/puppet/services/tripleo-packages.yaml
@@ -256,6 +256,8 @@ outputs:
             enabled: yes
             state: started
       fast_forward_upgrade_tasks:
+        - name: set is_bootstrap_node fact
+          set_fact: is_bootstrap_node={{tripleo_packages_short_bootstrap_node_name|lower == ansible_hostname|lower}}
         - name: Register repo type and args
           set_fact:
             fast_forward_repo_type: {get_param: FastForwardRepoType}
@@ -277,7 +279,7 @@ outputs:
               command: "tripleo-repos {{ fast_forward_repo_args.tripleo_repos[release] }}"
           when:
           - step|int == 3
-          - ffu_packages_apply|bool
+          - is_bootstrap_node|bool
           - fast_forward_repo_type == 'tripleo-repos'
         - block:
             - name: Create custom Script for upgrading repo.
@@ -289,7 +291,7 @@ outputs:
               shell: "/root/ffu_update_repo.sh {{release}}"
           when:
             - step|int == 3
-            - ffu_packages_apply|bool
+            - is_bootstrap_node|bool
             - fast_forward_repo_type == 'custom-script'
       fast_forward_post_upgrade_tasks:
         - name: Register repo type and args
@@ -310,7 +312,7 @@ outputs:
             - name: Enable tripleo-repos
               command: "tripleo-repos {{ fast_forward_repo_args.tripleo_repos[release] }}"
           when:
-          - ffu_packages_apply|bool
+          - is_bootstrap_node|bool
           - fast_forward_repo_type == 'tripleo-repos'
 
         - block:
@@ -322,5 +324,5 @@ outputs:
             - name: Execute custom script for upgrading repo.
               shell: "/root/ffu_update_repo.sh {{release}}"
           when:
-            - ffu_packages_apply|bool
+            - is_bootstrap_node|bool
             - fast_forward_repo_type == 'custom-script'