diff --git a/.github/workflows/build-api.yml b/.github/workflows/build-api.yml
index 8041a9b2f..8d4e72099 100644
--- a/.github/workflows/build-api.yml
+++ b/.github/workflows/build-api.yml
@@ -30,8 +30,8 @@ jobs:
   prepare_env:
     runs-on: ubuntu-latest
     outputs:
-      branch: ${{ input_branch.input_branch.outputs.branch }}
-      tags: ${{ input_branch.input_branch.outputs.tags }}
+      branch: ${{ steps.input_branch.outputs.branch }}
+      tags: ${{ steps.tag.outputs.tags || steps.tags.outputs.tags }}
     steps:
       - name: Prepare input branch
         id: input_branch
@@ -39,6 +39,7 @@ jobs:
         run: echo "branch=refs/heads/${{ github.event.inputs.branch }}" >> $GITHUB_OUTPUT
 
       - name: Create tag list matching semver from executing tag
+        id: tag
         if: ${{ github.ref_type == 'tag' }}
         run: |
           name="voltaserve/api"
@@ -56,6 +57,7 @@ jobs:
           echo "tags=$TAGS" >> $GITHUB_OUTPUT
 
       - name: Set the tag on workflow dispatch
+        id: tags
         if: ${{ github.ref_type != 'tag' }}
         run: echo "tags=voltaserve/api:$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
diff --git a/.github/workflows/build-console.yml b/.github/workflows/build-console.yml
index 2844fe17e..c99425fc1 100644
--- a/.github/workflows/build-console.yml
+++ b/.github/workflows/build-console.yml
@@ -30,8 +30,8 @@ jobs:
   prepare_env:
     runs-on: ubuntu-latest
     outputs:
-      branch: ${{ input_branch.input_branch.outputs.branch }}
-      tags: ${{ input_branch.input_branch.outputs.tags }}
+      branch: ${{ steps.input_branch.outputs.branch }}
+      tags: ${{ steps.tag.outputs.tags || steps.tags.outputs.tags }}
     steps:
       - name: Prepare input branch
         id: input_branch
@@ -39,6 +39,7 @@ jobs:
         run: echo "branch=refs/heads/${{ github.event.inputs.branch }}" >> $GITHUB_OUTPUT
 
       - name: Create tag list matching semver from executing tag
+        id: tag
         if: ${{ github.ref_type == 'tag' }}
         run: |
           name="voltaserve/console"
@@ -56,6 +57,7 @@ jobs:
           echo "tags=$TAGS" >> $GITHUB_OUTPUT
 
       - name: Set the tag on workflow dispatch
+        id: tags
         if: ${{ github.ref_type != 'tag' }}
         run: echo "tags=voltaserve/console:$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
diff --git a/.github/workflows/build-conversion.yml b/.github/workflows/build-conversion.yml
index 7ff0d9113..853f43212 100644
--- a/.github/workflows/build-conversion.yml
+++ b/.github/workflows/build-conversion.yml
@@ -30,8 +30,8 @@ jobs:
   prepare_env:
     runs-on: ubuntu-latest
     outputs:
-      branch: ${{ input_branch.input_branch.outputs.branch }}
-      tags: ${{ input_branch.input_branch.outputs.tags }}
+      branch: ${{ steps.input_branch.outputs.branch }}
+      tags: ${{ steps.tag.outputs.tags || steps.tags.outputs.tags }}
     steps:
       - name: Prepare input branch
         id: input_branch
@@ -39,6 +39,7 @@ jobs:
         run: echo "branch=refs/heads/${{ github.event.inputs.branch }}" >> $GITHUB_OUTPUT
 
       - name: Create tag list matching semver from executing tag
+        id: tag
         if: ${{ github.ref_type == 'tag' }}
         run: |
           name="voltaserve/conversion"
@@ -56,6 +57,7 @@ jobs:
           echo "tags=$TAGS" >> $GITHUB_OUTPUT
 
       - name: Set the tag on workflow dispatch
+        id: tags
         if: ${{ github.ref_type != 'tag' }}
         run: echo "tags=voltaserve/conversion:$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
diff --git a/.github/workflows/build-idp.yml b/.github/workflows/build-idp.yml
index 039d05897..c204369aa 100644
--- a/.github/workflows/build-idp.yml
+++ b/.github/workflows/build-idp.yml
@@ -30,8 +30,8 @@ jobs:
   prepare_env:
     runs-on: ubuntu-latest
     outputs:
-      branch: ${{ input_branch.input_branch.outputs.branch }}
-      tags: ${{ input_branch.input_branch.outputs.tags }}
+      branch: ${{ steps.input_branch.outputs.branch }}
+      tags: ${{ steps.tag.outputs.tags || steps.tags.outputs.tags }}
     steps:
       - name: Prepare input branch
         id: input_branch
@@ -39,6 +39,7 @@ jobs:
         run: echo "branch=refs/heads/${{ github.event.inputs.branch }}" >> $GITHUB_OUTPUT
 
       - name: Create tag list matching semver from executing tag
+        id: tag
         if: ${{ github.ref_type == 'tag' }}
         run: |
           name="voltaserve/idp"
@@ -56,6 +57,7 @@ jobs:
           echo "tags=$TAGS" >> $GITHUB_OUTPUT
 
       - name: Set the tag on workflow dispatch
+        id: tags
         if: ${{ github.ref_type != 'tag' }}
         run: echo "tags=voltaserve/idp:$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
diff --git a/.github/workflows/build-language.yml b/.github/workflows/build-language.yml
index abd47fe8e..c1d354d78 100644
--- a/.github/workflows/build-language.yml
+++ b/.github/workflows/build-language.yml
@@ -30,8 +30,8 @@ jobs:
   prepare_env:
     runs-on: ubuntu-latest
     outputs:
-      branch: ${{ input_branch.input_branch.outputs.branch }}
-      tags: ${{ input_branch.input_branch.outputs.tags }}
+      branch: ${{ steps.input_branch.outputs.branch }}
+      tags: ${{ steps.tag.outputs.tags || steps.tags.outputs.tags }}
     steps:
       - name: Prepare input branch
         id: input_branch
@@ -39,6 +39,7 @@ jobs:
         run: echo "branch=refs/heads/${{ github.event.inputs.branch }}" >> $GITHUB_OUTPUT
 
       - name: Create tag list matching semver from executing tag
+        id: tag
         if: ${{ github.ref_type == 'tag' }}
         run: |
           name="voltaserve/language"
@@ -56,6 +57,7 @@ jobs:
           echo "tags=$TAGS" >> $GITHUB_OUTPUT
 
       - name: Set the tag on workflow dispatch
+        id: tags
         if: ${{ github.ref_type != 'tag' }}
         run: echo "tags=voltaserve/language:$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
diff --git a/.github/workflows/build-migrations.yml b/.github/workflows/build-migrations.yml
index f5d51f332..89ebaffe9 100644
--- a/.github/workflows/build-migrations.yml
+++ b/.github/workflows/build-migrations.yml
@@ -30,8 +30,8 @@ jobs:
   prepare_env:
     runs-on: ubuntu-latest
     outputs:
-      branch: ${{ input_branch.input_branch.outputs.branch }}
-      tags: ${{ input_branch.input_branch.outputs.tags }}
+      branch: ${{ steps.input_branch.outputs.branch }}
+      tags: ${{ steps.tag.outputs.tags || steps.tags.outputs.tags }}
     steps:
       - name: Prepare input branch
         id: input_branch
@@ -39,6 +39,7 @@ jobs:
         run: echo "branch=refs/heads/${{ github.event.inputs.branch }}" >> $GITHUB_OUTPUT
 
       - name: Create tag list matching semver from executing tag
+        id: tag
         if: ${{ github.ref_type == 'tag' }}
         run: |
           name="voltaserve/migrations"
@@ -56,6 +57,7 @@ jobs:
           echo "tags=$TAGS" >> $GITHUB_OUTPUT
 
       - name: Set the tag on workflow dispatch
+        id: tags
         if: ${{ github.ref_type != 'tag' }}
         run: echo "tags=voltaserve/migrations:$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
diff --git a/.github/workflows/build-mosaic.yml b/.github/workflows/build-mosaic.yml
index ecbc3031f..b99fdbad6 100644
--- a/.github/workflows/build-mosaic.yml
+++ b/.github/workflows/build-mosaic.yml
@@ -30,8 +30,8 @@ jobs:
   prepare_env:
     runs-on: ubuntu-latest
     outputs:
-      branch: ${{ input_branch.input_branch.outputs.branch }}
-      tags: ${{ input_branch.input_branch.outputs.tags }}
+      branch: ${{ steps.input_branch.outputs.branch }}
+      tags: ${{ steps.tag.outputs.tags || steps.tags.outputs.tags }}
     steps:
       - name: Prepare input branch
         id: input_branch
@@ -39,6 +39,7 @@ jobs:
         run: echo "branch=refs/heads/${{ github.event.inputs.branch }}" >> $GITHUB_OUTPUT
 
       - name: Create tag list matching semver from executing tag
+        id: tag
         if: ${{ github.ref_type == 'tag' }}
         run: |
           name="voltaserve/mosaic"
@@ -56,6 +57,7 @@ jobs:
           echo "tags=$TAGS" >> $GITHUB_OUTPUT
 
       - name: Set the tag on workflow dispatch
+        id: tags
         if: ${{ github.ref_type != 'tag' }}
         run: echo "tags=voltaserve/mosaic:$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
diff --git a/.github/workflows/build-ui.yml b/.github/workflows/build-ui.yml
index f05b1eae3..8ea58d2b5 100644
--- a/.github/workflows/build-ui.yml
+++ b/.github/workflows/build-ui.yml
@@ -30,8 +30,8 @@ jobs:
   prepare_env:
     runs-on: ubuntu-latest
     outputs:
-      branch: ${{ input_branch.input_branch.outputs.branch }}
-      tags: ${{ input_branch.input_branch.outputs.tags }}
+      branch: ${{ steps.input_branch.outputs.branch }}
+      tags: ${{ steps.tag.outputs.tags || steps.tags.outputs.tags }}
     steps:
       - name: Prepare input branch
         id: input_branch
@@ -39,6 +39,7 @@ jobs:
         run: echo "branch=refs/heads/${{ github.event.inputs.branch }}" >> $GITHUB_OUTPUT
 
       - name: Create tag list matching semver from executing tag
+        id: tag
         if: ${{ github.ref_type == 'tag' }}
         run: |
           name="voltaserve/ui"
@@ -56,6 +57,7 @@ jobs:
           echo "tags=$TAGS" >> $GITHUB_OUTPUT
 
       - name: Set the tag on workflow dispatch
+        id: tags
         if: ${{ github.ref_type != 'tag' }}
         run: echo "tags=voltaserve/ui:$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
diff --git a/.github/workflows/build-webdav.yml b/.github/workflows/build-webdav.yml
index 7bb3ddf51..7c90ab89c 100644
--- a/.github/workflows/build-webdav.yml
+++ b/.github/workflows/build-webdav.yml
@@ -30,8 +30,8 @@ jobs:
   prepare_env:
     runs-on: ubuntu-latest
     outputs:
-      branch: ${{ input_branch.input_branch.outputs.branch }}
-      tags: ${{ input_branch.input_branch.outputs.tags }}
+      branch: ${{ steps.input_branch.outputs.branch }}
+      tags: ${{ steps.tag.outputs.tags || steps.tags.outputs.tags }}
     steps:
       - name: Prepare input branch
         id: input_branch
@@ -39,6 +39,7 @@ jobs:
         run: echo "branch=refs/heads/${{ github.event.inputs.branch }}" >> $GITHUB_OUTPUT
 
       - name: Create tag list matching semver from executing tag
+        id: tag
         if: ${{ github.ref_type == 'tag' }}
         run: |
           name="voltaserve/webdav"
@@ -56,6 +57,7 @@ jobs:
           echo "tags=$TAGS" >> $GITHUB_OUTPUT
 
       - name: Set the tag on workflow dispatch
+        id: tags
         if: ${{ github.ref_type != 'tag' }}
         run: echo "tags=voltaserve/webdav:$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT