diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml
deleted file mode 100644
index dcab400b9..000000000
--- a/.github/actionlint.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-self-hosted-runner:
-  # Labels of self-hosted runner in array of strings.
-  labels:
-    - MapLibre_Native_Large_Runner
-# Configuration variables in array of strings defined in your repository or
-# organization. `null` means disabling configuration variables check.
-# Empty array means no configuration variable is allowed.
-config-variables: null
diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index 0ec90f904..83ee3c198 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -44,7 +44,8 @@ jobs:
             "!**/*.md"]
 
   android-build:
-    runs-on: MapLibre_Native_Large_Runner
+    runs-on:
+      group: maplibre-native
     needs:
       - pre_job
     if: needs.pre_job.outputs.should_skip != 'true'
@@ -57,21 +58,6 @@ jobs:
       IS_LOCAL_DEVELOPMENT: false
       MLN_ANDROID_STL: c++_static
     steps:
-      - name: Update Apt Package Cache
-        run: sudo apt-get update
-        working-directory: .
-
-      - name: Free Disk Space (Ubuntu)
-        uses: jlumbroso/free-disk-space@main
-        with:
-          tool-cache: false
-          android: false
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: false
-
       - uses: actions/checkout@v4
         with:
           submodules: recursive
diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
index 93713e05a..457e5a54f 100644
--- a/.github/workflows/linux-ci.yml
+++ b/.github/workflows/linux-ci.yml
@@ -46,7 +46,8 @@ jobs:
       fail-fast: false
       matrix:
         renderer: [legacy, drawable]
-    runs-on: MapLibre_Native_Large_Runner
+    runs-on:
+      group: maplibre-native
     steps:
       - uses: actions/checkout@v4
         with: