diff --git a/Dockerfile.base b/Dockerfile.base
index 9b28b6b..97b95bf 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -22,7 +22,6 @@ RUN apt-get -y update && \
 		bison \
 		build-essential \
 		ca-certificates \
-		cargo \
 		ccache \
 		chrpath \
 		cmake \
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 0cc9e2a..9670653 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -47,8 +47,11 @@ RUN mkdir -p /opt/bsim_west && \
 	chmod ag+w . -R && \
 	ln -s /opt/bsim_west/bsim /opt/bsim
 
+# Install cargo environment
+RUN wget -q -O-  "https://sh.rustup.rs" | sh -s -- -y
+
 # Install uefi-run utility
-RUN cargo install uefi-run --root /usr
+RUN ~/.cargo/bin/cargo install uefi-run --root /usr
 
 # Install LLVM and Clang
 RUN wget ${WGET_ARGS} https://apt.llvm.org/llvm.sh && \