diff --git a/.obs/helper_scripts/checkimages.sh b/.obs/helper_scripts/checkimages.sh
index 54241ac0..0a64d3ab 100755
--- a/.obs/helper_scripts/checkimages.sh
+++ b/.obs/helper_scripts/checkimages.sh
@@ -58,3 +58,6 @@ channels=$(findChannels "${OPERATOR_IMAGES}")
 for channel in ${channels}; do
   checkChannel ${channel}
 done
+
+echo "All images successfully checked!"
+exit 0
diff --git a/.obs/helper_scripts/listimages.sh b/.obs/helper_scripts/listimages.sh
index cff2975a..9e97c42b 100755
--- a/.obs/helper_scripts/listimages.sh
+++ b/.obs/helper_scripts/listimages.sh
@@ -38,8 +38,14 @@ done
 echo "${REGISTRY}/rancher/elemental-operator:${OPERATOR}"
 echo "${REGISTRY}/rancher/seedimage-builder:${OPERATOR}"
 
-echo "${REGISTRY}/rancher/elemental-channel:${OPERATOR}"
-echo "${REGISTRY}/rancher/elemental-rt-channel:${OPERATOR}"
+# Note sort -V is a natural numbering sort, not semver
+higher_ver=$(printf '%s\n' "${OPERATOR}" "1.6.0" | sort -rV | head -n1)
+if [ "${higher_ver}" == "1.6.0" ]; then
+  echo "${REGISTRY}/rancher/elemental-channel:${OPERATOR}"
+  echo "${REGISTRY}/rancher/elemental-rt-channel:${OPERATOR}"
+else
+  echo "${REGISTRY}/rancher/elemental-channel/sl-micro:6.0-baremetal"
+fi
 
 # Assume if not registry.suse.com it should be some OBS path, hence
 # charts require a different repository than containers