diff --git a/.github/workflows/docker-build-and-push-ocular-backend.yml b/.github/workflows/docker-build-and-push-ocular-backend.yml
index c230596..127a249 100644
--- a/.github/workflows/docker-build-and-push-ocular-backend.yml
+++ b/.github/workflows/docker-build-and-push-ocular-backend.yml
@@ -3,7 +3,7 @@ name: Build and Push Ocular Backend Docker Image CI
 on:
   push:
     tags:        
-      - '**'       
+      - '*'       
 
 jobs:
   push_to_docker_registry:
@@ -29,6 +29,6 @@ jobs:
         context: ./
         file: ./packages/ocular/Dockerfile.local
         push: true
-        tags:
+        tags: |
           ocularengineering/ocular-backend:${{ github.ref_name }}
           ocularengineering/ocular-backend:latest
diff --git a/.github/workflows/docker-build-and-push-ocular-models-server.yml b/.github/workflows/docker-build-and-push-ocular-models-server.yml
index eccd585..ea49bf3 100644
--- a/.github/workflows/docker-build-and-push-ocular-models-server.yml
+++ b/.github/workflows/docker-build-and-push-ocular-models-server.yml
@@ -3,7 +3,7 @@ name: Build and Push Ocular Models Server on Release and Tag
 on:
   push:
     tags:        
-      - '**'
+      - '*'
 
 jobs:
   build-and-push:
@@ -28,6 +28,6 @@ jobs:
         context: ./
         file: ./packages/ocular-models-server/Dockerfile.models
         push: true
-        tags:
+        tags: |
           ocularengineering/ocular-model-server:${{ github.ref_name }}
           ocularengineering/ocular-model-server:latest
diff --git a/.github/workflows/docker-build-and-push-ocular-ui.yml b/.github/workflows/docker-build-and-push-ocular-ui.yml
index 6387d6a..d8c0c29 100644
--- a/.github/workflows/docker-build-and-push-ocular-ui.yml
+++ b/.github/workflows/docker-build-and-push-ocular-ui.yml
@@ -3,7 +3,7 @@ name: Build and Push Ocular Web UI Docker Image CI
 on:
   push:
     tags:        
-      - '**'
+      - '*'
 
 jobs:
   push_to_docker_registry:
@@ -29,6 +29,6 @@ jobs:
         context: ./
         file: ./packages/ocular-ui/Dockerfile
         push: true
-        tags:
+        tags: |
           ocularengineering/ocular-ui:${{ github.ref_name }}
           ocularengineering/ocular-ui:latest