diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 901160236..118b3ce26 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,16 +19,21 @@ jobs:
     needs: version
     with:
       version: ${{ needs.version.outputs.release_version }}
-  docker-build:
-    uses: walt-id/waltid-identity/.github/workflows/build-docker.yml@feat/docker-build-share
+  prepare-docker:
+    uses: walt-id/waltid-identity/.github/workflows/prepare-docker.yml@feat/docker-build-share
     needs: [ version ]
     with:
       version: ${{ needs.version.outputs.release_version }}
-      artifact: ${{ needs.environment.outputs.artifact-path }}
-  ebsi-ct-v3:
-    uses: walt-id/waltid-identity/.github/workflows/ebsictv3.yml@feat/docker-build-share
-    needs: [ version, docker-build ]
-    secrets: inherit
+  docker-build:
+    uses: walt-id/waltid-identity/.github/workflows/build-docker.yml@feat/docker-build-share
+    needs: [ prepare-docker ]
     with:
-      artifact: issuer-api
-      tag: "waltid/issuer-api:${{ needs.version.outputs.release_version }}"
\ No newline at end of file
+      images: ${{ needs.prepare-docker.outputs.images }}
+      artifact: ${{ needs.environment.outputs.artifact-path }}
+#  ebsi-ct-v3:
+#    uses: walt-id/waltid-identity/.github/workflows/ebsictv3.yml@feat/docker-build-share
+#    needs: [ version, docker-build ]
+#    secrets: inherit
+#    with:
+#      artifact: issuer-api
+#      tag: "waltid/issuer-api:${{ needs.version.outputs.release_version }}"
\ No newline at end of file