diff --git a/.github/workflows/build-conversion.yml b/.github/workflows/build-conversion.yml
index 0bb8dcb72..0f4c3223d 100644
--- a/.github/workflows/build-conversion.yml
+++ b/.github/workflows/build-conversion.yml
@@ -62,7 +62,8 @@ jobs:
             type=semver,pattern={{major}},enable=${{ github.ref_type == 'tag' }}
 
       - name: Build and Push Docker Image
-        uses: docker/build-push-action@v5
+        id: build
+        uses: docker/build-push-action@v6
         with:
           context: ./conversion
           platforms: ${{ matrix.platform }}
diff --git a/.github/workflows/build-idp.yml b/.github/workflows/build-idp.yml
index f21f54708..c5163507f 100644
--- a/.github/workflows/build-idp.yml
+++ b/.github/workflows/build-idp.yml
@@ -61,7 +61,8 @@ jobs:
             type=semver,pattern={{major}},enable=${{ github.ref_type == 'tag' }}
 
       - name: Build and Push Docker Image
-        uses: docker/build-push-action@v5
+        id: build
+        uses: docker/build-push-action@v6
         with:
           context: ./idp
           platforms: ${{ matrix.platform }}
diff --git a/.github/workflows/build-language.yml b/.github/workflows/build-language.yml
index dc006d619..72317e663 100644
--- a/.github/workflows/build-language.yml
+++ b/.github/workflows/build-language.yml
@@ -12,12 +12,6 @@ name: Build and Push voltaserve/language
 
 on:
   workflow_dispatch:
-    inputs:
-      branch:
-        required: false
-        default: ""
-        type: string
-        description: Override code checkout branch (e.g. "feature/branch")
   push:
     branches:
       - main
diff --git a/.github/workflows/build-migrations.yml b/.github/workflows/build-migrations.yml
index 7e2abc34e..12f5f1da8 100644
--- a/.github/workflows/build-migrations.yml
+++ b/.github/workflows/build-migrations.yml
@@ -61,7 +61,8 @@ jobs:
             type=semver,pattern={{major}},enable=${{ github.ref_type == 'tag' }}
 
       - name: Build and Push Docker Image
-        uses: docker/build-push-action@v5
+        id: build
+        uses: docker/build-push-action@v6
         with:
           context: ./migrations
           cache-from: type=gha
diff --git a/.github/workflows/build-mosaic.yml b/.github/workflows/build-mosaic.yml
index a8b131ad5..529ec6c38 100644
--- a/.github/workflows/build-mosaic.yml
+++ b/.github/workflows/build-mosaic.yml
@@ -61,7 +61,8 @@ jobs:
             type=semver,pattern={{major}},enable=${{ github.ref_type == 'tag' }}
 
       - name: Build and Push Docker Image
-        uses: docker/build-push-action@v5
+        id: build
+        uses: docker/build-push-action@v6
         with:
           context: ./mosaic
           platforms: ${{ matrix.platform }}
diff --git a/.github/workflows/build-ui.yml b/.github/workflows/build-ui.yml
index a8a8aa5ae..388977376 100644
--- a/.github/workflows/build-ui.yml
+++ b/.github/workflows/build-ui.yml
@@ -61,7 +61,8 @@ jobs:
             type=semver,pattern={{major}},enable=${{ github.ref_type == 'tag' }}
 
       - name: Build and Push Docker Image
-        uses: docker/build-push-action@v5
+        id: build
+        uses: docker/build-push-action@v6
         with:
           context: ./ui
           platforms: ${{ matrix.platform }}
diff --git a/.github/workflows/build-webdav.yml b/.github/workflows/build-webdav.yml
index 9e5219a0f..66d78acb5 100644
--- a/.github/workflows/build-webdav.yml
+++ b/.github/workflows/build-webdav.yml
@@ -61,7 +61,8 @@ jobs:
             type=semver,pattern={{major}},enable=${{ github.ref_type == 'tag' }}
 
       - name: Build and Push Docker Image
-        uses: docker/build-push-action@v5
+        id: build
+        uses: docker/build-push-action@v6
         with:
           context: ./webdav
           platforms: ${{ matrix.platform }}