diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 29e06be..d47a8d7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,10 +20,27 @@ jobs:
         with:
           ref: "mczyz/dev"
 
-      - name: Pre-build dev container image
-        uses: devcontainers/ci@v0.3
+      # - name: Pre-build dev container image
+      #   uses: devcontainers/ci@v0.3
+      #   with:
+      #     imageName: ghcr.io/openroad-codespace/test
+      #     cacheFrom: ghcr.io/openroad-codespace/test
+      #     push: always
+      #     configFile: ./.devcontainer/ubuntu-gui/devcontainer.json
+
+      - name: Devcontainer build
+        run: |
+          npm install -g @devcontainers/cli
+          devcontainer build --config .devcontainer/ubuntu-gui/devcontainer.json --workspace-folder . --push false --image-name test:latest
+
+      - name: Login to GitHub Container Registry (GHCR)
+        if: github.event_name != 'pull_request' && github.repository == 'antmicro/openroad-codespace'
+        uses: docker/login-action@v2
         with:
-          imageName: ghcr.io/openroad-codespace/test
-          cacheFrom: ghcr.io/openroad-codespace/test
-          push: always
-          configFile: ./.devcontainer/ubuntu-gui/devcontainer.json
+          registry: ghcr.io
+          username: gha
+          password: ${{ github.token }}
+
+      - name: Push container image to GitHub Container Registry (GHCR)
+        if: github.event_name != 'pull_request' && github.repository == 'antmicro/openroad-codespace'
+        run: docker push ghcr.io/antmicro/openroad-codespace:test