diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 871d64ee3..451608a1c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -177,35 +177,20 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build + push VERSION - pktvisor
+      - name: Build + push - pktvisor
         env:
           IMAGE_NAME: ns1labs/pktvisor
         run: |
-          docker build . --file docker/Dockerfile --tag ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
-          docker push ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
+          docker build . --file docker/Dockerfile --tag ${{ env.IMAGE_NAME }}:${{ env.VERSION }} --tag ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }}
+          docker push -a ${{ env.IMAGE_NAME }}
 
-      - name: Tag + push docker image with ref tag (cached build) - pktvisor
-        env:
-          IMAGE_NAME: ns1labs/pktvisor
-        run: |
-          docker build . --file docker/Dockerfile --tag ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }}
-          docker push ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }}
-
-      - name: Build + push VERSION - pktvisor-prom-write
-        env:
-          IMAGE_NAME: ns1labs/pktvisor-prom-write
-        working-directory: ${{github.workspace}}/centralized_collection/prometheus/docker-grafana-agent
-        run: |
-          docker build . --file Dockerfile --build-arg PKTVISOR_TAG=${{ env.REF_TAG }} --tag ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
-          docker push ${{ env.IMAGE_NAME }}:${{ env.VERSION }}
-
-      - name: Tag + push docker image with ref tag (cached build) - pktvisor-prom-write
+      - name: Build + push - pktvisor-prom-write
         env:
           IMAGE_NAME: ns1labs/pktvisor-prom-write
         working-directory: ${{github.workspace}}/centralized_collection/prometheus/docker-grafana-agent
         run: |
-          docker build . --file Dockerfile --build-arg PKTVISOR_TAG=${{ env.REF_TAG }} --tag ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }}
-          docker push ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }}
+          docker build . --file Dockerfile --build-arg PKTVISOR_TAG=${{ env.REF_TAG }} --tag ${{ env.IMAGE_NAME }}:${{ env.VERSION }} --tag ${{ env.IMAGE_NAME }}:${{ env.REF_TAG }}
+          docker push -a ${{ env.IMAGE_NAME }}
 
       - name: Generate AppImage
         env: