diff --git a/docker/base-dev-x.dockerfile b/docker/base-dev-x.dockerfile
index 5125dba6a..40e903d8b 100644
--- a/docker/base-dev-x.dockerfile
+++ b/docker/base-dev-x.dockerfile
@@ -14,14 +14,15 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/*
 
-# Install cmake 3.26.4
-ENV CMAKE_VERSION="3.26.4"
-ENV CMAKE_HOME="/tmp/cmake-${CMAKE_VERSION}-linux-x86_64" \
-    CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz"
-RUN curl -L ${CMAKE_URL} -o ${CMAKE_HOME}.tar.gz && \
+# Install CMake 3.26.4
+RUN ARCH=$(uname -m) && \
+    CMAKE_VERSION="3.26.4" && \
+    CMAKE_HOME="/tmp/cmake-${CMAKE_VERSION}-linux-${ARCH}" && \
+    CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-${ARCH}.tar.gz" && \
+    curl -L ${CMAKE_URL} -o ${CMAKE_HOME}.tar.gz && \
     tar xzf ${CMAKE_HOME}.tar.gz -C /usr/local && \
-    rm -rf ${CMAKE_HOME}.tar.gz
-ENV PATH="/usr/local/cmake-${CMAKE_VERSION}-linux-x86_64/bin:${PATH}"
+    rm -rf ${CMAKE_HOME}.tar.gz && \
+    ln -s /usr/local/cmake-${CMAKE_VERSION}-linux-${ARCH}/bin/* /usr/bin/
 
 # Install Python dependencies
 ADD . /tmp/mscclpp
@@ -31,9 +32,6 @@ RUN target_type=$(echo $TARGET | sed 's/\.[0-9]*$//') && \
     python3 -m pip install --no-cache-dir --upgrade pip && \
     python3 -m pip install --no-cache-dir -r python/requirements_${target_type}.txt
 
-# Set PATH
-RUN echo PATH="${PATH}" > /etc/environment
-
 # Cleanup
 RUN rm -rf /tmp/mscclpp
 WORKDIR /