diff --git a/.cirrus.yml b/.cirrus.yml
index ec04dd176b..5c2a7fa822 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -33,7 +33,7 @@ env:
     UBUNTU_NAME: "ubuntu-2204"
 
     # Image identifiers
-    IMAGE_SUFFIX: "c6447802205601792"
+    IMAGE_SUFFIX: "c5841131699699712"
     # EC2 images
     FEDORA_AMI: "fedora-aws-${IMAGE_SUFFIX}"
     FEDORA_AARCH64_AMI: "fedora-podman-aws-arm64-${IMAGE_SUFFIX}"
diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
index 1d784cc578..81372b2e95 100644
--- a/contrib/cirrus/lib.sh
+++ b/contrib/cirrus/lib.sh
@@ -217,10 +217,11 @@ use_cni() {
     # Other packages depend on nv/av, but we're testing with podman
     # binaries built from source, so it's safe to ignore these deps.
     #
-    # FIXME FIXME FIXME: if/when we bring back Ubuntu (or use Debian),
-    #       someone will have to conditionalize these rpm/dnf commands
     # Do not fail when netavark and aardvark-dns are not installed.
-    rpm -e --nodeps netavark aardvark-dns || true
+    for pkg in aardvark-dns netavark
+    do
+        [ -z "$(rpm -qa | grep $pkg)" ] && echo "$pkg not installed" || rpm -e --nodeps $pkg
+    done
     msg "Installing default CNI configuration"
     dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-plugins*
     cd $GOSRC || exit 1
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh
index 736fc704f2..beabdc3d0e 100755
--- a/contrib/cirrus/runner.sh
+++ b/contrib/cirrus/runner.sh
@@ -92,8 +92,11 @@ function _run_bud() {
 }
 
 function _run_bindings() {
+    # install ginkgo
+    make .install.ginkgo
+
     # shellcheck disable=SC2155
-    export PATH=$PATH:$GOSRC/hack
+    export PATH=$PATH:$GOSRC/hack:$GOSRC/test/tools/build
 
     # if logformatter sees this, it can link directly to failing source lines
     local gitcommit_magic=
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index 01e248c694..b011c2eec9 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -264,7 +264,8 @@ case "$TEST_FLAVOR" in
         pip install --requirement $GOSRC/test/apiv2/python/requirements.txt
         ;&  # continue with next item
     compose)
-        dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-docker*
+        make install.tools
+        dnf install -y podman-docker*
         ;&  # continue with next item
     int)
         make .install.ginkgo
@@ -303,7 +304,7 @@ case "$TEST_FLAVOR" in
         install_test_configs
         ;;
     machine)
-        dnf install -y $PACKAGE_DOWNLOAD_DIR/podman-gvproxy*
+        dnf install -y podman-gvproxy*
         remove_packaged_podman_files
         make install PREFIX=/usr ETCDIR=/etc
         install_test_configs