diff --git a/.github/workflows/docker-image-pr.yml b/.github/workflows/docker-image-pr.yml
index 5b8b80d..350f330 100644
--- a/.github/workflows/docker-image-pr.yml
+++ b/.github/workflows/docker-image-pr.yml
@@ -6,19 +6,14 @@ on:
 
 jobs:
 
-  test_build:
-
+  test-recursor-latest:
     runs-on: ubuntu-latest
-
     steps:
-
       - name: Check Out Repo
         uses: actions/checkout@v3
-
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v2
-
       - name: Build PDNS Recursor latest
         id: docker_build_recursor_latest
         uses: docker/build-push-action@v3
@@ -28,10 +23,17 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           push: false
           tags: pdns-recursor:latest
-
       - name: Image digest
         run: echo ${{ steps.docker_build_recursor_latest.outputs.digest }}
 
+  test-recursor-alpine:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check Out Repo
+        uses: actions/checkout@v3
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
       - name: Build PDNS Recursor alpine
         id: docker_build_recursor_alpine
         uses: docker/build-push-action@v3
@@ -41,10 +43,17 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           push: false
           tags: pdns-recursor:alpine
-
       - name: Image digest
         run: echo ${{ steps.docker_build_recursor_alpine.outputs.digest }}
 
+  test-pdns-latest:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check Out Repo
+        uses: actions/checkout@v3
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
       - name: Build PDNS latest
         id: docker_build_pdns_latest
         uses: docker/build-push-action@v3
@@ -54,10 +63,17 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           push: false
           tags: pdns-mysql:latest
-
       - name: Image digest
         run: echo ${{ steps.docker_build_pdns_latest.outputs.digest }}
 
+  test-pdns-alpine:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check Out Repo
+        uses: actions/checkout@v3
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
       - name: Build PDNS alpine
         id: docker_build_pdns_alpine
         uses: docker/build-push-action@v3
@@ -67,10 +83,17 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           push: false
           tags: pdns-mysql:alpine
-
       - name: Image digest
         run: echo ${{ steps.docker_build_pdns_alpine.outputs.digest }}
 
+  test-admin-base:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check Out Repo
+        uses: actions/checkout@v3
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
       - name: Build admin base
         id: docker_build_admin_base
         uses: docker/build-push-action@v3
@@ -82,10 +105,18 @@ jobs:
           tags: |
             pdns-admin-base:latest
             pdns-admin-base:ngoduykhanh
-
       - name: Image digest
         run: echo ${{ steps.docker_build_admin_base.outputs.digest }}
 
+  test-admin-uwsgi:
+    runs-on: ubuntu-latest
+    needs: test-admin-base
+    steps:
+      - name: Check Out Repo
+        uses: actions/checkout@v3
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
       - name: Build admin uwsgi
         id: docker_build_admin_uwsgi
         uses: docker/build-push-action@v3
@@ -97,10 +128,18 @@ jobs:
           tags: |
             pdns-admin-uwsgi:latest
             pdns-admin-uwsgi:ngoduykhanh
-
       - name: Image digest
         run: echo ${{ steps.docker_build_admin_uwsgi.outputs.digest }}
 
+  test-admin-static:
+    runs-on: ubuntu-latest
+    needs: test-admin-base
+    steps:
+      - name: Check Out Repo
+        uses: actions/checkout@v3
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
       - name: Build admin static
         id: docker_build_admin_static
         uses: docker/build-push-action@v3
@@ -112,6 +151,5 @@ jobs:
           tags: |
             pdns-admin-static:latest
             pdns-admin-static:ngoduykhanh
-
       - name: Image digest
         run: echo ${{ steps.docker_build_admin_static.outputs.digest }}