diff --git a/Dockerfile b/Dockerfile
index 9fda9c8..a333469 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ ARG IOQ3DED_VERSION \
     TARGETVARIANT
 
 # Install necessary build prerequisites
-RUN export IOQ3BUILD_COMPILER=$([ "${TARGETARCH}" != 'riscv64' ] && printf '%s' 'clang18 llvm18' || printf '%s' 'gcc binutils') \
+RUN export IOQ3BUILD_COMPILER='clang18 llvm18' \
     && apk add --no-cache \
         ${IOQ3BUILD_COMPILER} \
         lld \
@@ -26,10 +26,10 @@ WORKDIR /quake/extern/ioq3
 COPY ./ /quake/
 
 # Build the server
-RUN export IOQ3BUILD_BIN_CC=$([ "${TARGETARCH}" != 'riscv64' ] && printf '%s' 'clang-18' || printf '%s' 'gcc') \
+RUN export IOQ3BUILD_BIN_CC='clang-18' \
     && export IOQ3BUILD_BIN_LD=$([ "${TARGETARCH}" != 'riscv64' -a "${TARGETARCH}" != 's390x' ] && printf '%s' 'lld' || printf '%s' 'ld') \
-    && export IOQ3BUILD_BIN_STRIP=$([ "${TARGETARCH}" != 'riscv64' ] && printf '%s' 'llvm18-strip' || printf '%s' 'strip') \
-    && export IOQ3BUILD_ARG_FUSE_LD=$([ "${TARGETARCH}" != 'riscv64' ] && printf '-fuse-ld=%s' "${IOQ3BUILD_BIN_LD}" || printf '')\
+    && export IOQ3BUILD_BIN_STRIP='llvm18-strip' \
+    && export IOQ3BUILD_ARG_FUSE_LD=$(printf '-fuse-ld=%s' "${IOQ3BUILD_BIN_LD}")\
     && make \
         -j$(nproc --all) \
         CC="${IOQ3BUILD_BIN_CC} -static ${IOQ3BUILD_ARG_FUSE_LD}" \
diff --git a/extern/ioq3 b/extern/ioq3
index 00d60d0..4ee389b 160000
--- a/extern/ioq3
+++ b/extern/ioq3
@@ -1 +1 @@
-Subproject commit 00d60d05c4c59acde8d89de1d17a3212e2b8b6b8
+Subproject commit 4ee389b6b27feed82b19145ef49948839ed8dc9b