diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 84728160..0fc5ac1f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,6 +17,8 @@ name: CI workflow
 on:
   workflow_dispatch:
   push:
+    branches:
+      - "main"
   pull_request:
 
 jobs:
@@ -33,10 +35,12 @@ jobs:
           hugo-version: "0.123.3"
           extended: true
 
-      - name: Verify that devcontainer works
-        run: |
-          cd .devcontainer
-          docker buildx build -f Dockerfile -t test:latest .
+      - name: Build devcontainer and run automated tests
+        uses: devcontainers/ci@v0.3
+        with:
+          runCmd: |
+            # Do a sanity check that the server has started and say something about eclipse
+            curl http://localhost:1313/velocitas/docs/about/ | grep -e eclipse
 
       - name: Build
         run: |
@@ -60,8 +64,7 @@ jobs:
         # Note that gh_pages isnt published to https://eclipse-velocitas.github.io/velocitas-docs/
         # or the alias https://eclipse.dev/velocitas/
         # So this basically just check if there are errors :-)
-        # Only publish to gh_pages if this was a push to master
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        if: ${{ github.event_name == 'push'}}
         uses: peaceiris/actions-gh-pages@v4.0.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}