diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 4ba50992c..4f5f1502e 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 mcr.microsoft.com/devcontainers/python:3.11
+FROM mcr.microsoft.com/devcontainers/python:3.11
 
 # Makes installation faster
 ENV UV_COMPILE_BYTECODE=1
@@ -32,15 +32,14 @@ RUN apt-get update && apt-get install -y \
  && curl -sL https://packages.microsoft.com/keys/microsoft.asc \
       | gpg --dearmor \
       > /usr/share/keyrings/microsoft-archive-keyring.gpg \
- && echo "deb [arch=amd64 signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/debian/12/prod bookworm main" \
+ && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/microsoft-archive-keyring.gpg] https://packages.microsoft.com/debian/12/prod bookworm main" \
       > /etc/apt/sources.list.d/microsoft.list \
  && apt-get update \
- && ACCEPT_EULA=Y apt-get install -y \
-      msodbcsql18 \
-      mssql-tools \
-      unixodbc-dev \
+ && if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
+      ACCEPT_EULA=Y apt-get install -y msodbcsql18 mssql-tools unixodbc-dev \
+      && echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> /etc/profile.d/sqltools.sh; \
+    fi \
  && apt-get install -y azure-cli \
- && echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> /etc/profile.d/sqltools.sh \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*
 
@@ -52,6 +51,10 @@ RUN apt-get update \
       libpulse0 \
  && rm -rf /var/lib/apt/lists/*
 
+# Install Rust toolchain
+RUN curl -sSf https://sh.rustup.rs | sh -s -- -y
+ENV PATH="/root/.cargo/bin:${PATH}"
+
 # Install uv system-wide and create pyrit-dev venv
 RUN curl -LsSf https://astral.sh/uv/install.sh | sh \
  && mv /root/.local/bin/uv /usr/local/bin/uv \
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index f85335ef5..7fc115bb2 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -1,6 +1,5 @@
 services:
   devcontainer:
-    platform: linux/amd64
     build:
       context: ..
       dockerfile: .devcontainer/Dockerfile