diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 9e243cee..2afa9a59 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -16,6 +16,9 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    env:
+      IMAGE_TAG: ${{ github.event.release.tag_name }}
+
     steps:
     - name: Checkout code
       uses: actions/checkout@v3
@@ -23,19 +26,17 @@ jobs:
     - name: Set release version or use default
       run: echo "RELEASE_VERSION=${{ github.event.release.tag_name }}" >> $GITHUB_ENV
       if: github.event_name == 'release'
-      
+
     - name: Build the Docker image
       run: |
         if [ "${{ github.event_name }}" == 'workflow_dispatch' ]; then
           IMAGE_TAG="dev_$(date +"%Y%m%d")"
-        else
-          IMAGE_TAG="${{ github.event.release.tag_name }}"
         fi
         echo "IMAGE_TAG=${IMAGE_TAG}"
         docker build . --file Dockerfile --tag ${{ github.repository }}:$IMAGE_TAG
-      #run: docker build . --file Dockerfile --tag ${{ github.repository }}:latest
       if: github.event_name == 'release' || github.event_name == 'workflow_dispatch'
 
+
     - name: Push the Docker image to GHCR
       if: success() && (github.event_name == 'release' || github.event_name == 'workflow_dispatch')
       run: |