3 files changed, 2 insertions, 4 deletions
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index 462fa332a..97901cfc7 100644
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -211,6 +211,8 @@ setup_rootless() {
         # Works with older versions of bash
         printf "${_env_var_name}=%q\n" "$(printenv $_env_var_name)" >> "/home/$ROOTLESS_USER/.bashrc"
     done
+    echo "Ensure the systems ssh process is up and running"
+    systemctl --wait restart sshd  # a regular 'start' could hang forever
 }
 
 # Helper/wrapper script to only show stderr/stdout on non-zero exit
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh
index 33e240895..4388dc992 100644
--- a/contrib/cirrus/packer/fedora_setup.sh
+++ b/contrib/cirrus/packer/fedora_setup.sh
@@ -76,8 +76,6 @@ install_conmon
 CNI_COMMIT=$FEDORA_CNI_COMMIT
 install_cni_plugins
 
-install_buildah
-
 sudo /tmp/libpod/hack/install_catatonit.sh
 
 rh_finalize # N/B: Halts system!
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index 17e274d97..f183932c1 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -99,8 +99,6 @@ install_conmon
 
 install_cni_plugins
 
-install_buildah
-
 sudo /tmp/libpod/hack/install_catatonit.sh
 
 install_varlink