diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
index 8db9c23858..5ef91659ba 100644
--- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
+++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
@@ -149,13 +149,20 @@ outputs:
                   - ''
                   - - "#!/bin/bash\n\n"
                     - {get_param: UpgradeInitCommonCommand}
-            - name: Check yum for rpm-python present
-              package: "name=rpm-python state=present"
-              register: rpm_python_check
-            - name: Fail when rpm-python wasn't present
-              fail: msg="rpm-python package was not present before this run! Check environment before re-running"
-              when:
-                - rpm_python_check.changed != false
+            - name: Ensure TripleO prerequisite packages are installed
+              package:
+                name:
+                  - jq
+                  - lvm2
+                  - net-snmp
+                  - openstack-selinux
+                  - os-net-config
+                  - pacemaker
+                  - pcs
+                  - puppet-tripleo
+                  - python3-heat-agent*
+                state: present
+              when: ansible_distribution_major_version == '8'
         # With the layered product packaging, the key package is rhosp-openvswitch. It depends on
         # a openvswitch package that includes the version as part of the name (e.g openvswitch2.10).
         # This requires some additional special handling:
diff --git a/environments/lifecycle/upgrade-prepare.yaml b/environments/lifecycle/upgrade-prepare.yaml
index 6b6da5292f..717160c66b 100644
--- a/environments/lifecycle/upgrade-prepare.yaml
+++ b/environments/lifecycle/upgrade-prepare.yaml
@@ -12,8 +12,3 @@ parameter_defaults:
   UpgradeInitCommonCommand: |
     #!/bin/bash
     set -eu
-    yum install -y python-heat-agent-*
-    yum update -y ansible
-    yum install -y ansible-pacemaker
-    # Remove the element os-net-config config.json https://bugs.launchpad.net/tripleo/+bug/1758161/
-    rm /usr/libexec/os-apply-config/templates/etc/os-net-config/config.json || true