diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index bd31236..78bc098 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -21,18 +21,26 @@ jobs:
         with:
           tag: ${{env.VERSION}}
 
-  publish:
-    name: Build & Push Dockerfile
-    uses: ztimson/actions/.github/workflows/docker.yaml@develop
-    with:
-      name: ztimson/kiwixm
-      repository: ${{github.server_url}}/${{github.repository}}.git
-      pass: ${{secrets.DEPLOY_TOKEN}}
+  docker:
+    name: Build Dockerfile
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone Repository
+      - uses: ztimson/actions/clone@develop
 
-  publish-docker:
-    name: Build & Push Dockerfile
-    uses: ztimson/actions/.github/workflows/docker.yaml@develop
-    with:
-      name: ztimson/kiwixm
-      repository: hub.docker.com
-      pass: ${{secrets.DOCKER_TOKEN}}
+      - name: Build Image
+        run: |
+          REGISTRY=$(echo ${{github.server_url}} | sed s%http://%% | sed s%https://%%)
+          docker build -t "$REGISTRY/${{github.repository}}:${{github.ref_name}}" .
+
+      - name: Publish Latest Tag
+        run: |
+          if [ "${{github.ref_name}}" = "master" ]; then
+            REGISTRY=$(echo ${{github.server_url}} | sed s%http://%% | sed s%https://%%)
+            docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "$REGISTRY/${{github.repository}}:latest"
+            docker push "$REGISTRY/${{github.repository}}:latest"
+
+            REGISTRY=$(echo ${{github.server_url}} | sed s%http://%% | sed s%https://%%)
+            docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "ztimson/kiwixm:latest"
+            docker push "ztimson/kiwixm:latest"
+          fi