diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 138fd7c..eb97779 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -35,9 +35,9 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
+            type=semver,pattern=v{{version}}
+            type=semver,pattern=v{{major}}.{{minor}}
+            type=semver,pattern=v{{major}}
             type=raw,value=latest
 
       # Extract metadata for CPU image
@@ -49,10 +49,10 @@ jobs:
           flavor: |
             suffix=-cpu
           tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=raw,value=latest
+            type=semver,pattern=v{{version}}-cpu
+            type=semver,pattern=v{{major}}.{{minor}}-cpu
+            type=semver,pattern=v{{major}}-cpu
+            type=raw,value=latest-cpu
 
       # Build and push GPU version
       - name: Build and push GPU Docker image
@@ -85,10 +85,10 @@ jobs:
           flavor: |
             suffix=-ui
           tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=raw,value=latest
+            type=semver,pattern=v{{version}}-ui
+            type=semver,pattern=v{{major}}.{{minor}}-ui
+            type=semver,pattern=v{{major}}-ui
+            type=raw,value=latest-ui
 
       # Build and push UI version
       - name: Build and push UI Docker image
diff --git a/docker-compose.cpu.yml b/docker-compose.cpu.yml
index f3975df..d73a247 100644
--- a/docker-compose.cpu.yml
+++ b/docker-compose.cpu.yml
@@ -26,7 +26,7 @@ services:
       start_period: 1s
 
   kokoro-tts:
-    image: ghcr.io/remsky/kokoro-fastapi:v0.0.2-cpu
+    image: ghcr.io/remsky/kokoro-fastapi:latest-cpu
     # Uncomment below to build from source instead of using the released image
     # build:
     #   context: .
@@ -51,7 +51,7 @@ services:
 
   # Gradio UI service [Comment out everything below if you don't need it]
   gradio-ui:
-    image: ghcr.io/remsky/kokoro-fastapi:v0.0.2-ui
+    image: ghcr.io/remsky/kokoro-fastapi:latest-ui
     # Uncomment below to build from source instead of using the released image
     # build:
     #   context: ./ui
diff --git a/docker-compose.yml b/docker-compose.yml
index 46ec691..cc3744b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,7 +26,7 @@ services:
       start_period: 1s
 
   kokoro-tts:
-    image: ghcr.io/remsky/kokoro-fastapi:v0.0.2
+    image: ghcr.io/remsky/kokoro-fastapi:latest
     # Uncomment below to build from source instead of using the released image
     # build:
     #   context: .
@@ -50,7 +50,7 @@ services:
 
   # Gradio UI service [Comment out everything below if you don't need it]
   gradio-ui:
-    image: ghcr.io/remsky/kokoro-fastapi:v0.0.2-ui
+    image: ghcr.io/remsky/kokoro-fastapi:latest-ui
     # Uncomment below to build from source instead of using the released image
     # build:
     #   context: ./ui