diff --git a/.github/workflows/publish-devcontainer.yaml b/.github/workflows/publish-devcontainer.yaml
index 7cabeb6f..52e25d53 100644
--- a/.github/workflows/publish-devcontainer.yaml
+++ b/.github/workflows/publish-devcontainer.yaml
@@ -25,6 +25,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          platforms: linux/amd64,linux/arm64
+
       - if: ${{ github.event_name != 'pull_request' }}
         name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -38,5 +46,6 @@ jobs:
         with:
           imageName: ghcr.io/${{ github.repository }}/devcontainer
           imageTag: base,latest
+          platform: linux/amd64,linux/arm64
           configFile: .devcontainer/devcontainer.build.json
           push: ${{ github.event_name == 'pull_request' && 'never' || 'always' }}