diff --git a/system_files/desktop/shared/usr/bin/bazzite-rollback-helper b/system_files/desktop/shared/usr/bin/bazzite-rollback-helper
index 7ac2c51f..0a7501e1 100755
--- a/system_files/desktop/shared/usr/bin/bazzite-rollback-helper
+++ b/system_files/desktop/shared/usr/bin/bazzite-rollback-helper
@@ -39,10 +39,10 @@ EOF
 if [[ "$1" == "list" ]]; then
   if [ -z "$2" ]; then
       echo "Listing images for $DEFAULT_BRANCH"
-      skopeo list-tags docker://ghcr.io/ublue-os/bazzite | grep -- "-$DEFAULT_BRANCH-" | sort -rV
+      skopeo list-tags docker://ghcr.io/ublue-os/bazzite | grep -E "\"$DEFAULT_BRANCH-[0-9]+\.[0-9]+|-$DEFAULT_BRANCH-[0-9]+" | sort -rV
   else
       echo "Listing images for $2"
-      skopeo list-tags docker://ghcr.io/ublue-os/bazzite | grep -- "-$2-" | sort -rV
+      skopeo list-tags docker://ghcr.io/ublue-os/bazzite | grep -E "\"$2-[0-9]+\.[0-9]+|-$2-[0-9]+" | sort -rV
   fi
 
 elif [[ "$1" == "rollback" ]]; then
@@ -83,4 +83,4 @@ EOF
 # display the helptext
 elif [[ "$1" == "-h" || "$1" == "--h" || "$1" == "-help" || "$1" == "--help" || "$1" == "help" || -z "$1" ]]; then
  echo "$helptext"
-fi
\ No newline at end of file
+fi