diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 7cd6a1247c..bd42a2b453 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -76,7 +76,7 @@ env:
 
 jobs:
     cura-installer-create:
-        runs-on: [ self-hosted ]
+        runs-on: [ self-hosted, "${{ inputs.architecture }}" ]
 
         steps:
             -   name: Checkout
@@ -160,7 +160,7 @@ jobs:
                 run: |
                     import os
                     enterprise = "-Enterprise" if "${{ inputs.enterprise }}" == "true" else ""
-                    installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-${{ runner.arch }}"
+                    installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-${{ inputs.architecture }}"
                     output_env = os.environ["GITHUB_OUTPUT"]
                     content = ""
                     if os.path.exists(output_env):