diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml
index 9377fa4ac5..ac0389fa79 100644
--- a/.github/workflows/conan-package-create.yml
+++ b/.github/workflows/conan-package-create.yml
@@ -72,7 +72,7 @@ jobs:
                     path: |
                         $HOME/.conan/data
                         $HOME/.conan/conan_download_cache
-                    key: conan-${{ runner.os }}-${{ runner.arch }}
+                    key: conan-${{ runner.os }}-${{ runner.arch }}-create-cache
 
             -   name: Cache Conan local repository packages (Powershell)
                 uses: actions/cache@v3
@@ -82,7 +82,7 @@ jobs:
                         C:\Users\runneradmin\.conan\data
                         C:\.conan
                         C:\Users\runneradmin\.conan\conan_download_cache
-                    key: conan-${{ runner.os }}-${{ runner.arch }}
+                    key: conan-${{ runner.os }}-${{ runner.arch }}-create-cache
 
             -   name: Install MacOS system requirements
                 if:  ${{ runner.os == 'Macos' }}
diff --git a/.github/workflows/conan-recipe-export.yml b/.github/workflows/conan-recipe-export.yml
index bf341c7390..edf251b798 100644
--- a/.github/workflows/conan-recipe-export.yml
+++ b/.github/workflows/conan-recipe-export.yml
@@ -68,7 +68,7 @@ jobs:
                 uses: actions/cache@v3
                 with:
                     path: $HOME/.conan/data
-                    key: ${{ runner.os }}-conan
+                    key: ${{ runner.os }}-conan-export-cache
 
             -   name: Get Conan configuration from branch
                 if: ${{ inputs.conan_config_branch != '' }}
@@ -100,7 +100,5 @@ jobs:
                 if: always()
                 run: |
                     # Only use --all (upload binaries) for the cura repository
-                    conan upload "*@ultimaker/*" -r cura --all -c
-                    conan upload "*@_/_" -r cura --all -c
-                    conan upload "*@ultimaker/*" -r cura-ce -c
-                    conan upload "*@_/_" -r cura-ce -c
+                    conan upload "*" -r cura --all -c
+                    conan upload "*" -r cura-ce -c