diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 65ae596527..5c2936fe76 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/rust:1-1-bookworm
+FROM mcr.microsoft.com/devcontainers/rust:2-1-trixie
 LABEL org.opencontainers.image.authors="Christoph Knittel <ck@cca.io>"
 LABEL org.opencontainers.image.description="Docker image for ReScript development."
 
@@ -6,8 +6,9 @@ RUN sudo apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y install --no-install-recommends \
     cmake \
     musl-tools \
+    ninja-build \
     && rm -rf /var/lib/apt/lists/*
 
 # Install OPAM
-ARG OPAM_VERSION=2.4.1
+ARG OPAM_VERSION=2.5.0
 RUN printf '\n\n' | bash -c "sh <(curl -fsSL https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh) --version $OPAM_VERSION"
diff --git a/.devcontainer/postCreate.sh b/.devcontainer/postCreate.sh
index c8288d1c83..6e2466f1de 100755
--- a/.devcontainer/postCreate.sh
+++ b/.devcontainer/postCreate.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 # Install dev dependencies from OPAM
-opam init -y --bare --disable-sandboxing
+opam init -y --auto-setup --bare --disable-sandboxing
 opam switch create 5.3.0
-opam install . --deps-only --with-test --with-dev-setup -y
+opam install . --with-test --with-dev-setup -y
 
 # Add OPAM environment setup to shell startup script
 echo 'eval $(opam env)' >> ~/.zshrc
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 55632b2338..c6c20467ad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -508,6 +508,17 @@ jobs:
           git commit -m "Update API docs for $GITHUB_REF_NAME"
           git push
 
+  test-devcontainer:
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+      - name: Run make in dev container
+        uses: devcontainers/ci@v0.3
+        with:    
+          push: never
+          runCmd: make
+
   test-installation-npm:
     needs:
       - pkg-pr-new