diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 62558a6..bc679ee 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -2,13 +2,8 @@ name: Docker images build and push
 
 on:
   push:
-    branches:
-      - master
     tags:
       - '*'
-  pull_request:
-    branches:
-      - master
   schedule:
     - cron: "0 0 * * 1" # Every Monday at 00:00
 
@@ -71,7 +66,7 @@ jobs:
           composer-options: "--prefer-dist"
 
       - name: Scaffold image
-        run: bin/phpdev scaffold-image ${{ matrix.builds.variant }} {{ matrix.builds.version }} dist/${{ matrix.builds.variant }}/{{ matrix.builds.version }}
+        run: bin/phpdev scaffold-image ${{ matrix.builds.variant }} ${{ matrix.builds.version }} dist/${{ matrix.builds.variant }}/${{ matrix.builds.version }}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
diff --git a/.github/workflows/docker-inspect.yml b/.github/workflows/docker-inspect.yml
new file mode 100644
index 0000000..c87ce7e
--- /dev/null
+++ b/.github/workflows/docker-inspect.yml
@@ -0,0 +1,93 @@
+name: Docker images inspect
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  prepare_env:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.2
+          coverage: none
+
+      - name: Composer install
+        uses: ramsey/composer-install@v2
+        with:
+          dependency-versions: highest
+          composer-options: "--prefer-dist"
+
+      - id: set_date
+        run: echo "build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> $GITHUB_OUTPUT
+
+      - id: set_vcs
+        run: echo "vcs_ref=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
+      - id: set_matrix
+        run: echo "matrix=$(bin/phpdev export-build `curl -s https://github.com/xdebug/xdebug/releases.atom | grep "<title>[0-9]*\.[0-9]*\.[0-9]*</title>" | awk -F '[<>]' '{ print $3; exit }'`)" >> $GITHUB_OUTPUT
+
+    outputs:
+      build_date: ${{ steps.set_date.outputs.build_date }}
+      vcs_ref: ${{ steps.set_vcs.outputs.vcs_ref }}
+      builds: ${{ steps.set_matrix.outputs.matrix }}
+
+  build:
+    needs: prepare_env
+
+    strategy:
+      fail-fast: false
+      matrix:
+        builds: ${{ fromJson(needs.prepare_env.outputs.builds) }}
+
+    name: Build image ${{ matrix.builds.variant }} ${{ matrix.builds.version }}
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.2
+          coverage: none
+
+      - name: Composer install
+        uses: ramsey/composer-install@v2
+        with:
+          dependency-versions: highest
+          composer-options: "--prefer-dist"
+
+      - name: Scaffold image
+        run: bin/phpdev scaffold-image ${{ matrix.builds.variant }} ${{ matrix.builds.version }} dist/${{ matrix.builds.variant }}/${{ matrix.builds.version }}
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build locally
+        uses: docker/build-push-action@v3
+        with:
+          context: dist/${{ matrix.builds.variant }}/${{ matrix.builds.version }}
+          load: true
+          pull: true
+          tags: juliangut/phpdev:test
+          build-args: |
+            BUILD_DATE=${{ needs.prepare_env.outputs.build_date }}
+            VCS_REF=${{ needs.prepare_env.outputs.vcs_ref }}
+            XDEBUG_VERSION=${{ matrix.builds.xdebug }}
+        if: ${{ github.ref_type == 'branch' }}
+
+      - name: Inspect image
+        run: docker image inspect juliangut/phpdev:test
+        if: ${{ github.ref_type == 'branch' }}