diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index fb2da8c1f..2afb4aea2 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -126,6 +126,10 @@
       nodepool_diskimage:
         base_element : fedora-container
         release: '36'
+    # NOTE(ianw) 2022-07-11 : something in jammy has broken running
+    # podman inside docker.  Investigations continue, but force this
+    # back for now.
+    nodeset: ubuntu-focal
 
 - job:
     name: dib-nodepool-functional-openstack-rockylinux-8-containerfile-src
@@ -139,6 +143,10 @@
       nodepool_diskimage:
         base_element: rocky-container
         release: '8'
+    # NOTE(ianw) 2022-07-11 : something in jammy has broken running
+    # podman inside docker.  Investigations continue, but force this
+    # back for now.
+    nodeset: ubuntu-focal
 
 - job:
     name: dib-nodepool-functional-openstack-ubuntu-xenial-src
diff --git a/diskimage_builder/elements/ubuntu/root.d/10-cache-ubuntu-tarball b/diskimage_builder/elements/ubuntu/root.d/10-cache-ubuntu-tarball
index 0babcefbe..19cd220be 100755
--- a/diskimage_builder/elements/ubuntu/root.d/10-cache-ubuntu-tarball
+++ b/diskimage_builder/elements/ubuntu/root.d/10-cache-ubuntu-tarball
@@ -41,10 +41,10 @@ function get_ubuntu_tarball() {
             $TMP_HOOKS_PATH/bin/cache-url \
                 $DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE $CACHED_FILE
             pushd $DIB_IMAGE_CACHE
-            if ! grep "$BASE_IMAGE_FILE" $CACHED_SUMS | sha256sum --check - ; then
+            if ! grep "${BASE_IMAGE_FILE}$" $CACHED_SUMS | sha256sum --check - ; then
                 $TMP_HOOKS_PATH/bin/cache-url -f \
                     $DIB_CLOUD_IMAGES/$BASE_IMAGE_FILE $CACHED_FILE
-                grep "$BASE_IMAGE_FILE" $CACHED_SUMS | sha256sum --check -
+                grep "${BASE_IMAGE_FILE}$" $CACHED_SUMS | sha256sum --check -
             fi
         fi
         IMAGE_PATH=$DIB_IMAGE_CACHE/$BASE_IMAGE_FILE