diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 610efe0..0708ea9 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -8,8 +8,8 @@
 # This release drafter follows the conventions from https://keepachangelog.com, https://common-changelog.org/
 # https://www.conventionalcommits.org
 
-name-template: 'v$RESOLVED_VERSION'
-tag-template: 'v$RESOLVED_VERSION'
+name-template: $(echo $GITHUB_REF | sed 's/refs\/tags\///')
+tag-template: $(echo $GITHUB_REF | sed 's/refs\/tags\///')
 template: |
   ## What Changed 👀
   $CHANGES
@@ -27,7 +27,7 @@ categories:
       - test
   - title: 👷 CI
     labels:
-      - ci       
+      - ci
   - title: ♻️ Changes
     labels:
       - changed
@@ -66,31 +66,31 @@ autolabeler:
       - '/(security)\/.*/'
   - label: 'refactor'
     branch:
-      - '/(refactor)\/.*/'    
+      - '/(refactor)\/.*/'
   - label: 'docs'
     branch:
       - '/(docs)\/.*/'
   - label: 'ci'
     branch:
-      - '/(ci)\/.*/'  
+      - '/(ci)\/.*/'
   - label: 'test'
     branch:
-      - '/(test)\/.*/'    
+      - '/(test)\/.*/'
   - label: 'bug'
     branch:
-      - '/(fix)\/.*/'  
+      - '/(fix)\/.*/'
   - label: 'feature'
     branch:
       - '/(feat)\/.*/'
   - label: 'minor'
     branch:
-      - '/(feat)\/.*/'    
+      - '/(feat)\/.*/'
   - label: 'patch'
     branch:
-      - '/(fix)\/.*/'         
+      - '/(fix)\/.*/'
     body:
       - '/JIRA-[0-9]{1,4}/'
-      
+
 change-template: '- $TITLE (#$NUMBER)'
 exclude-contributors:
   - 'meysamhadeli'
diff --git a/.github/workflows/build-publish-docker.yml b/.github/workflows/build-publish-docker.yml
index 2b9c479..e018466 100644
--- a/.github/workflows/build-publish-docker.yml
+++ b/.github/workflows/build-publish-docker.yml
@@ -23,15 +23,15 @@ jobs:
 
       - name: Build image
         run: |
-          docker build -t meysamh66/booking-microservices-flight:latest -f "${{ github.workspace }}/src/Services/Flight/Dockerfile" .
-          docker build -t meysamh66/booking-microservices-identity:latest -f "${{ github.workspace }}/src/Services/Identity/Dockerfile" .
-          docker build -t meysamh66/booking-microservices-passenger:latest -f "${{ github.workspace }}/src/Services/Passenger/Dockerfile" .
-          docker build -t meysamh66/booking-microservices-booking:latest -f "${{ github.workspace }}/src/Services/Booking/Dockerfile" .
+          docker build -t meysamh66/booking-microservices-flight:$(echo $GITHUB_REF | sed 's/refs\/tags\///') -f "${{ github.workspace }}/src/Services/Flight/Dockerfile" .
+          docker build -t meysamh66/booking-microservices-identity:$(echo $GITHUB_REF | sed 's/refs\/tags\///') -f "${{ github.workspace }}/src/Services/Identity/Dockerfile" .
+          docker build -t meysamh66/booking-microservices-passenger:$(echo $GITHUB_REF | sed 's/refs\/tags\///') -f "${{ github.workspace }}/src/Services/Passenger/Dockerfile" .
+          docker build -t meysamh66/booking-microservices-booking:$(echo $GITHUB_REF | sed 's/refs\/tags\///') -f "${{ github.workspace }}/src/Services/Booking/Dockerfile" .
 
       - name: Publish image
         run: |
-          docker push meysamh66/booking-microservices-flight:latest
-          docker push meysamh66/booking-microservices-identity:latest
-          docker push meysamh66/booking-microservices-passenger:latest
-          docker push meysamh66/booking-microservices-booking:latest
+          docker push meysamh66/booking-microservices-flight:$(echo $GITHUB_REF | sed 's/refs\/tags\///')
+          docker push meysamh66/booking-microservices-identity:$(echo $GITHUB_REF | sed 's/refs\/tags\///')
+          docker push meysamh66/booking-microservices-passenger:$(echo $GITHUB_REF | sed 's/refs\/tags\///')
+          docker push meysamh66/booking-microservices-booking:$(echo $GITHUB_REF | sed 's/refs\/tags\///')