diff --git a/.github/workflows/model_servers.yaml b/.github/workflows/model_servers.yaml
index 586f063e..89961a39 100644
--- a/.github/workflows/model_servers.yaml
+++ b/.github/workflows/model_servers.yaml
@@ -15,6 +15,8 @@ on:
       - 'model_servers/**'
       - 'models/Makefile'
       - .github/workflows/model_servers.yaml
+    tags:
+      - '*'
 
   workflow_dispatch:
 
@@ -97,7 +99,7 @@ jobs:
         with:
           image: ${{ env.REGISTRY }}/${{ github.repository_owner}}/${{ matrix.image_name }}
           platforms: ${{ matrix.platforms }}
-          tags: latest
+          tags: latest ${{ github.ref_type == 'tag' && github.ref_name || '' }}
           containerfiles: ./model_servers/${{ matrix.directory }}/${{ matrix.flavor }}/Containerfile
           context: model_servers/${{ matrix.directory }}/