diff --git a/Dockerfile.in b/Dockerfile.in
index aa70f249..89829c5d 100644
--- a/Dockerfile.in
+++ b/Dockerfile.in
@@ -24,7 +24,7 @@ ENV CFLAGS="-I${TARGET_DIR}/include $CFLAGS"
 
 # Prepare Debian build environment
 RUN apt-get update \
- && apt-get upgrade -y \
+ && apt-get dist-upgrade -y \
  && apt-get install -y apt-transport-https \
     curl ninja-build debhelper gnupg wget devscripts \ 
     mmv equivs git nasm pkg-config subversion dh-autoreconf \
@@ -51,4 +51,4 @@ VOLUME ${ARTIFACT_DIR}/
 
 COPY . ${SOURCE_DIR}/
 
-ENTRYPOINT ["/docker-build.sh"]
\ No newline at end of file
+ENTRYPOINT ["/docker-build.sh"]
diff --git a/Dockerfile.win64.in b/Dockerfile.win64.in
index 1492ad61..90dfae7d 100644
--- a/Dockerfile.win64.in
+++ b/Dockerfile.win64.in
@@ -24,13 +24,14 @@ ENV DEBIAN_FRONTEND=noninteractive \
 
 # Prepare Debian and mingw-w64 build environment
 RUN apt-get update \
+ && apt-get dist-upgrade -y \
  && apt-get install -y \ 
     build-essential yasm nasm xxd pkgconf git curl \
     wget unzip subversion autoconf automake libtool \
     libtool-bin autopoint cmake clang texinfo texi2html \
     help2man flex bison gperf gettext itstool ragel \
     libc6-dev libssl-dev gtk-doc-tools gobject-introspection \
-    gawk meson ninja-build p7zip-full python3-distutils \
+    gawk meson ninja-build p7zip-full python3-setuptools \
     python3-apt python-is-python3 zip quilt \
     binutils-mingw-w64-x86-64 gcc-mingw-w64-x86-64 \
     g++-mingw-w64-x86-64 gfortran-mingw-w64-x86-64 \
diff --git a/builder/images/base/Dockerfile b/builder/images/base/Dockerfile
index d1cf665c..1114f591 100644
--- a/builder/images/base/Dockerfile
+++ b/builder/images/base/Dockerfile
@@ -11,7 +11,7 @@ RUN \
         gperf itstool ragel libc6-dev zlib1g-dev libssl-dev \
         gtk-doc-tools gobject-introspection gawk \
         ocaml ocamlbuild libnum-ocaml-dev indent p7zip-full \
-        python3-distutils python3-jinja2 python3-apt python-is-python3 && \
+        python3-setuptools python3-jinja2 python3-apt python-is-python3 && \
     apt-get -y clean && \
     git config --global user.email "builder@localhost" && \
     git config --global user.name "Builder" && \
diff --git a/builder/scripts.d/10-mingw.sh b/builder/scripts.d/10-mingw.sh
index 948668ab..4776adb5 100755
--- a/builder/scripts.d/10-mingw.sh
+++ b/builder/scripts.d/10-mingw.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://git.code.sf.net/p/mingw-w64/mingw-w64.git"
-SCRIPT_COMMIT="0bac2d3cdb122dadcdee90009f7e24a69d56939f"
+SCRIPT_COMMIT="93059a6ae05d8e0b42bec5039818003a9f6329b1"
 
 ffbuild_enabled() {
     [[ $TARGET == win* ]] || return -1
diff --git a/builder/scripts.d/20-libxml2.sh b/builder/scripts.d/20-libxml2.sh
index b5d7e456..caedf671 100755
--- a/builder/scripts.d/20-libxml2.sh
+++ b/builder/scripts.d/20-libxml2.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/GNOME/libxml2.git"
-SCRIPT_COMMIT="d4d1f3f33d6d4a5e31511281637a857944946e65"
+SCRIPT_COMMIT="20b0bd9800ae83cbd70f4407ce67058164e16227"
 
 ffbuild_enabled() {
     return 0
diff --git a/builder/scripts.d/20-zlib.sh b/builder/scripts.d/20-zlib.sh
index 05f3ea0e..3d1dbd9e 100755
--- a/builder/scripts.d/20-zlib.sh
+++ b/builder/scripts.d/20-zlib.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/madler/zlib.git"
-SCRIPT_COMMIT="99b229487c2997b4b22eaef90fedfbff4d8826cc"
+SCRIPT_COMMIT="0f51fb4933fc9ce18199cb2554dacea8033e7fd3"
 
 ffbuild_enabled() {
     return 0
diff --git a/builder/scripts.d/25-fftw3f.sh b/builder/scripts.d/25-fftw3f.sh
index faa9f303..752ed880 100755
--- a/builder/scripts.d/25-fftw3f.sh
+++ b/builder/scripts.d/25-fftw3f.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/FFTW/fftw3.git"
-SCRIPT_COMMIT="d0ce926f1523d95daed48cd7c69572e068dbbfb3"
+SCRIPT_COMMIT="394fa85ab5f8914b82b3404844444c53f5c7f095"
 
 ffbuild_enabled() {
     # Dependency of GPL-Only librubberband
diff --git a/builder/scripts.d/25-fribidi.sh b/builder/scripts.d/25-fribidi.sh
index 3d09d461..59ffc522 100755
--- a/builder/scripts.d/25-fribidi.sh
+++ b/builder/scripts.d/25-fribidi.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/fribidi/fribidi.git"
-SCRIPT_COMMIT="e01a424c7cef4e805879ddcdc47f163f2a2f39dc"
+SCRIPT_COMMIT="bfb0385ef862cd40af7d5d33648fbb4bfe8eee65"
 
 ffbuild_enabled() {
     return 0
diff --git a/builder/scripts.d/25-xz.sh b/builder/scripts.d/25-xz.sh
index 5d422710..77aac7a2 100755
--- a/builder/scripts.d/25-xz.sh
+++ b/builder/scripts.d/25-xz.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
-SCRIPT_REPO="https://github.com/xz-mirror/xz.git"
-SCRIPT_COMMIT="74c3449d8b816a724b12ebce7417e00fb597309a"
+SCRIPT_REPO="https://git.tukaani.org/xz.git"
+SCRIPT_COMMIT="v5.6.1"
+SCRIPT_TAGFILTER="v?.*.*"
 
 ffbuild_enabled() {
     return 0
diff --git a/builder/scripts.d/35-fontconfig.sh b/builder/scripts.d/35-fontconfig.sh
index c01023f9..bfd2ede2 100755
--- a/builder/scripts.d/35-fontconfig.sh
+++ b/builder/scripts.d/35-fontconfig.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git"
-SCRIPT_COMMIT="c6849aca73c60c3fcba5c6e4e2cb2d7b59050dd2"
+SCRIPT_COMMIT="5a6fef681bfd27e6b733a48f3c43a5da042745a8"
 
 ffbuild_enabled() {
     return 0
diff --git a/builder/scripts.d/45-harfbuzz.sh b/builder/scripts.d/45-harfbuzz.sh
index 798eb3d6..b7574ad0 100755
--- a/builder/scripts.d/45-harfbuzz.sh
+++ b/builder/scripts.d/45-harfbuzz.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
-SCRIPT_COMMIT="f1ac867deec0500fed94f965b6da25f9fcd434de"
+SCRIPT_COMMIT="c053e8f29257814e11ad61493dbbe29f27656de4"
 
 ffbuild_enabled() {
     return 0
diff --git a/builder/scripts.d/45-x11/10-xproto.sh b/builder/scripts.d/45-x11/10-xproto.sh
index fb170738..ac02730c 100755
--- a/builder/scripts.d/45-x11/10-xproto.sh
+++ b/builder/scripts.d/45-x11/10-xproto.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git"
-SCRIPT_COMMIT="db56b508f25629ab1022038131758ce48e6daf82"
+SCRIPT_COMMIT="68de489ec6c2fb6f8cfc47b0bba7edd0f9942f17"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
diff --git a/builder/scripts.d/45-x11/10-xtrans.sh b/builder/scripts.d/45-x11/10-xtrans.sh
index 8f041be8..4c62ca2b 100755
--- a/builder/scripts.d/45-x11/10-xtrans.sh
+++ b/builder/scripts.d/45-x11/10-xtrans.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxtrans.git"
-SCRIPT_COMMIT="806f04c6e4529358f160e53135baf105e4ecf3b8"
+SCRIPT_COMMIT="656d27ed32af4082e8062c1d7c42b65ea3a6b80f"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
diff --git a/builder/scripts.d/45-x11/30-libxcb.sh b/builder/scripts.d/45-x11/30-libxcb.sh
index df4331c8..43a9e960 100755
--- a/builder/scripts.d/45-x11/30-libxcb.sh
+++ b/builder/scripts.d/45-x11/30-libxcb.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git"
-SCRIPT_COMMIT="86a478032ba93f30adbc0ce96eecd3420fdf7ed1"
+SCRIPT_COMMIT="389f22d1cb53e47337e96d9f78a3ef0001e8e588"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
diff --git a/builder/scripts.d/45-x11/40-libx11.sh b/builder/scripts.d/45-x11/40-libx11.sh
index 23e46a56..64040245 100755
--- a/builder/scripts.d/45-x11/40-libx11.sh
+++ b/builder/scripts.d/45-x11/40-libx11.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git"
-SCRIPT_COMMIT="4ab58f26d388c82ffe46ef1c7dd1cee6259eec8a"
+SCRIPT_COMMIT="a465588218c1643eedc35b3c24409cb775454eee"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
diff --git a/builder/scripts.d/50-amf.sh b/builder/scripts.d/50-amf.sh
index 3415ec97..1f2f1e2d 100755
--- a/builder/scripts.d/50-amf.sh
+++ b/builder/scripts.d/50-amf.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
-SCRIPT_COMMIT="5b32766b801434be61350c292127a9ac022b1268"
+SCRIPT_COMMIT="e1acd43bb000f7e0c3a2bd022a145aa931169bc6"
 
 ffbuild_enabled() {
     [[ $TARGET == mac* ]] && return -1
diff --git a/builder/scripts.d/50-dav1d.sh b/builder/scripts.d/50-dav1d.sh
index af627de0..dbe5a884 100755
--- a/builder/scripts.d/50-dav1d.sh
+++ b/builder/scripts.d/50-dav1d.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
-SCRIPT_COMMIT="8e08426468a76d8a667e8a79d92bafd85d7411ac"
+SCRIPT_COMMIT="dc9490134f8a3665843f287f721dc587e7c48ea2"
 
 ffbuild_enabled() {
     return 0
diff --git a/builder/scripts.d/50-libass.sh b/builder/scripts.d/50-libass.sh
index 8fe14ba2..a0610001 100755
--- a/builder/scripts.d/50-libass.sh
+++ b/builder/scripts.d/50-libass.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/libass/libass.git"
-SCRIPT_COMMIT="649a7c2e1fc6f4188ea1a89968560715800b883d"
+SCRIPT_COMMIT="6eaa67daabdba10248fd13692403691effec0d8e"
 
 ffbuild_enabled() {
     return 0
diff --git a/builder/scripts.d/50-libopus.sh b/builder/scripts.d/50-libopus.sh
index 1e3f3726..8da98a2a 100755
--- a/builder/scripts.d/50-libopus.sh
+++ b/builder/scripts.d/50-libopus.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/xiph/opus.git"
-SCRIPT_COMMIT="95dbea83486b90256785aa3c75dd2827f591a34c"
+SCRIPT_COMMIT="ddbe48383984d56acd9e1ab6a090c54ca6b735a6"
 
 ffbuild_enabled() {
     return 0
diff --git a/builder/scripts.d/50-libvpx.sh b/builder/scripts.d/50-libvpx.sh
index 0b641796..41b06dff 100755
--- a/builder/scripts.d/50-libvpx.sh
+++ b/builder/scripts.d/50-libvpx.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
-SCRIPT_COMMIT="cab4f31e1d474c75c1dfd54312d0e9d9c16f4839"
+SCRIPT_COMMIT="3dbab0e66479e1b5368d4b7a069051dba85843cf"
 
 ffbuild_enabled() {
     return 0
diff --git a/builder/scripts.d/50-libwebp.sh b/builder/scripts.d/50-libwebp.sh
index f504c890..e64d4714 100755
--- a/builder/scripts.d/50-libwebp.sh
+++ b/builder/scripts.d/50-libwebp.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
-SCRIPT_COMMIT="40e85a0b563593bb51b05228e9e30b582604de97"
+SCRIPT_COMMIT="b3d1b2cbf7e6286832876cc720dee96cd1945aec"
 
 ffbuild_enabled() {
     return 0
diff --git a/builder/scripts.d/50-openmpt.sh b/builder/scripts.d/50-openmpt.sh
index f75c5577..e006eaad 100755
--- a/builder/scripts.d/50-openmpt.sh
+++ b/builder/scripts.d/50-openmpt.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
-SCRIPT_REV="20417"
+SCRIPT_REV="20563"
 
 ffbuild_enabled() {
     return 0
diff --git a/builder/scripts.d/50-srt.sh b/builder/scripts.d/50-srt.sh
index 25657c24..6de13399 100755
--- a/builder/scripts.d/50-srt.sh
+++ b/builder/scripts.d/50-srt.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/Haivision/srt.git"
-SCRIPT_COMMIT="84b5bb8c2bfd331ac55aba70fe09e5d3cbb00dee"
+SCRIPT_COMMIT="c156dab75b83c12bb8dbbda77dab569db22b3b78"
 
 ffbuild_enabled() {
     return 0
diff --git a/builder/scripts.d/50-svtav1.sh b/builder/scripts.d/50-svtav1.sh
index 9d5de242..523dd137 100755
--- a/builder/scripts.d/50-svtav1.sh
+++ b/builder/scripts.d/50-svtav1.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-SCRIPT_COMMIT="2aeeb4f1a1d495b84bf5c21dbb60ae10e991fada"
+SCRIPT_COMMIT="bd9e31f16afb43a176a9ba39e9b04e0a9a12c907"
 
 ffbuild_enabled() {
     [[ $TARGET == win32 ]] && return -1
diff --git a/builder/scripts.d/50-vaapi/30-libpciaccess.sh b/builder/scripts.d/50-vaapi/30-libpciaccess.sh
index 87d7399f..7441bc61 100755
--- a/builder/scripts.d/50-vaapi/30-libpciaccess.sh
+++ b/builder/scripts.d/50-vaapi/30-libpciaccess.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git"
-SCRIPT_COMMIT="ad7e9cb4b291a46812eea321f0634cfc46fb94e2"
+SCRIPT_COMMIT="2ec2576cabefef1eaa5dd9307c97de2e887fc347"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1
diff --git a/builder/scripts.d/50-vulkan/45-vulkan.sh b/builder/scripts.d/50-vulkan/45-vulkan.sh
index 73ca325b..8ffe56a8 100755
--- a/builder/scripts.d/50-vulkan/45-vulkan.sh
+++ b/builder/scripts.d/50-vulkan/45-vulkan.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
-SCRIPT_COMMIT="v1.3.280"
+SCRIPT_COMMIT="v1.3.283"
 SCRIPT_TAGFILTER="v?.*.*"
 
 ffbuild_enabled() {
diff --git a/builder/scripts.d/50-vulkan/55-spirv-cross.sh b/builder/scripts.d/50-vulkan/55-spirv-cross.sh
index de3d9b8d..6b2bedc4 100755
--- a/builder/scripts.d/50-vulkan/55-spirv-cross.sh
+++ b/builder/scripts.d/50-vulkan/55-spirv-cross.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
-SCRIPT_COMMIT="7d92d7d8794b102f550ad33dbedbd82203b755a9"
+SCRIPT_COMMIT="06407561ece7d7e78544112189f3eee13adf9959"
 
 ffbuild_enabled() {
     [[ $TARGET == mac* ]] && return -1
diff --git a/builder/scripts.d/50-x265.sh b/builder/scripts.d/50-x265.sh
index 8d4f3efc..5f978142 100755
--- a/builder/scripts.d/50-x265.sh
+++ b/builder/scripts.d/50-x265.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git"
-SCRIPT_COMMIT="3cf6c1e53037eb9e198860365712e1bafb22f7c6"
+SCRIPT_COMMIT="dd1ef69b25ec26cc80be0fc8d9afeeef6563762b"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
diff --git a/docker-build-win64.sh b/docker-build-win64.sh
index 8d1dca67..c55f61fd 100755
--- a/docker-build-win64.sh
+++ b/docker-build-win64.sh
@@ -6,7 +6,7 @@ set -o errexit
 set -o xtrace
 
 # Update mingw-w64 headers
-mingw_commit="0bac2d3cdb122dadcdee90009f7e24a69d56939f"
+mingw_commit="cd4cf9b279f8fb0815f8b9665d3cea60a30290bc"
 git clone https://git.code.sf.net/p/mingw-w64/mingw-w64.git
 pushd mingw-w64/mingw-w64-headers
 git checkout ${mingw_commit}
@@ -162,7 +162,7 @@ popd
 popd
 
 # LZMA
-git clone -b v5.6.1 --depth=1 https://github.com/tukaani-project/xz.git
+git clone -b v5.6.1 --depth=1 https://git.tukaani.org/xz.git
 pushd xz
 ./autogen.sh --no-po4a --no-doxygen
 ./configure \
@@ -325,7 +325,7 @@ popd
 # OPENMPT
 mkdir mpt
 pushd mpt
-mpt_ver="0.7.5"
+mpt_ver="0.7.6"
 mpt_link="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${mpt_ver}+release.autotools.tar.gz"
 wget ${mpt_link} -O mpt.tar.gz
 tar xaf mpt.tar.gz
@@ -461,6 +461,8 @@ popd
 # SVT-AV1
 git clone -b v2.0.0 --depth=1 https://gitlab.com/AOMediaCodec/SVT-AV1.git
 pushd SVT-AV1
+# Fix performance regression for systems with multiple processor groups
+wget -q -O - https://gitlab.com/AOMediaCodec/SVT-AV1/-/commit/4579ddcf.patch | git apply
 mkdir build
 pushd build
 cmake \
diff --git a/docker-build.sh b/docker-build.sh
index 90d7136d..b13803da 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -124,6 +124,8 @@ prepare_extra_common() {
     pushd ${SOURCE_DIR}
     git clone -b v2.0.0 --depth=1 https://gitlab.com/AOMediaCodec/SVT-AV1.git
     pushd SVT-AV1
+    # Fix performance regression for systems with multiple processor groups
+    wget -q -O - https://gitlab.com/AOMediaCodec/SVT-AV1/-/commit/4579ddcf.patch | git apply
     mkdir build
     pushd build
     if [ "${ARCH}" = "amd64" ]; then
@@ -243,7 +245,7 @@ prepare_extra_amd64() {
 
     # GMMLIB
     pushd ${SOURCE_DIR}
-    git clone -b intel-gmmlib-22.3.18 --depth=1 https://github.com/intel/gmmlib.git
+    git clone -b intel-gmmlib-22.3.19 --depth=1 https://github.com/intel/gmmlib.git
     pushd gmmlib
     mkdir build && pushd build
     cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} ..
@@ -297,11 +299,11 @@ prepare_extra_amd64() {
     popd
     popd
 
-    # ONEVPL-INTEL-GPU (RT only)
+    # VPL-GPU-RT (RT only)
     # Provides VPL runtime (libmfx-gen.so.1.2) for 11th Gen Tiger Lake and newer
     pushd ${SOURCE_DIR}
-    git clone -b intel-onevpl-24.1.5 --depth=1 https://github.com/oneapi-src/oneVPL-intel-gpu.git
-    pushd oneVPL-intel-gpu
+    git clone -b intel-onevpl-24.2.1 --depth=1 https://github.com/intel/vpl-gpu-rt.git
+    pushd vpl-gpu-rt
     mkdir build && pushd build
     cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} \
           -DCMAKE_INSTALL_LIBDIR=${TARGET_DIR}/lib \
@@ -320,7 +322,7 @@ prepare_extra_amd64() {
     # Full Feature Build: ENABLE_KERNELS=ON(Default) ENABLE_NONFREE_KERNELS=ON(Default)
     # Free Kernel Build: ENABLE_KERNELS=ON ENABLE_NONFREE_KERNELS=OFF
     pushd ${SOURCE_DIR}
-    git clone -b intel-media-24.1.5 --depth=1 https://github.com/intel/media-driver.git
+    git clone -b intel-media-24.2.1 --depth=1 https://github.com/intel/media-driver.git
     pushd media-driver
     mkdir build && pushd build
     cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} \
@@ -339,7 +341,7 @@ prepare_extra_amd64() {
 
     # Vulkan Headers
     pushd ${SOURCE_DIR}
-    git clone -b v1.3.280 --depth=1 https://github.com/KhronosGroup/Vulkan-Headers.git
+    git clone -b v1.3.283 --depth=1 https://github.com/KhronosGroup/Vulkan-Headers.git
     pushd Vulkan-Headers
     mkdir build && pushd build
     cmake \
@@ -352,7 +354,7 @@ prepare_extra_amd64() {
 
     # Vulkan ICD Loader
     pushd ${SOURCE_DIR}
-    git clone -b v1.3.280 --depth=1 https://github.com/KhronosGroup/Vulkan-Loader.git
+    git clone -b v1.3.283 --depth=1 https://github.com/KhronosGroup/Vulkan-Loader.git
     pushd Vulkan-Loader
     mkdir build && pushd build
     cmake \
@@ -535,8 +537,8 @@ prepare_crossbuild_env_armhf() {
     fi
     if [[ $( lsb_release -i -s ) == "Ubuntu" ]]; then
         CODENAME="$( lsb_release -c -s )"
-        # Remove the default sources.list
-        rm /etc/apt/sources.list
+        # Remove the default sources
+        rm -f /etc/apt/sources.list /etc/apt/sources.list.d/ubuntu.sources
         # Add arch-specific list files
         cat <<EOF > /etc/apt/sources.list.d/amd64.list
 deb [arch=amd64] ${UBUNTU_ARCHIVE_ADDR} ${CODENAME} main restricted universe multiverse
@@ -554,7 +556,7 @@ EOF
     # Add armhf architecture
     dpkg --add-architecture armhf
     # Update and install cross-gcc-dev
-    apt-get update && apt-get upgrade -y
+    apt-get update && apt-get dist-upgrade -y
     yes | apt-get install -y cross-gcc-dev
     # Generate gcc cross source
     TARGET_LIST="armhf" cross-gcc-gensource ${GCC_VER}
@@ -573,8 +575,8 @@ prepare_crossbuild_env_arm64() {
     fi
     if [[ $( lsb_release -i -s ) == "Ubuntu" ]]; then
         CODENAME="$( lsb_release -c -s )"
-        # Remove the default sources.list
-        rm /etc/apt/sources.list
+        # Remove the default sources
+        rm -f /etc/apt/sources.list /etc/apt/sources.list.d/ubuntu.sources
         # Add arch-specific list files
         cat <<EOF > /etc/apt/sources.list.d/amd64.list
 deb [arch=amd64] ${UBUNTU_ARCHIVE_ADDR} ${CODENAME} main restricted universe multiverse
@@ -592,7 +594,7 @@ EOF
     # Add armhf architecture
     dpkg --add-architecture arm64
     # Update and install cross-gcc-dev
-    apt-get update && apt-get upgrade -y
+    apt-get update && apt-get dist-upgrade -y
     yes | apt-get install -y cross-gcc-dev
     # Generate gcc cross source
     TARGET_LIST="arm64" cross-gcc-gensource ${GCC_VER}