diff --git a/.github/workflows/build-api.yml b/.github/workflows/build-api.yml
index 120f6bb1b..05484597c 100644
--- a/.github/workflows/build-api.yml
+++ b/.github/workflows/build-api.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Prepare input branch
-        if: ${{ github.event.inputs.branch != "" }}
+        if: ${{ github.event.inputs.branch != '' }}
         run: echo "branch=refs/heads/${{ github.event.inputs.branch }}" >> $GITHUB_ENV
 
       - name: Checkout Repository
@@ -70,9 +70,9 @@ jobs:
           TAGS+=",$name:latest"
           echo "TAGS=$TAGS" >> $GITHUB_ENV
 
-      - name: Set the tag on wokflow dispatch
+      - name: Set the tag on workflow dispatch
         if: ${{ github.ref_type != 'tag' }}
-        run: echo "TAGS=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+        run: echo "TAGS=voltaserve/api:$(git rev-parse --short HEAD)" >> $GITHUB_ENV
 
       - name: Build and Push Docker Image
         uses: docker/build-push-action@v5
diff --git a/.github/workflows/build-conversion.yml b/.github/workflows/build-conversion.yml
index 81f07696e..51f9e0eea 100644
--- a/.github/workflows/build-conversion.yml
+++ b/.github/workflows/build-conversion.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Prepare input branch
-        if: ${{ github.event.inputs.branch != "" }}
+        if: ${{ github.event.inputs.branch != '' }}
         run: echo "branch=refs/heads/${{ github.event.inputs.branch }}" >> $GITHUB_ENV
 
       - name: Checkout Repository
@@ -72,7 +72,7 @@ jobs:
 
       - name: Set the tag on wokflow dispatch
         if: ${{ github.ref_type != 'tag' }}
-        run: echo "TAGS=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+        run: echo "TAGS=voltaserve/conversion:$(git rev-parse --short HEAD)" >> $GITHUB_ENV
 
       - name: Build and Push Docker Image
         uses: docker/build-push-action@v5
diff --git a/.github/workflows/build-mosaic.yml b/.github/workflows/build-mosaic.yml
index b7fcaf63a..22590ba1e 100644
--- a/.github/workflows/build-mosaic.yml
+++ b/.github/workflows/build-mosaic.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Prepare input branch
-        if: ${{ github.event.inputs.branch != "" }}
+        if: ${{ github.event.inputs.branch != '' }}
         run: echo "branch=refs/heads/${{ github.event.inputs.branch }}" >> $GITHUB_ENV
 
       - name: Checkout Repository
@@ -72,7 +72,7 @@ jobs:
 
       - name: Set the tag on wokflow dispatch
         if: ${{ github.ref_type != 'tag' }}
-        run: echo "TAGS=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+        run: echo "TAGS=voltaserve/mosaic:$(git rev-parse --short HEAD)" >> $GITHUB_ENV
 
       - name: Build and Push Docker Image
         uses: docker/build-push-action@v5
diff --git a/.github/workflows/build-ui.yml b/.github/workflows/build-ui.yml
index 8492b7275..6e51c971a 100644
--- a/.github/workflows/build-ui.yml
+++ b/.github/workflows/build-ui.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Prepare input branch
-        if: ${{ github.event.inputs.branch != "" }}
+        if: ${{ github.event.inputs.branch != '' }}
         run: echo "branch=refs/heads/${{ github.event.inputs.branch }}" >> $GITHUB_ENV
 
       - name: Checkout Repository
@@ -72,7 +72,7 @@ jobs:
 
       - name: Set the tag on wokflow dispatch
         if: ${{ github.ref_type != 'tag' }}
-        run: echo "TAGS=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+        run: echo "TAGS=voltaserve/ui:$(git rev-parse --short HEAD)" >> $GITHUB_ENV
 
       - name: Build and Push Docker Image
         uses: docker/build-push-action@v5
diff --git a/.github/workflows/build-webdav.yml b/.github/workflows/build-webdav.yml
index 1319bc30c..08160e3c6 100644
--- a/.github/workflows/build-webdav.yml
+++ b/.github/workflows/build-webdav.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Prepare input branch
-        if: ${{ github.event.inputs.branch != "" }}
+        if: ${{ github.event.inputs.branch != '' }}
         run: echo "branch=refs/heads/${{ github.event.inputs.branch }}" >> $GITHUB_ENV
 
       - name: Checkout Repository
@@ -72,7 +72,7 @@ jobs:
 
       - name: Set the tag on wokflow dispatch
         if: ${{ github.ref_type != 'tag' }}
-        run: echo "TAGS=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+        run: echo "TAGS=voltaserve/webdav:$(git rev-parse --short HEAD)" >> $GITHUB_ENV
 
       - name: Build and Push Docker Image
         uses: docker/build-push-action@v5