diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index eaf23c8faa..adb24aa2ff 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -31,23 +31,22 @@ env:
   CONAN_LOGIN_USERNAME: ${{ secrets.CONAN_USER }}
   CONAN_PASSWORD: ${{ secrets.CONAN_PASS }}
 
-# FIXME: Use `main` instead of `CURA-10831` once merged
 
 jobs:
   check_actor:
-    uses: ultimaker/cura-workflows/.github/workflows/check-actor.yml@CURA-10831
+    uses: ultimaker/cura-workflows/.github/workflows/check-actor.yml@main
     secrets: inherit
 
   conan-recipe-version:
     needs: [ check_actor ]
     if: ${{ needs.check_actor.outputs.proceed == 'true' }}
-    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@CURA-10831
+    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main
     with:
       project_name: curaengine
 
   benchmark:
     needs: [ conan-recipe-version ]
-    uses: ultimaker/cura-workflows/.github/workflows/benchmark.yml@CURA-10831
+    uses: ultimaker/cura-workflows/.github/workflows/benchmark.yml@main
     with:
       recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
       conan_extra_args: "-o curaengine:enable_benchmarks=True"
diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
index fa8f3f77e9..76060d3063 100644
--- a/.github/workflows/conan-package.yml
+++ b/.github/workflows/conan-package.yml
@@ -22,13 +22,13 @@ on:
 
 jobs:
   conan-recipe-version:
-    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@CURA-10831
+    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main
     with:
       project_name: curaengine
 
   conan-package-export:
     needs: [ conan-recipe-version ]
-    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@CURA-10831
+    uses: ultimaker/cura-workflows/.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 }}
@@ -37,7 +37,7 @@ jobs:
   conan-package-create-macos:
     needs: [ conan-recipe-version, conan-package-export ]
     if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) }}
-    uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-macos.yml@CURA-10831
+    uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-macos.yml@main
     with:
       recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
     secrets: inherit
@@ -45,7 +45,7 @@ jobs:
   conan-package-create-windows:
     needs: [ conan-recipe-version, conan-package-export ]
     if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) }}
-    uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-windows.yml@CURA-10831
+    uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-windows.yml@main
     with:
       recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
     secrets: inherit
@@ -53,7 +53,7 @@ jobs:
   conan-package-create-linux:
     needs: [ conan-recipe-version, conan-package-export ]
     if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) }}
-    uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-linux.yml@CURA-10831
+    uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-linux.yml@main
     with:
       recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
     secrets: inherit
diff --git a/.github/workflows/gcodeanalyzer.yml b/.github/workflows/gcodeanalyzer.yml
index f5bbcf0a7f..b73d5900ad 100644
--- a/.github/workflows/gcodeanalyzer.yml
+++ b/.github/workflows/gcodeanalyzer.yml
@@ -27,18 +27,17 @@ env:
   CONAN_LOGIN_USERNAME: ${{ secrets.CONAN_USER }}
   CONAN_PASSWORD: ${{ secrets.CONAN_PASS }}
 
-# FIXME: Use `main` instead of `CURA-10831` once merged
 # TODO: Make cura-workflows/benchmark.yml generic enough to fit the gcodeanalyzer benchmark
 
 jobs:
   check_actor:
-    uses: ultimaker/cura-workflows/.github/workflows/check-actor.yml@CURA-10831
+    uses: ultimaker/cura-workflows/.github/workflows/check-actor.yml@main
     secrets: inherit
 
   conan-recipe-version:
     needs: [ check_actor ]
     if: ${{ needs.check_actor.outputs.proceed == 'true' }}
-    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@CURA-10831
+    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main
     with:
       project_name: curaengine
 
@@ -103,9 +102,8 @@ jobs:
             resources/definitions
             resources/extruders
 
-      #  FIXME: point to `main` once merged
       - name: Sync pip requirements
-        run: curl -O https://raw.githubusercontent.com/Ultimaker/cura-workflows/CURA-10831/.github/workflows/requirements-runner.txt
+        run: curl -O https://raw.githubusercontent.com/Ultimaker/cura-workflows/main/.github/workflows/requirements-runner.txt
         working-directory: CuraEngine/.github/workflows
 
       - name: Setup Python and pip
@@ -122,12 +120,11 @@ jobs:
           pip install git+https://github.com/ultimaker/libcharon@CURA-9495_analyzer_requisites#egg=charon
           pip install pytest pytest-benchmark
 
-      #  FIXME: point to `main` once merged
       - name: Install Linux system requirements for building
         run: |
           mkdir runner_scripts
           cd runner_scripts
-          curl -O https://raw.githubusercontent.com/Ultimaker/cura-workflows/CURA-10831/runner_scripts/ubuntu_setup.sh
+          curl -O https://raw.githubusercontent.com/Ultimaker/cura-workflows/main/runner_scripts/ubuntu_setup.sh
           chmod +x ubuntu_setup.sh
           sudo ./ubuntu_setup.sh
 
diff --git a/.github/workflows/stress_benchmark.yml b/.github/workflows/stress_benchmark.yml
index 166ffe44e6..3911302b5d 100644
--- a/.github/workflows/stress_benchmark.yml
+++ b/.github/workflows/stress_benchmark.yml
@@ -30,23 +30,22 @@ env:
   CONAN_LOGIN_USERNAME: ${{ secrets.CONAN_USER }}
   CONAN_PASSWORD: ${{ secrets.CONAN_PASS }}
 
-# FIXME: Use `main` instead of `CURA-10831` once merged
 
 jobs:
   check_actor:
-    uses: ultimaker/cura-workflows/.github/workflows/check-actor.yml@CURA-10831
+    uses: ultimaker/cura-workflows/.github/workflows/check-actor.yml@main
     secrets: inherit
 
   conan-recipe-version:
     needs: [ check_actor ]
     if: ${{ needs.check_actor.outputs.proceed == 'true' }}
-    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@CURA-10831
+    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main
     with:
       project_name: curaengine
 
   benchmark:
     needs: [ conan-recipe-version ]
-    uses: ultimaker/cura-workflows/.github/workflows/benchmark.yml@CURA-10831
+    uses: ultimaker/cura-workflows/.github/workflows/benchmark.yml@main
     with:
       recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
       conan_extra_args: "-o curaengine:enable_benchmarks=True"
diff --git a/conandata.yml b/conandata.yml
index 933e432bef..63534b7175 100644
--- a/conandata.yml
+++ b/conandata.yml
@@ -1,5 +1,5 @@
 version: "5.7.0-alpha.0"
 requirements:
   - "arcus/5.3.0"
-  - "curaengine_grpc_definitions/(latest)@ultimaker/cura_10831"
+  - "curaengine_grpc_definitions/(latest)@ultimaker/testing"
   - "scripta/0.1.0@ultimaker/testing"
\ No newline at end of file