diff --git a/.cirrus.yml b/.cirrus.yml
index 8c14118..7d220fc 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -74,7 +74,7 @@ verify_windows_task:
         PATH: "${PATH};C:\\Program Files\\RedHat\\Podman"
         MACHINE_IMAGE: "podman-machine.${ARCH}.hyperv.vhdx.zst"
         MACHINE_IMAGE_URL: "https://api.cirrus-ci.com/v1/artifact/build/${CIRRUS_BUILD_ID}/Image Build ${ARCH}/image/${MACHINE_IMAGE}"
-        PODMAN_VERSION: 5.2.5
+        PODMAN_VERSION: 5.3.0
     setup_script: .\contrib\cirrus\windows_setup.ps1
     main_script: |
         $Env:CONTAINERS_MACHINE_PROVIDER = "hyperv"
diff --git a/.github/workflows/pr_image_links.yml b/.github/workflows/pr_image_links.yml
index f3497bc..39026c3 100644
--- a/.github/workflows/pr_image_links.yml
+++ b/.github/workflows/pr_image_links.yml
@@ -65,7 +65,10 @@ jobs:
             - if: steps.retro.outputs.is_pr == 'true'
               name: Print Artifacts output
               id: artifact_output
-              run: ./contrib/cirrus/print-artifacts-urls.sh "${{ steps.retro.outputs.bid }}"
+              run: |
+                  echo 'comment<<EOF' >> $GITHUB_OUTPUT
+                  ./contrib/cirrus/print-artifacts-urls.sh "${{ steps.retro.outputs.bid }}" >> $GITHUB_OUTPUT
+                  echo 'EOF' >> $GITHUB_OUTPUT
 
             - if: steps.retro.outputs.is_pr == 'true'
               name: Send GitHub PR comment
@@ -75,4 +78,4 @@ jobs:
                   # the tag causes it to replace the comment
                   comment-tag: artifacts
                   mode: recreate
-                  message: ${{ steps.artifact_output.outputs.stdout }}
+                  message: "${{ steps.artifact_output.outputs.comment }}"
diff --git a/build.sh b/build.sh
index e700b61..7e7d476 100755
--- a/build.sh
+++ b/build.sh
@@ -13,6 +13,13 @@ fi
 
 echo " Building image locally"
 
+# Validate podman RPM type var, see the Containerfile for the pull logic.
+case "${PODMAN_RPM_TYPE}" in
+  "dev") echo "Will install podman from the podman-next copr, the podman version is ignored" ;;
+  "release") ;;
+  *) echo 'PODMAN_RPM_TYPE must be set to "dev" or "release"' 1>&2; exit 1
+esac
+
 # See podman-rpm-info-vars.sh for all build-arg values. If PODMAN_RPM_TYPE is
 # "dev", the rpm version, release and fedora release values are of no concern
 # to the build process.
diff --git a/contrib/cirrus/print-artifacts-urls.sh b/contrib/cirrus/print-artifacts-urls.sh
index 0e37f59..f40a434 100755
--- a/contrib/cirrus/print-artifacts-urls.sh
+++ b/contrib/cirrus/print-artifacts-urls.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 CIRRUS_BUILD_ID=$1
 
diff --git a/podman-rpm-info-vars.sh b/podman-rpm-info-vars.sh
index a130f35..918b4cd 100755
--- a/podman-rpm-info-vars.sh
+++ b/podman-rpm-info-vars.sh
@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
-# Set PODMAN_RPM_TYPE to anything other than "dev" to build release rpms.
+# Set to "dev" to pull from the podman-next copr, set to "release"
+# to pull the ext rom from the fedora build system based of the versions below.
 export PODMAN_RPM_TYPE="dev"
 
 # If PODMAN_RPM_TYPE is "dev", the vars below don't end up getting used in the
 # build
-export PODMAN_VERSION="5.3.0~rc2"
+export PODMAN_VERSION="5.4.0-dev"
 export PODMAN_RPM_RELEASE="1"