diff --git a/.github/workflows/bake.yml b/.github/workflows/bake.yml
index 3f6a652..5aa2587 100644
--- a/.github/workflows/bake.yml
+++ b/.github/workflows/bake.yml
@@ -229,6 +229,7 @@ jobs:
               target = targets[0];
             });
 
+            const privateRepo = GitHub.context.payload.repository?.private ?? false;
             await core.group(`Set includes`, async () => {
               let includes = [];
               const platforms = def.target[target].platforms || [];
@@ -244,7 +245,7 @@ jobs:
                   includes.push({
                     index: index,
                     platform: platform,
-                    runner: GitHub.isGHES && platform.startsWith('linux/arm') ? 'ubuntu-24.04-arm' : 'ubuntu-24.04'
+                    runner: (!privateRepo && platform.startsWith('linux/arm')) ? 'ubuntu-24.04-arm' : 'ubuntu-24.04' // FIXME: ubuntu-24.04-arm runner not yet available for private repos
                   });
                 });
               }
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 91d6ecf..facde59 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -184,6 +184,7 @@ jobs:
             
             const inpBuildPlatforms = Util.getInputList('build-platforms');
             
+            const privateRepo = GitHub.context.payload.repository?.private ?? false;
             await core.group(`Set includes`, async () => {
               let includes = [];
               if (inpBuildPlatforms.length > inpMatrixSizeLimit) {
@@ -198,7 +199,7 @@ jobs:
                   includes.push({
                     index: index,
                     platform: platform,
-                    runner: GitHub.isGHES && platform.startsWith('linux/arm') ? 'ubuntu-24.04-arm' : 'ubuntu-24.04'
+                    runner: (!privateRepo && platform.startsWith('linux/arm')) ? 'ubuntu-24.04-arm' : 'ubuntu-24.04' // FIXME: ubuntu-24.04-arm runner not yet available for private repos
                   });
                 });
               }