diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index a9e03feca..b2fdd5d48 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -44,7 +44,7 @@ jobs:
             "!**/*.md"]
 
   android-build:
-    runs-on: MapLibre_Native_Linux_16_core
+    runs-on: ${{ github.event.pull_request && !github.event.pull_request.draft && 'MapLibre_Native_Linux_16_core' || 'ubuntu-22.04' }}
     needs:
       - pre_job
     if: needs.pre_job.outputs.should_skip != 'true'
diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
index a70cee1b4..a882a773c 100644
--- a/.github/workflows/linux-ci.yml
+++ b/.github/workflows/linux-ci.yml
@@ -46,7 +46,7 @@ jobs:
       fail-fast: true
       matrix:
         renderer: [legacy, drawable]
-    runs-on: MapLibre_Native_Linux_16_core
+    runs-on: ${{ github.event.pull_request && !github.event.pull_request.draft && 'MapLibre_Native_Linux_16_core' || 'ubuntu-22.04' }}
     steps:
       - uses: actions/checkout@v4
         with: