diff --git a/.github/workflows/docker-image.yaml b/.github/workflows/docker-image.yaml
index 3b825a6..c49af09 100644
--- a/.github/workflows/docker-image.yaml
+++ b/.github/workflows/docker-image.yaml
@@ -5,7 +5,7 @@ on:
     branches:
       - "master"
     tags:
-      - "v*.*.*"
+      - "*.*.*"
 
 env:
   IMAGE_NAME: shahradelahi/wireadmin
@@ -33,9 +33,9 @@ jobs:
       - name: Set image tag
         if: startsWith(github.ref, 'refs/tags/v')
         run: |
-          echo "IMAGE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
-          echo "IMAGE_TAG=${IMAGE_TAG//./-}" >> $GITHUB_ENV
           echo "RELEASE_TAG=,ghcr.io/${IMAGE_NAME}:latest" >> $GITHUB_ENV
+          echo "IMAGE_TAG=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
+          echo "Labeling image with ${IMAGE_TAG}"
 
       - name: Push to GitHub Container Registry
         uses: docker/build-push-action@v4