diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 0895fc1ad4..d620151ee8 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -45,8 +45,14 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] ; then \
     mv hurl-4.1.0-x86_64-unknown-linux-gnu/hurl /usr/local/bin/ && \
     rm -r hurl-4.1.0-x86_64-unknown-linux-gnu && \
     rm hurl.tar.gz && \
-    rustup component add llvm-tools-preview --toolchain $(cat rust_toolchain_version)-x86_64-unknown-linux-gnu && \
-    rustup target add x86_64-fortanix-unknown-sgx --toolchain nightly; \
+    rustup component add llvm-tools-preview --toolchain $(cat rust_toolchain_version)-x86_64-unknown-linux-gnu; \
+    fi
+
+# Install sgx tools
+ARG TARGETPLATFORM
+RUN if [ "$TARGETPLATFORM" = "linux/amd64" ] ; then \
+    rustup target add x86_64-fortanix-unknown-sgx --toolchain nightly && \
+    cargo binstall fortanix-sgx-tools sgxs-tools -y; \
     fi
 
 RUN curl -L https://install.dojoengine.org | bash