diff --git a/build.sh b/build.sh
index af5beab..a5ef3b4 100755
--- a/build.sh
+++ b/build.sh
@@ -34,14 +34,15 @@ if [ $MX_MAJOR_VERSION -le 7 ]; then
 elif [ $MX_MAJOR_VERSION -eq 8 ]; then
     JAVA_VERSION=11
     DOTNET_VERSION="mono520"
-elif [ $MX_MAJOR_VERSION -eq 9 ] && [ $MX_MINOR_VERSION -lt 16 ]; then
+elif [ $MX_MAJOR_VERSION -eq 9 ] && [ $MX_MINOR_VERSION -lt 21 ]; then
     JAVA_VERSION=11
     DOTNET_VERSION="mono520"
-elif [ $MX_MAJOR_VERSION -eq 9 ] && [ $MX_MINOR_VERSION -ge 16 ]; then
+elif [ $MX_MAJOR_VERSION -eq 9 ] || [ $MX_MAJOR_VERSION -eq 10 ]; then
     JAVA_VERSION=11
     DOTNET_VERSION="dotnet6"
 else
     echo "Unsupported Mendix version: ${MX_MAJOR_VERSION}.${MX_MINOR_VERSION}"
+    exit 1
 fi
 
 echo "Using Java $JAVA_VERSION and .NET $DOTNET_VERSION"
diff --git a/build/mxbuild.dockerfile b/build/mxbuild.dockerfile
index a6ed9e4..1a5b984 100644
--- a/build/mxbuild.dockerfile
+++ b/build/mxbuild.dockerfile
@@ -20,7 +20,7 @@ RUN if [ $DOTNET_VERSION = "mono520" ]; then \
         cp /etc/pki/rpm-gpg/RPM-GPG-KEY-mono-centos8-stable /mnt/rootfs/etc/pki/rpm-gpg/; \
         cp /etc/yum.repos.d/mono-centos8-stable.repo /mnt/rootfs/etc/yum.repos.d/; \
     elif [ $DOTNET_VERSION = "dotnet6" ]; then \
-        DOTNET_LIBS="dotnet-runtime-6.0 libgdiplus"; \
+        DOTNET_LIBS="libgdiplus libicu"; \
         rm /etc/yum.repos.d/mono-centos8-stable.repo; \
         dnf install --setopt install_weak_deps=false --nodocs --installroot /mnt/rootfs -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm; \
         cp /mnt/rootfs/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 /etc/pki/rpm-gpg/; \
@@ -63,7 +63,7 @@ RUN ARCH=$(arch) && \
     elif [ $DOTNET_VERSION = "dotnet6" ] && [ $ARCH = "aarch64" ]; then \
         MXBUILD_DOWNLOAD_PREFIX="arm64-"; \
     elif [ $DOTNET_VERSION = "dotnet6" ] && [ $ARCH = "x86_64" ]; then \
-        MXBUILD_DOWNLOAD_PREFIX="net6-"; \
+        MXBUILD_DOWNLOAD_PREFIX=""; \
     else \
         echo "Unsupported .NET $DOTNET_VERSION or architecture $ARCH"; \
     fi &&\