diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 154c186..92650fd 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -10,7 +10,7 @@ jobs:
     permissions:
       contents: read
       packages: write
-      
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -21,7 +21,7 @@ jobs:
             registry: ${{ secrets.REGISTRY }}
             username: ${{ github.actor }}
             password: ${{ secrets.GITHUB_TOKEN }}
-      
+
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -30,7 +30,8 @@ jobs:
         with:
           context: .
           push: true
-          tags: ghcr.io/intelligent-testing-lab/autoware-scenario-runner:${{ github.run_number }}
+          tags: |
+            ghcr.io/intelligent-testing-lab/autoware-scenario-runner:${{ vars.RELEASE }}.${{ github.run_number }}
+            ghcr.io/intelligent-testing-lab/autoware-scenario-runner:latest
           cache-from: type=registry,ref=ghcr.io/intelligent-testing-lab/autoware-scenario-runner:buildcache
           cache-to: type=registry,ref=ghcr.io/intelligent-testing-lab/autoware-scenario-runner:buildcache,mode=max
-        
\ No newline at end of file