diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 514b5e3..07abbc0 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -7,8 +7,6 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
 
 concurrency:
   group: main-${{ github.ref }}
@@ -42,11 +40,34 @@ jobs:
           echo "Project version: ${project_version}"
           echo "value=${project_version}" >> $GITHUB_OUTPUT
 
-  build-and-test:
-    name: Build & Test
+  build-development-image:
+    name: Build Development Image
+    needs:
+      - prepare-environment
+    uses: open-space-collective/open-space-toolkit/.github/workflows/build-image.yml@main
+    with:
+      project_name: ${{ needs.prepare-environment.outputs.project_name }}
+      project_version: ${{ needs.prepare-environment.outputs.project_version }}
+    secrets: inherit
+
+  test:
+    name: Test
+    needs:
+      - prepare-environment
+      - build-development-image
+    uses: open-space-collective/open-space-toolkit/.github/workflows/test.yml@main
+    with:
+      project_name: ${{ needs.prepare-environment.outputs.project_name }}
+      project_version: ${{ needs.prepare-environment.outputs.project_version }}
+    secrets: inherit
+
+  package:
+    name: Package
     needs:
       - prepare-environment
-    uses: open-space-collective/open-space-toolkit/.github/workflows/build-test.yml@main
+      - build-development-image
+      - test
+    uses: open-space-collective/open-space-toolkit/.github/workflows/build-packages.yml@main
     with:
       project_name: ${{ needs.prepare-environment.outputs.project_name }}
       project_version: ${{ needs.prepare-environment.outputs.project_version }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0ca5320..b05d1ef 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,11 +34,34 @@ jobs:
           echo "Project version: ${project_version}"
           echo "value=${project_version}" >> $GITHUB_OUTPUT
 
-  build-and-test:
-    name: Build & Test
+  build-development-image:
+    name: Build Development Image
     needs:
       - prepare-environment
-    uses: open-space-collective/open-space-toolkit/.github/workflows/build-test.yml@main
+    uses: open-space-collective/open-space-toolkit/.github/workflows/build-image.yml@main
+    with:
+      project_name: ${{ needs.prepare-environment.outputs.project_name }}
+      project_version: ${{ needs.prepare-environment.outputs.project_version }}
+    secrets: inherit
+
+  test:
+    name: Test
+    needs:
+      - prepare-environment
+      - build-development-image
+    uses: open-space-collective/open-space-toolkit/.github/workflows/test.yml@main
+    with:
+      project_name: ${{ needs.prepare-environment.outputs.project_name }}
+      project_version: ${{ needs.prepare-environment.outputs.project_version }}
+    secrets: inherit
+
+  package:
+    name: Package
+    needs:
+      - prepare-environment
+      - build-development-image
+      - test
+    uses: open-space-collective/open-space-toolkit/.github/workflows/build-packages.yml@main
     with:
       project_name: ${{ needs.prepare-environment.outputs.project_name }}
       project_version: ${{ needs.prepare-environment.outputs.project_version }}
@@ -48,7 +71,9 @@ jobs:
     name: Release
     needs:
       - prepare-environment
-      - build-and-test
+      - build-development-image
+      - test
+      - package
     uses: open-space-collective/open-space-toolkit/.github/workflows/release.yml@main
     with:
       project_name: ${{ needs.prepare-environment.outputs.project_name }}