diff --git a/build/scripts/cache_images.sh b/build/scripts/cache_images.sh
index 87549b330..58136784f 100755
--- a/build/scripts/cache_images.sh
+++ b/build/scripts/cache_images.sh
@@ -40,7 +40,7 @@ while read -r image; do
   image_dir="${RESOURCES_DIR%/}/${image_dir%/*}"
   mkdir -p "$image_dir"
 
-  cached_image="${image_dir%/}/${filename}"
+  cached_image="${image_dir%/}/${filename%\?*}"
   mv "$file" "$cached_image"
   echo "  Downloaded image $image to $cached_image"