diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 113e3aec..d7ee7488 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -22,31 +22,31 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
       - name: Build and push Docker images (issuer)
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v6
         with:
           push: false
           file: waltid-issuer-api/Dockerfile
           #tags: waltid/issuer-api:latest, waltid/issuer-api:${{ env.release_version }}
       - name: Build and push Docker images (verifier)
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v6
         with:
           push: false
           file: waltid-verifier-api/Dockerfile
           #tags: waltid/verifier-api:latest, waltid/verifier-api:${{ env.release_version }}
       - name: Build and push Docker images (wallet-api)
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v6
         with:
           push: false
           file: waltid-wallet-api/Dockerfile
           #tags: waltid/wallet-api:latest, waltid/wallet-api:${{ env.release_version }}
       - name: Build and push Docker images (waltid-web-wallet)
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v6
         with:
           push: false
           file: waltid-web-wallet/Dockerfile
           #tags: waltid/waltid-web-wallet:latest, waltid/waltid-web-wallet:${{ env.release_version }}
       - name: Build and push Docker images (wallet-portal)
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           push: false
           file: waltid-web-portal/Dockerfile
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
index b519abf9..9ed4d7c7 100644
--- a/.github/workflows/pre-release.yml
+++ b/.github/workflows/pre-release.yml
@@ -50,31 +50,31 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and push Docker images (issuer)
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: waltid-issuer-api/Dockerfile
           tags: waltid/issuer-api:latest, waltid/issuer-api:${{ env.release_version }}
       - name: Build and push Docker images (verifier)
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: waltid-verifier-api/Dockerfile
           tags: waltid/verifier-api:latest, waltid/verifier-api:${{ env.release_version }}
       - name: Build and push Docker images (wallet-api)
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: waltid-wallet-api/Dockerfile
           tags: waltid/wallet-api:latest, waltid/wallet-api:${{ env.release_version }}
       - name: Build and push Docker images (waltid-web-wallet)
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: waltid-web-wallet/Dockerfile
           tags: waltid/waltid-web-wallet:latest, waltid/waltid-web-wallet:${{ env.release_version }}
       - name: Build and push Docker images (wallet-portal)
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: waltid-web-portal/Dockerfile
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0ecf5684..74f2b27d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -51,31 +51,31 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and push Docker images (issuer)
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: waltid-issuer-api/Dockerfile
           tags: waltid/issuer-api:latest, waltid/issuer-api:${{ inputs.release_version }}
       - name: Build and push Docker images (verifier)
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: waltid-verifier-api/Dockerfile
           tags: waltid/verifier-api:latest, waltid/verifier-api:${{ inputs.release_version }}
       - name: Build and push Docker images (wallet-api)
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: waltid-wallet-api/Dockerfile
           tags: waltid/wallet-api:latest, waltid/wallet-api:${{ inputs.release_version }}
       - name: Build and push Docker images (waltid-web-wallet)
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: waltid-web-wallet/Dockerfile
           tags: waltid/waltid-web-wallet:latest, waltid/waltid-web-wallet:${{ inputs.release_version }}
       - name: Build and push Docker images (wallet-portal)
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: waltid-web-portal/Dockerfile
diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml
index 9ca13679..0ed5f4aa 100644
--- a/.github/workflows/test-deploy.yml
+++ b/.github/workflows/test-deploy.yml
@@ -52,31 +52,31 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build and push Docker images (issuer)
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: waltid-issuer-api/Dockerfile
           tags: waltid/issuer-api:dev, waltid/issuer-api:${{ env.release_version }}
       - name: Build and push Docker images (verifier)
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: waltid-verifier-api/Dockerfile
           tags: waltid/verifier-api:dev, waltid/verifier-api:${{ env.release_version }}
       - name: Build and push Docker images (wallet-api)
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: waltid-wallet-api/Dockerfile
           tags: waltid/wallet-api:dev, waltid/wallet-api:${{ env.release_version }}
       - name: Build and push Docker images (waltid-web-wallet)
-        uses: docker/build-push-action@v4.0.0
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: waltid-web-wallet/Dockerfile
           tags: waltid/waltid-web-wallet:dev, waltid/waltid-web-wallet:${{ env.release_version }}
       - name: Build and push Docker images (wallet-portal)
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           push: true
           file: waltid-web-portal/Dockerfile