diff --git a/board/common/overlay/usr/libexec/list-versions-bitbucket b/board/common/overlay/usr/libexec/list-versions-bitbucket
index e54c188a84..044ea42791 100755
--- a/board/common/overlay/usr/libexec/list-versions-bitbucket
+++ b/board/common/overlay/usr/libexec/list-versions-bitbucket
@@ -5,10 +5,13 @@ if [ -z "$1" ]; then
     exit -1
 fi
 
+extensions=".img.gz .img.xz .img"
 opts="-s -S -f"
 test -n "$FW_USERNAME" && opts+=" --user $FW_USERNAME:$FW_PASSWORD"
 url="https://api.bitbucket.org/2.0/repositories/$1/downloads?pagelen=100&_=$(date +%s)"
-jq_expr='.values[] | [{a: .name | split("-"), url: .links.self.href}] | map((.a[2] | rtrimstr(".img.gz") | rtrimstr(".img")), "false", .a[1], .url) | join("|")'
+
+rtrimstr=$(for e in $extensions; do echo -n " | rtrimstr(\"$e\")"; done)
+jq_expr=".values[] | [{a: .name | split(\"-\"), url: .links.self.href}] | map((.a[2] $rtrimstr), \"false\", .a[1], .url) | join(\"|\")"
 
 curl $opts $url | jq --raw-output "$jq_expr"
 exit ${PIPESTATUS[0]}