diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d35ce85..495dd76 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,12 +27,3 @@ jobs:
 
       - name: login to docker hub
         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-
-      - name: repo info
-        id: vars
-        run: |
-          echo ::set-output name=repo_tag::${GITHUB_REF#refs/*/}
-
-      - name: build (master)
-        if: "github.ref == 'refs/heads/master'"
-        run: make build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 447ce09..ba809c4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -39,9 +39,11 @@ jobs:
         env:
           VERSION: ${{steps.vars.outputs.repo_tag}}
 
-      - name: build and push (master)
-        if: "github.ref == 'refs/heads/master'"
+      - name: build and push (latest)
+        if: startsWith( github.ref, 'refs/tags/')
         run: make build-push
+        env:
+          VERSION: latest
 
   goreleaser:
     runs-on: ubuntu-latest