diff --git a/.gitlab-ci/install-cross.sh b/.gitlab-ci/install-cross.sh
index e628b298b..dd538e9a0 100755
--- a/.gitlab-ci/install-cross.sh
+++ b/.gitlab-ci/install-cross.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 # Copyright 2019-2020, Mesa contributors
-# Copyright 2020, Collabora, Ltd.
+# Copyright 2020-2024, Collabora, Ltd.
 # SPDX-License-Identifier: MIT
 
-# Based on https://gitlab.freedesktop.org/mesa/mesa/-/blob/master/.gitlab-ci/container/x86_build.sh
+# Based on https://gitlab.freedesktop.org/mesa/mesa/-/blob/2e100bd69b67cbb70b8a8e813ed866618a2252ca/.gitlab-ci/container/cross_build.sh
 
 set -e
 set -o xtrace
@@ -21,26 +21,26 @@ for arch in $CROSS_ARCHITECTURES; do
     # OpenCV and libuvc aren't on this list because
     # they apparently can't be installed in both architectures at once
     apt-get install -y --no-install-recommends --no-remove \
-            crossbuild-essential-${arch} \
-            libelf-dev:${arch} \
-            libegl1-mesa-dev:${arch} \
-            libgl1-mesa-dev:${arch} \
-            libglvnd-dev:${arch} \
-            libhidapi-dev:${arch} \
-            libudev-dev:${arch} \
-            libusb-1.0-0-dev:${arch} \
-            libv4l-dev:${arch} \
-            libvulkan-dev:${arch} \
-            libwayland-dev:${arch} \
-            libx11-dev:${arch} \
-            libxcb-randr0-dev:${arch} \
-            libxrandr-dev:${arch} \
-            libxxf86vm-dev:${arch}
+            "crossbuild-essential-${arch}" \
+            "libelf-dev:${arch}" \
+            "libegl1-mesa-dev:${arch}" \
+            "libgl1-mesa-dev:${arch}" \
+            "libglvnd-dev:${arch}" \
+            "libhidapi-dev:${arch}" \
+            "libudev-dev:${arch}" \
+            "libusb-1.0-0-dev:${arch}" \
+            "libv4l-dev:${arch}" \
+            "libvulkan-dev:${arch}" \
+            "libwayland-dev:${arch}" \
+            "libx11-dev:${arch}" \
+            "libxcb-randr0-dev:${arch}" \
+            "libxrandr-dev:${arch}" \
+            "libxxf86vm-dev:${arch}"
 
     if [ "$arch" != "i386" ]; then
-        mkdir /var/cache/apt/archives/${arch}
+        mkdir "/var/cache/apt/archives/${arch}"
         apt-get install -y --no-remove \
-                libstdc++6:${arch}
+                "libstdc++6:${arch}"
     fi
 done