diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index ab95e13..046cf99 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -16,12 +16,22 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Build Docker image
-      run: docker build . --file Dockerfile --tag ghcr.io/hyperledgendary/k8s-fabric-peer:${GITHUB_SHA}
+      run: |
+        docker build . --file Dockerfile --label "git_commit=${GITHUB_SHA}" --tag k8s-fabric-peer
+        docker tag k8s-fabric-peer ghcr.io/hyperledgendary/k8s-fabric-peer:${GITHUB_SHA}
+        if [ "${GITHUB_REF:0:10}" = "refs/tags/" ]; then
+          docker tag k8s-fabric-peer ghcr.io/hyperledgendary/k8s-fabric-peer:${GITHUB_REF_NAME}
+          docker tag k8s-fabric-peer ghcr.io/hyperledgendary/k8s-fabric-peer:latest
+        fi
     - name: Publish Docker image
       if: github.event_name != 'pull_request'
       run: |
         echo ${DOCKER_PW} | docker login ghcr.io -u ${DOCKER_USER} --password-stdin
         docker push ghcr.io/hyperledgendary/k8s-fabric-peer:${GITHUB_SHA}
+        if [ "${GITHUB_REF:0:10}" = "refs/tags/" ]; then
+          docker push ghcr.io/hyperledgendary/k8s-fabric-peer:${GITHUB_REF_NAME}
+          docker push ghcr.io/hyperledgendary/k8s-fabric-peer:latest
+        fi
       env:
         DOCKER_USER: ${{ github.actor }}
         DOCKER_PW: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 19ab139..423a01d 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -35,7 +35,11 @@ jobs:
         CGO_ENABLED=0 go build -v ./cmd/detect
         CGO_ENABLED=0 go build -v ./cmd/release
         CGO_ENABLED=0 go build -v ./cmd/run
-        tar -czvf fabric-builder-k8s-${RUNNER_OS}-${RUNNER_ARCH}.tgz build detect release run
+        tar -czvf fabric-builder-k8s.tgz build detect release run
+
+    - name: Rename package
+      if: startsWith(github.ref, 'refs/tags/')
+      run: mv fabric-builder-k8s.tgz fabric-builder-k8s-${GITHUB_REF_NAME}-${RUNNER_OS}-${RUNNER_ARCH}.tgz
 
     - name: Release
       uses: softprops/action-gh-release@v1