diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 945b97b..d32a04f 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -6,28 +6,21 @@ on:
 
 jobs:
 
-  build:
-
+  build-recursor-latest:
     runs-on: ubuntu-latest
-
     steps:
-
       - name: Check Out Repo
         uses: actions/checkout@v3
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
-
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@v2
-
       - name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-
       - name: Build and push PDNS Recursor latest
         id: docker_build_recursor_latest
         uses: docker/build-push-action@v3
@@ -38,10 +31,24 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           push: true
           tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-recursor:latest
-
       - name: Image digest
         run: echo ${{ steps.docker_build_recursor_latest.outputs.digest }}
 
+  build-recursor-alpine:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check Out Repo
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
       - name: Build and push PDNS Recursor alpine
         id: docker_build_recursor_alpine
         uses: docker/build-push-action@v3
@@ -52,10 +59,24 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           push: true
           tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-recursor:alpine
-
       - name: Image digest
         run: echo ${{ steps.docker_build_recursor_alpine.outputs.digest }}
 
+  build-pdns-latest:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check Out Repo
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
       - name: Build and push PDNS latest
         id: docker_build_pdns_latest
         uses: docker/build-push-action@v3
@@ -66,10 +87,24 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           push: true
           tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-mysql:latest
-
       - name: Image digest
         run: echo ${{ steps.docker_build_pdns_latest.outputs.digest }}
 
+  build-pdns-alpine:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check Out Repo
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
       - name: Build and push PDNS alpine
         id: docker_build_pdns_alpine
         uses: docker/build-push-action@v3
@@ -80,10 +115,24 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           push: true
           tags: ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-mysql:alpine
-
       - name: Image digest
         run: echo ${{ steps.docker_build_pdns_alpine.outputs.digest }}
 
+  build-admin-base:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check Out Repo
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
       - name: Build and push admin base
         id: docker_build_admin_base
         uses: docker/build-push-action@v3
@@ -96,10 +145,25 @@ jobs:
           tags: |
             ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-admin-base:latest
             ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-admin-base:ngoduykhanh
-
       - name: Image digest
         run: echo ${{ steps.docker_build_admin_base.outputs.digest }}
 
+  build-admin-uwsgi:
+    runs-on: ubuntu-latest
+    needs: build-admin-base
+    steps:
+      - name: Check Out Repo
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
       - name: Build and push admin uwsgi
         id: docker_build_admin_uwsgi
         uses: docker/build-push-action@v3
@@ -112,10 +176,25 @@ jobs:
           tags: |
             ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-admin-uwsgi:latest
             ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-admin-uwsgi:ngoduykhanh
-
       - name: Image digest
         run: echo ${{ steps.docker_build_admin_uwsgi.outputs.digest }}
 
+  build-admin-static:
+    runs-on: ubuntu-latest
+    needs: build-admin-base
+    steps:
+      - name: Check Out Repo
+        uses: actions/checkout@v3
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
       - name: Build and push admin static
         id: docker_build_admin_static
         uses: docker/build-push-action@v3
@@ -128,6 +207,5 @@ jobs:
           tags: |
             ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-admin-static:latest
             ${{ secrets.DOCKER_HUB_USERNAME }}/pdns-admin-static:ngoduykhanh
-
       - name: Image digest
         run: echo ${{ steps.docker_build_admin_static.outputs.digest }}