diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6d664ee89..a4515f238 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,26 +7,26 @@ on:
 
 jobs:
   version:
-    uses: walt-id/waltid-identity/.github/workflows/version.yml@266f5c09359450c39019a6da38f2b331e7122918
+    uses: walt-id/waltid-identity/.github/workflows/reusable/version.yml@feat/docker-build-share
   gradle-build:
-    uses: walt-id/waltid-identity/.github/workflows/build-gradle.yml@266f5c09359450c39019a6da38f2b331e7122918
+    uses: walt-id/waltid-identity/.github/workflows/reusable/build-gradle.yml@feat/docker-build-share
     needs: version
     with:
       version: ${{ needs.version.outputs.release_version }}
   docker-matrix:
-    uses: walt-id/waltid-identity/.github/workflows/load-json.yml@feat/docker-build-share
+    uses: walt-id/waltid-identity/.github/workflows/reusable/load-json.yml@feat/docker-build-share
     needs: [ version ]
     with:
       jsonpath: ".github/workflows/data/docker-matrix.json"
   docker:
-    uses: walt-id/waltid-identity/.github/workflows/docker.yml@feat/docker-build-share
+    uses: walt-id/waltid-identity/.github/workflows/reusable/docker.yml@feat/docker-build-share
     needs: [ version, docker-matrix ]
     with:
       images: ${{ needs.docker-matrix.outputs.json }}
       version: ${{ needs.version.outputs.release_version }}
       artifact: true
   ebsi-ct-v3:
-    uses: walt-id/waltid-identity/.github/workflows/ebsictv3.yml@feat/docker-build-share
+    uses: walt-id/waltid-identity/.github/workflows/reusable/ebsictv3.yml@feat/docker-build-share
     needs: [ version, docker ]
     secrets: inherit
     with:
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
index 3d7b00d0f..e277cc078 100644
--- a/.github/workflows/pre-release.yml
+++ b/.github/workflows/pre-release.yml
@@ -7,30 +7,36 @@ on:
 
 jobs:
   version:
-    uses: walt-id/waltid-identity/.github/workflows/version.yml@266f5c09359450c39019a6da38f2b331e7122918
+    uses: walt-id/waltid-identity/.github/workflows/reusable/version.yml@feat/docker-build-share
     with:
       suffix: -SNAPSHOT
   gradle-build:
-    uses: walt-id/waltid-identity/.github/workflows/build-gradle.yml@266f5c09359450c39019a6da38f2b331e7122918
+    uses: walt-id/waltid-identity/.github/workflows/reusable/build-gradle.yml@feat/docker-build-share
     secrets: inherit
     needs: version
     with:
       version: ${{ needs.version.outputs.release_version }}
       publish: true
+  docker-matrix:
+    uses: walt-id/waltid-identity/.github/workflows/reusable/load-json.yml@feat/docker-build-share
+    needs: [ version ]
+    with:
+      jsonpath: ".github/workflows/data/docker-matrix.json"
   docker-build:
-    uses: walt-id/waltid-identity/.github/workflows/build-docker.yml@266f5c09359450c39019a6da38f2b331e7122918
+    uses: walt-id/waltid-identity/.github/workflows/reusable/docker.yml@feat/docker-build-share
     secrets: inherit
-    needs: version
+    needs: [ version, docker-matrix ]
     with:
+      images: ${{ needs.docker-matrix.outputs.json }}
       version: ${{ needs.version.outputs.release_version }}
       publish: true
   tag:
-    uses: walt-id/waltid-identity/.github/workflows/tag.yml@266f5c09359450c39019a6da38f2b331e7122918
+    uses: walt-id/waltid-identity/.github/workflows/reusable/tag.yml@feat/docker-build-share
     needs: [ version, gradle-build, docker-build ]
     with:
       version: ${{ needs.version.outputs.release_version }}
   pre-release:
-    uses: walt-id/waltid-identity/.github/workflows/changelog.yml@266f5c09359450c39019a6da38f2b331e7122918
+    uses: walt-id/waltid-identity/.github/workflows/reusable/changelog.yml@feat/docker-build-share
     secrets: inherit
     needs: [ tag ]
     with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 950990dee..250a1e624 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,26 +9,31 @@ on:
 
 jobs:
   version:
-    uses: walt-id/waltid-identity/.github/workflows/version.yml@266f5c09359450c39019a6da38f2b331e7122918
+    uses: walt-id/waltid-identity/.github/workflows/reusable/version.yml@feat/docker-build-share
     with:
       preferred: ${{ inputs.release_version }}
   gradle-build:
-    uses: walt-id/waltid-identity/.github/workflows/build-gradle.yml@266f5c09359450c39019a6da38f2b331e7122918
+    uses: walt-id/waltid-identity/.github/workflows/reusable/build-gradle.yml@feat/docker-build-share
     secrets: inherit
     needs: version
     with:
       version: ${{ needs.version.outputs.release_version }}
       publish: true
+  docker-matrix:
+    uses: walt-id/waltid-identity/.github/workflows/reusable/load-json.yml@feat/docker-build-share
+    needs: [ version ]
+    with:
+      jsonpath: ".github/workflows/data/docker-matrix.json"
   docker-build:
-    uses: walt-id/waltid-identity/.github/workflows/build-docker.yml@266f5c09359450c39019a6da38f2b331e7122918
+    uses: walt-id/waltid-identity/.github/workflows/reusable/docker.yml@feat/docker-build-share
     secrets: inherit
-    needs: version
+    needs: [ version, docker-matrix ]
     with:
       version: ${{ needs.version.outputs.release_version }}
       tag: latest
       publish: true
   deploy:
-    uses: walt-id/waltid-identity/.github/workflows/deployment.yml@dd9e94a2b08b2f9917d56543061963e6757def1f
+    uses: walt-id/waltid-identity/.github/workflows/reusable/deployment.yml@feat/docker-build-share
     secrets: inherit
     needs: [ version, gradle-build, docker-build ]
     with:
@@ -37,12 +42,12 @@ jobs:
       namespace: default
       portals: portals
   tag:
-    uses: walt-id/waltid-identity/.github/workflows/tag.yml@266f5c09359450c39019a6da38f2b331e7122918
+    uses: walt-id/waltid-identity/.github/workflows/reusable/tag.yml@feat/docker-build-share
     needs: [ version, deploy ]
     with:
       version: ${{ needs.version.outputs.release_version }}
   release:
-    uses: walt-id/waltid-identity/.github/workflows/changelog.yml@266f5c09359450c39019a6da38f2b331e7122918
+    uses: walt-id/waltid-identity/.github/workflows/reusable/changelog.yml@feat/docker-build-share
     secrets: inherit
     needs: [ tag ]
     with:
diff --git a/.github/workflows/reusable/build-gradle.yml b/.github/workflows/reusable/build-gradle.yml
index 68757afc9..bc2416c9b 100644
--- a/.github/workflows/reusable/build-gradle.yml
+++ b/.github/workflows/reusable/build-gradle.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Configure gradle
-        uses: ./.github/actions/gradle-setup-action@266f5c09359450c39019a6da38f2b331e7122918
+        uses: ./.github/actions/gradle-setup-action@feat/docker-build-share
       - name: Set version
         run: |
           sed -i "s/1.0.0-SNAPSHOT/${{ inputs.version }}/g" build.gradle.kts
diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml
index 625a0f4c1..149705d47 100644
--- a/.github/workflows/test-deploy.yml
+++ b/.github/workflows/test-deploy.yml
@@ -8,30 +8,36 @@ on:
         required: false
 jobs:
   version:
-    uses: walt-id/waltid-identity/.github/workflows/version.yml@266f5c09359450c39019a6da38f2b331e7122918
+    uses: walt-id/waltid-identity/.github/workflows/reusable/version.yml@feat/docker-build-share
     with:
       preferred: ${{ inputs.release_version }}
   gradle-build:
-    uses: walt-id/waltid-identity/.github/workflows/build-gradle.yml@266f5c09359450c39019a6da38f2b331e7122918
+    uses: walt-id/waltid-identity/.github/workflows/reusable/build-gradle.yml@feat/docker-build-share
     secrets: inherit
     needs: version
     with:
       version: ${{ needs.version.outputs.release_version }}
+  docker-matrix:
+    uses: walt-id/waltid-identity/.github/workflows/reusable/load-json.yml@feat/docker-build-share
+    needs: [ version ]
+    with:
+      jsonpath: ".github/workflows/data/docker-matrix.json"
   docker-build:
-    uses: walt-id/waltid-identity/.github/workflows/build-docker.yml@266f5c09359450c39019a6da38f2b331e7122918
+    uses: walt-id/waltid-identity/.github/workflows/reusable/docker.yml@feat/docker-build-share
     secrets: inherit
     needs: version
     with:
+      images: ${{ needs.docker-matrix.outputs.json }}
       version: ${{ needs.version.outputs.release_version }}
       publish: true
   deploy:
-    uses: walt-id/waltid-identity/.github/workflows/deployment.yml@dd9e94a2b08b2f9917d56543061963e6757def1f
+    uses: walt-id/waltid-identity/.github/workflows/reusable/deployment.yml@feat/docker-build-share
     secrets: inherit
     needs: [ version, gradle-build, docker-build ]
     with:
       version: ${{ needs.version.outputs.release_version }}
   tag:
-    uses: walt-id/waltid-identity/.github/workflows/tag.yml@266f5c09359450c39019a6da38f2b331e7122918
+    uses: walt-id/waltid-identity/.github/workflows/reusable/tag.yml@feat/docker-build-share
     needs: [ version, deploy ]
     with:
       version: ${{ needs.version.outputs.release_version }}
\ No newline at end of file