diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yml
similarity index 94%
rename from .github/workflows/push.yaml
rename to .github/workflows/push.yml
index 88a46be..d214271 100644
--- a/.github/workflows/push.yaml
+++ b/.github/workflows/push.yml
@@ -24,7 +24,7 @@ jobs:
           install: true
 
       - name: Build test image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: ./
           file: ${{ matrix.dockerfile }}
@@ -40,7 +40,7 @@ jobs:
       - name: Run tests
         run: |
           docker load -i /tmp/.builder.tar
-          docker run --rm frankenphp:${{ github.sha }}-builder "go test -race -v"
+          docker run --rm frankenphp:${{ github.sha }}-builder "sh -c 'go test -race -v ./... && cd caddy && go test -race -v ./...'"
   push-image:
     runs-on: ubuntu-latest
     strategy:
@@ -86,11 +86,11 @@ jobs:
         with:
           install: true
 
-      - name: Setup QEMU
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
       - name: Build and Push Image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: ./
           file: ${{ matrix.dockerfile }}
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yml
similarity index 92%
rename from .github/workflows/tests.yaml
rename to .github/workflows/tests.yml
index b6bbf3d..ca5fd7c 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yml
@@ -19,7 +19,7 @@ jobs:
           install: true
 
       - name: Build test image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: ./
           file: ${{ matrix.dockerfile }}
@@ -35,7 +35,7 @@ jobs:
       - name: Run tests
         run: |
           docker load -i /tmp/.builder.tar
-          docker run --rm frankenphp:${{ github.sha }}-builder "go test -a -v"
+          docker run --rm frankenphp:${{ github.sha }}-builder "sh -c 'go test -race -v ./... && cd caddy && go test -race -v ./...'"
   push-image:
     runs-on: ubuntu-latest
     strategy:
@@ -75,11 +75,11 @@ jobs:
         with:
           install: true
 
-      - name: Setup QEMU
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
-      - name: Build and Push Image
-        uses: docker/build-push-action@v3
+      - name: Build Image
+        uses: docker/build-push-action@v4
         with:
           context: ./
           file: ${{ matrix.dockerfile }}