diff --git a/01_install_requirements.sh b/01_install_requirements.sh
index 709349b7c9be..ab50384116e1 100755
--- a/01_install_requirements.sh
+++ b/01_install_requirements.sh
@@ -19,13 +19,31 @@ if [ -z "${METAL3_DEV_ENV}" ]; then
   # TODO -- come up with a plan for continuously updating this
   # Note we only do this in the case where METAL3_DEV_ENV is
   # unset, to enable developer testing of local checkouts
-  git reset 553e12f0f6c5f1af6761d7b4799e77b5df607572 --hard
+  git reset 8908da5241d52e25a7e1b2e60d6d604cf797f890 --hard
   popd
 fi
 
+# Update to latest packages first
+sudo dnf -y upgrade
+
+# Install additional repos as needed for each OS version
+# shellcheck disable=SC1091
+source /etc/os-release
+export DISTRO="${ID}${VERSION_ID%.*}"
+if [[ $DISTRO == "centos8" ]]; then
+    sudo dnf -y install epel-release dnf --enablerepo=extras
+elif [[ $DISTRO == "rhel8" ]]; then
+    sudo subscription-manager repos --enable=ansible-2-for-rhel-8-x86_64-rpms
+fi
+
+# Install ansible, other packages are installed via
+# vm-setup/install-package-playbook.yml
+sudo dnf -y install python3 ansible
+sudo alternatives --set python /usr/bin/python3
+
 pushd ${METAL3_DEV_ENV_PATH}
-./centos_install_requirements.sh
 ansible-galaxy install -r vm-setup/requirements.yml
+ansible-galaxy collection install ansible.netcommon ansible.posix
 ANSIBLE_FORCE_COLOR=true ansible-playbook \
   -e "working_dir=$WORKING_DIR" \
   -e "virthost=$HOSTNAME" \
diff --git a/common.sh b/common.sh
index 28f6037e41ff..4aa034c30aa9 100644
--- a/common.sh
+++ b/common.sh
@@ -220,6 +220,7 @@ else
   export METAL3_DEV_ENV_PATH="${METAL3_DEV_ENV}"
 fi
 export VM_SETUP_PATH="${METAL3_DEV_ENV_PATH}/vm-setup"
+export CONTAINER_RUNTIME="podman"
 
 export NUM_MASTERS=${NUM_MASTERS:-"3"}
 export NUM_WORKERS=${NUM_WORKERS:-"2"}