diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 90df5f8..250a451 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -31,17 +31,15 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Docker Build
+      - name: Docker Build & Push
         run: |
+          tag=$(awk -F: '/FROM.*argocd/{ print $2 }' Dockerfile)
+
           docker buildx build \
             --no-cache \
             --pull \
-            --tag ghcr.io/${GITHUB_REPOSITORY,,}:latest \
+            --tag ghcr.io/${GITHUB_REPOSITORY,,}:${tag} \
             .
-
-      - name: Docker Push
-        run: |
-          docker push ghcr.io/${GITHUB_REPOSITORY,,}:latest
-        if: ${{ github.ref == 'refs/heads/master' }}
+          docker push ghcr.io/${GITHUB_REPOSITORY,,}:${tag}
 
 ...