diff --git a/docker/Dockerfile.ci_cpu b/docker/Dockerfile.ci_cpu
index 65996e13db355..1b276ffd70ddc 100644
--- a/docker/Dockerfile.ci_cpu
+++ b/docker/Dockerfile.ci_cpu
@@ -118,4 +118,4 @@ COPY install/ubuntu_install_vela.sh /install/ubuntu_install_vela.sh
 RUN bash /install/ubuntu_install_vela.sh
 
 # Update PATH
-ENV PATH /opt/arm/bin:/opt/arm/cmake/bin:/opt/arm/gcc-arm-none-eabi/bin:$PATH
+ENV PATH /opt/arm/bin:/opt/arm/gcc-arm-none-eabi/bin:$PATH
diff --git a/docker/install/ubuntu_install_ethosu_driver_stack.sh b/docker/install/ubuntu_install_ethosu_driver_stack.sh
index 7996a25a1eabe..0e96c5e0ee2f7 100755
--- a/docker/install/ubuntu_install_ethosu_driver_stack.sh
+++ b/docker/install/ubuntu_install_ethosu_driver_stack.sh
@@ -23,6 +23,7 @@ set -o pipefail
 fvp_dir="/opt/arm/FVP_Corstone_SSE-300_Ethos-U55"
 cmake_dir="/opt/arm/cmake"
 ethosu_dir="/opt/arm/ethosu"
+ethosu_driver_ver="21.05"
 
 mkdir -p /opt/arm
 
@@ -79,15 +80,15 @@ mkdir "${ethosu_dir}"
 cd "${ethosu_dir}"
 git clone "https://review.mlplatform.org/ml/ethos-u/ethos-u-core-driver" core_driver
 cd core_driver
-git checkout tags/21.05
+git checkout tags/${ethosu_driver_ver}
 
 cd "${ethosu_dir}"
 git clone "https://review.mlplatform.org/ml/ethos-u/ethos-u-core-platform" core_platform
 cd core_platform
-git checkout tags/21.05
+git checkout tags/${ethosu_driver_ver}
 
 # Clone CMSIS
 cd "${ethosu_dir}"
 git clone "https://github.com/ARM-software/CMSIS_5.git" cmsis
 cd cmsis
-git checkout -f tags/5.7.0
\ No newline at end of file
+git checkout -f tags/5.7.0