diff --git a/.cirrus.yml b/.cirrus.yml
index 32517617987..966ab681c75 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -28,15 +28,15 @@ env:
     #### Cache-image names to test with
     ###
     ACTIVE_CACHE_IMAGE_NAMES: >-
-        fedora-28-libpod-6318419153518592
-        fedora-29-libpod-6318419153518592
-        ubuntu-18-libpod-6318419153518592
-        rhel-7-libpod-6318419153518592
+        fedora-28-libpod-5731bf42
+        fedora-29-libpod-5731bf42
+        ubuntu-18-libpod-5731bf42
+        rhel-7-libpod-5731bf42
         image-builder-image-1541772081
-    FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-6318419153518592"
-    PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-6318419153518592"
-    UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-6318419153518592"
-    PRIOR_RHEL_CACHE_IMAGE_NAME: "rhel-7-libpod-6318419153518592"
+    FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-5731bf42"
+    PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-5731bf42"
+    UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-5731bf42"
+    PRIOR_RHEL_CACHE_IMAGE_NAME: "rhel-7-libpod-5731bf42"
     # RHEL_CACHE_IMAGE_NAME: "rhel-8-notready"
     # CENTOS_CACHE_IMAGE_NAME: "centos-7-notready"
 
diff --git a/contrib/cirrus/packer/centos_setup.sh b/contrib/cirrus/packer/centos_setup.sh
index d947a1d7f00..dee098b9e20 100644
--- a/contrib/cirrus/packer/centos_setup.sh
+++ b/contrib/cirrus/packer/centos_setup.sh
@@ -41,6 +41,7 @@ ooe.sh sudo yum -y install \
     golang-github-cpuguy83-go-md2man \
     gpgme-devel \
     iptables \
+    jq \
     libassuan-devel \
     libcap-devel \
     libnet \
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh
index 84aee7667de..9d4e09a2bf2 100644
--- a/contrib/cirrus/packer/fedora_setup.sh
+++ b/contrib/cirrus/packer/fedora_setup.sh
@@ -42,6 +42,7 @@ ooe.sh sudo dnf install -y \
     gpgme-devel \
     iptables \
     iproute \
+    jq \
     libassuan-devel \
     libcap-devel \
     libnet \
diff --git a/contrib/cirrus/packer/rhel_setup.sh b/contrib/cirrus/packer/rhel_setup.sh
index 20be97f9b5e..448ef5ba4ac 100644
--- a/contrib/cirrus/packer/rhel_setup.sh
+++ b/contrib/cirrus/packer/rhel_setup.sh
@@ -47,6 +47,7 @@ ooe.sh sudo yum -y install \
     golang-github-cpuguy83-go-md2man \
     gpgme-devel \
     iptables \
+    jq \
     libassuan-devel \
     libcap-devel \
     libnet \
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index 24f1cce2154..cbb1e678357 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -49,8 +49,9 @@ ooe.sh sudo -E apt-get -qq install \
     gettext \
     go-md2man \
     golang \
-    iproute \
+    iproute2 \
     iptables \
+    jq \
     libaio-dev \
     libapparmor-dev \
     libcap-dev \