diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
index 922a549aff..749c67ac9d 100644
--- a/.github/workflows/conan-package.yml
+++ b/.github/workflows/conan-package.yml
@@ -7,151 +7,137 @@ name: conan-package
 # It should run on pushes against main or CURA-* branches, but it will only create the binaries for main and release branches
 
 on:
-    workflow_dispatch:
-        inputs:
-            # FIXME: Not yet implemented
-            conan_id:
-                required: false
-                type: string
-                description: 'The full conan package ID, e.g. "curaengine/1.2.3@ultimaker/stable"'
-            create_latest_alias:
-                required: true
-                default: false
-                type: boolean
-                description: 'Create latest alias'
-            create_binaries_windows:
-                required: true
-                default: false
-                type: boolean
-                description: 'create binaries Windows'
-            create_binaries_linux:
-                required: true
-                default: false
-                type: boolean
-                description: 'create binaries Linux'
-            create_binaries_macos:
-                required: true
-                default: false
-                type: boolean
-                description: 'create binaries Macos'
-
-    push:
-        paths:
-            - 'include/**'
-            - 'src/**'
-            - 'cmake/**'
-            - 'tests/**'
-            - 'test_package/**'
-            - 'conanfile.py'
-            - 'conandata.yml'
-            - 'CMakeLists.txt'
-            - '.github/workflows/conan-package.yml'
-            - '.github/worflows/requirements-conan-package.txt'
-        branches:
-            - main
-            - 'CURA-*'
-            - '[1-9].[0-9]*'
-            - '[1-9].[0-9][0-9]*'
-        tags:
-            - '[1-9]+.[0-9]+.[0-9]*'
-            - '[1-9]+.[0-9]+.[0-9]'
+  workflow_dispatch:
+    inputs:
+      # FIXME: Not yet implemented
+      conan_id:
+        required: false
+        type: string
+        description: 'The full conan package ID, e.g. "curaengine/1.2.3@ultimaker/stable"'
+      create_latest_alias:
+        required: true
+        default: false
+        type: boolean
+        description: 'Create latest alias'
+      create_binaries_windows:
+        required: true
+        default: false
+        type: boolean
+        description: 'create binaries Windows'
+      create_binaries_linux:
+        required: true
+        default: false
+        type: boolean
+        description: 'create binaries Linux'
+      create_binaries_macos:
+        required: true
+        default: false
+        type: boolean
+        description: 'create binaries Macos'
+
+  push:
+    paths:
+      - 'include/**'
+      - 'src/**'
+      - 'cmake/**'
+      - 'tests/**'
+      - 'test_package/**'
+      - 'conanfile.py'
+      - 'conandata.yml'
+      - 'CMakeLists.txt'
+      - '.github/workflows/conan-package.yml'
+      - '.github/worflows/requirements-conan-package.txt'
+    branches:
+      - main
+      - 'CURA-*'
+      - '[1-9].[0-9]*'
+      - '[1-9].[0-9][0-9]*'
+    tags:
+      - '[1-9]+.[0-9]+.[0-9]*'
+      - '[1-9]+.[0-9]+.[0-9]'
 
 jobs:
-    conan-recipe-version:
-        uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@main
-        with:
-            project_name: curaengine
-
-    conan-package-export:
-        needs: [ conan-recipe-version ]
-        uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@main
-        with:
-            recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
-            recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
-            runs_on: 'ubuntu-22.04'
-            python_version: '3.11.x'
-            conan_logging_level: 'info'
-        secrets: inherit
-
-    conan-package-create-macos:
-        if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) || (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@main
-        with:
-            project_name: ${{ needs.conan-recipe-version.outputs.project_name }}
-            recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
-            build_id: 3
-            runs_on: 'macos-11'
-            python_version: '3.11.x'
-            conan_logging_level: 'info'
-        secrets: inherit
-
-    conan-package-create-windows:
-        if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true' )) || (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@main
-        with:
-            project_name: ${{ needs.conan-recipe-version.outputs.project_name }}
-            recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
-            build_id: 4
-            runs_on: 'windows-2022'
-            python_version: '3.11.x'
-            conan_config_branch: ''
-            conan_logging_level: 'info'
-        secrets: inherit
-
-    conan-package-create-linux:
-        if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) || (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@main
-        with:
-            project_name: ${{ needs.conan-recipe-version.outputs.project_name }}
-            recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
-            build_id: 1
-            runs_on: 'ubuntu-20.04'
-            python_version: '3.11.x'
-            conan_logging_level: 'info'
-        secrets: inherit
-
-    conan-package-create-linux-modern:
-        if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) || (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@main
-        with:
-            project_name: ${{ needs.conan-recipe-version.outputs.project_name }}
-            recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
-            build_id: 2
-            runs_on: 'ubuntu-22.04'
-            python_version: '3.11.x'
-            conan_logging_level: 'info'
-        secrets: inherit
-
-    notify-export:
-        if: ${{ always() }}
-        needs: [ conan-recipe-version, conan-package-export ]
-
-        uses: ultimaker/cura/.github/workflows/notify.yml@main
-        with:
-            success: ${{ contains(join(needs.*.result, ','), 'success') }}
-            success_title: "New Conan recipe exported in ${{ github.repository }}"
-            success_body: "Exported ${{ needs.conan-recipe-version.outputs.recipe_id_full }}"
-            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:
-        if: ${{ always() && ((github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_linux)) }}
-        needs: [ conan-recipe-version, conan-package-create-macos, conan-package-create-windows, conan-package-create-linux, conan-package-create-linux-modern ]
-
-        uses: ultimaker/cura/.github/workflows/notify.yml@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
+  conan-recipe-version:
+    uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@main
+    with:
+      project_name: curaengine
+
+  conan-package-export:
+    needs: [ conan-recipe-version ]
+    uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@main
+    with:
+      recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
+      recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }}
+      runs_on: 'ubuntu-22.04'
+      python_version: '3.11.x'
+      conan_logging_level: 'info'
+    secrets: inherit
+
+  conan-package-create-macos:
+    if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) || (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@main
+    with:
+      project_name: ${{ needs.conan-recipe-version.outputs.project_name }}
+      recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
+      build_id: 3
+      runs_on: 'macos-11'
+      python_version: '3.11.x'
+      conan_logging_level: 'info'
+    secrets: inherit
+
+  conan-package-create-windows:
+    if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true' )) || (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@main
+    with:
+      project_name: ${{ needs.conan-recipe-version.outputs.project_name }}
+      recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
+      build_id: 4
+      runs_on: 'windows-2022'
+      python_version: '3.11.x'
+      conan_config_branch: ''
+      conan_logging_level: 'info'
+    secrets: inherit
+
+  conan-package-create-linux:
+    if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) || (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@main
+    with:
+      project_name: ${{ needs.conan-recipe-version.outputs.project_name }}
+      recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
+      build_id: 2
+      runs_on: 'ubuntu-22.04'
+      python_version: '3.11.x'
+      conan_logging_level: 'info'
+    secrets: inherit
+
+  notify-export:
+    if: ${{ always() }}
+    needs: [ conan-recipe-version, conan-package-export ]
+
+    uses: ultimaker/cura/.github/workflows/notify.yml@main
+    with:
+      success: ${{ contains(join(needs.*.result, ','), 'success') }}
+      success_title: "New Conan recipe exported in ${{ github.repository }}"
+      success_body: "Exported ${{ needs.conan-recipe-version.outputs.recipe_id_full }}"
+      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:
+    if: ${{ always() && ((github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) || (github.event_name == 'workflow_dispatch' && inputs.create_binaries_linux)) }}
+    needs: [ conan-recipe-version, conan-package-create-macos, conan-package-create-windows, conan-package-create-linux ]
+
+    uses: ultimaker/cura/.github/workflows/notify.yml@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