diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
index 4c9f730335..1be3fd4ab3 100644
--- a/.github/workflows/conan-package.yml
+++ b/.github/workflows/conan-package.yml
@@ -49,7 +49,21 @@ jobs:
         with:
             project_name: cura
 
-    conan-package-export:
+    conan-package-export-macos:
+        needs: [ conan-recipe-version ]
+        uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@CURA-9365_fix_building_cura_main
+        with:
+            recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
+            recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
+            recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }}
+            runs_on: 'macos-10.15'
+            python_version: '3.10.4'
+            conan_config_branch: 'CURA-9177_Fix_CI_CD'
+            conan_logging_level: 'info'
+            conan_export_binaries: true
+        secrets: inherit
+
+    conan-package-export-linux:
         needs: [ conan-recipe-version ]
         uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@CURA-9365_fix_building_cura_main
         with:
@@ -60,53 +74,26 @@ jobs:
             python_version: '3.10.4'
             conan_config_branch: 'CURA-9177_Fix_CI_CD'
             conan_logging_level: 'info'
+            conan_export_binaries: true
         secrets: inherit
 
-    conan-package-create-macos:
-        # FIXME: For release branches: maybe rename the branch to release/**
-        if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == '5.1' || github.ref_name == 'CURA-9365_fix_building_cura_main' )) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_macos) }}
-        needs: [ conan-recipe-version, conan-package-export ]
-
-        uses: ultimaker/cura/.github/workflows/conan-package-create.yml@CURA-9365_fix_building_cura_main
-        with:
-            recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
-            runs_on: 'macos-10.15'
-            python_version: '3.10.4'
-            conan_config_branch: 'CURA-9177_Fix_CI_CD'
-            conan_logging_level: 'info'
-        secrets: inherit
-
-    conan-package-create-windows:
-        # FIXME: For release branches: maybe rename the branch to release/**
-        if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == '5.1' || github.ref_name == 'CURA-9365_fix_building_cura_main' )) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_windows) }}
-        needs: [ conan-recipe-version, conan-package-export ]
-
-        uses: ultimaker/cura/.github/workflows/conan-package-create.yml@CURA-9365_fix_building_cura_main
+    conan-package-export-windows:
+        needs: [ conan-recipe-version ]
+        uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@CURA-9365_fix_building_cura_main
         with:
             recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
+            recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
+            recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }}
             runs_on: 'windows-2022'
             python_version: '3.10.4'
             conan_config_branch: 'CURA-9177_Fix_CI_CD'
             conan_logging_level: 'info'
-        secrets: inherit
-
-    conan-package-create-linux:
-        # FIXME: For release branches: maybe rename the branch to release/**
-        if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == '5.1' || github.ref_name == 'CURA-9365_fix_building_cura_main')) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_linux) }}
-        needs: [ conan-recipe-version, conan-package-export ]
-
-        uses: ultimaker/cura/.github/workflows/conan-package-create.yml@CURA-9365_fix_building_cura_main
-        with:
-            recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
-            runs_on: 'ubuntu-20.04'
-            python_version: '3.10.4'
-            conan_config_branch: 'CURA-9177_Fix_CI_CD'
-            conan_logging_level: 'info'
+            conan_export_binaries: true
         secrets: inherit
 
     notify-export:
         if: ${{ always() }}
-        needs: [ conan-package-export ]
+        needs: [ conan-package-export-linux, conan-package-export-macos, conan-package-export-windows ]
 
         uses: ultimaker/cura/.github/workflows/notify.yml@CURA-9365_fix_building_cura_main
         with:
@@ -116,17 +103,3 @@ jobs:
             failure_title: "Failed to export Conan Export in ${{ github.repository }}"
             failure_body: "Failed to exported ${{ needs.conan-recipe-version.outputs.recipe_id_full }}"
         secrets: inherit
-
-    notify-create:
-        # FIXME: For release branches: maybe rename the branch to release/**
-        if: ${{ always() && ((github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == '5.1')) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_linux)) }}
-        needs: [ conan-package-create-macos, conan-package-create-windows, conan-package-create-linux ]
-
-        uses: ultimaker/cura/.github/workflows/notify.yml@CURA-9365_fix_building_cura_main
-        with:
-            success: ${{ contains(join(needs.*.result, ','), 'success') }}
-            success_title: "New binaries created in ${{ github.repository }}"
-            success_body: "Created binaries for ${{ needs.conan-recipe-version.outputs.recipe_id_full }}"
-            failure_title: "Failed to create binaries in ${{ github.repository }}"
-            failure_body: "Failed to created binaries for ${{ needs.conan-recipe-version.outputs.recipe_id_full }}"
-        secrets: inherit