diff --git a/.cirrus.yml b/.cirrus.yml
index 4e7893e3bf..9c13f5303d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -30,7 +30,7 @@ env:
     PRIOR_UBUNTU_NAME: "ubuntu-2004"
 
     # Google-cloud VM Images
-    IMAGE_SUFFIX: "c6524344056676352"
+    IMAGE_SUFFIX: "c5961289315909632"
     FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
     PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
     UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}"
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index 490d056993..0ec4edbabd 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -583,9 +583,6 @@ USER bin`
 				Skip("Kernel does not support blkio.weight")
 			}
 		}
-		if podmanTest.Host.Distribution == "ubuntu" {
-			Skip("Ubuntu <= 20.10 lacks BFQ scheduler")
-		}
 		if CGROUPSV2 {
 			// convert linearly from [10-1000] to [1-10000]
 			session := podmanTest.Podman([]string{"run", "--rm", "--blkio-weight=15", ALPINE, "sh", "-c", "cat /sys/fs/cgroup/$(sed -e 's|0::||' < /proc/self/cgroup)/io.bfq.weight"})