diff --git a/.github/workflows/cd-images.yml b/.github/workflows/cd-images.yml
index 798122a..792534c 100644
--- a/.github/workflows/cd-images.yml
+++ b/.github/workflows/cd-images.yml
@@ -64,9 +64,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Log in to GHCR
         uses: docker/login-action@v3
         with:
@@ -74,14 +71,16 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Install devcontainer CLI
+        run: npm install -g @devcontainers/cli
+
       - name: Build and push
-        uses: devcontainers/ci@v0.3
-        with:
-          subFolder: images/${{ needs.prepare.outputs.name }}
-          imageName: ${{ needs.prepare.outputs.image }}
-          imageTag: ${{ matrix.suffix }}
-          platform: ${{ matrix.platform }}
-          push: always
+        run: |
+          devcontainer build \
+            --workspace-folder images/${{ needs.prepare.outputs.name }} \
+            --image-name ${{ needs.prepare.outputs.image }}:${{ matrix.suffix }} \
+            --platform ${{ matrix.platform }} \
+            --push
 
   manifest:
     needs: [prepare, build]