diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fe800c1d..8bd23de5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,13 +4,14 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: macos-15
+    # runs-on: macos-15  # GitHub-hosted runner
+    runs-on: [self-hosted, macOS, ARM64]  # Self-hosted Mac Mini
 
     steps:
-      - name: Setup JDK
-        uses: actions/setup-java@v1.4.4
-        with:
-          java-version: 21
+      # - name: Setup JDK  # Not needed on self-hosted runner (Java pre-installed)
+      #   uses: actions/setup-java@v1.4.4
+      #   with:
+      #     java-version: 17
       - name: Checkout source
         uses: actions/checkout@v4
         with:
@@ -19,20 +20,22 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
+            ~/.gradle/caches
             ~/.gradle/wrapper
+            .gradle
             ~/.konan/cache
             ~/.konan/dependencies
-          key: build-deps-${{ runner.os }}-${{ hashFiles('gradle/**', 'gradlew*', 'gradle.properties', '*.gradle*') }}
+          key: build-deps-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('gradle/**', 'gradlew*', 'gradle.properties', '*.gradle*') }}
       - name: Set up Xcode
         run: |
           ls /Applications/Xcode*
           swift --version
           sudo xcode-select --switch /Applications/Xcode_26.2.app/Contents/Developer
-          gem install xcpretty
+          # gem install xcpretty  # Already installed on self-hosted runner
       - name: Use dummy google-services json
         run: mv composeApp/src/google-services-dummy.json composeApp/src/google-services.json
-      - name: Set up Swift
-        uses: swift-actions/setup-swift@v2.2.0
+      # - name: Set up Swift  # Not needed on self-hosted runner (comes with Xcode)
+      #   uses: swift-actions/setup-swift@v2.2.0
 
       - name: Build
         run: ./gradlew :composeApp:compileKotlinIosArm64 :libpebble3:linkDebugFrameworkIosArm64 :composeApp:assembleDebug
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e3340473..4a17eb85 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,22 +6,25 @@ on:
 
 jobs:
   publish-swift:
-    runs-on: macos-latest
+    # runs-on: macos-latest  # GitHub-hosted runner
+    runs-on: [self-hosted, macOS, ARM64]  # Self-hosted Mac Mini
     steps:
-      - name: Setup JDK
-        uses: actions/setup-java@v1.4.4
-        with:
-          java-version: 21
+      # - name: Setup JDK  # Not needed on self-hosted runner (Java pre-installed)
+      #   uses: actions/setup-java@v1.4.4
+      #   with:
+      #     java-version: 21
       - name: Checkout source
         uses: actions/checkout@v4
       - name: Cache build deps
         uses: actions/cache@v4
         with:
           path: |
+            ~/.gradle/caches
             ~/.gradle/wrapper
+            .gradle
             ~/.konan/cache
             ~/.konan/dependencies
-          key: build-deps-${{ runner.os }}-${{ hashFiles('gradle/**', 'gradlew*', 'gradle.properties', '*.gradle*') }}
+          key: build-deps-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('gradle/**', 'gradlew*', 'gradle.properties', '*.gradle*') }}
 
       - name: Build XCFrameworks
         run: ./gradlew assembleXCFramework
@@ -65,21 +68,24 @@ jobs:
           git push origin swiftpm-${{ github.event.release.tag_name }}
 
   publish-maven:
-    runs-on: macos-latest
+    # runs-on: macos-latest  # GitHub-hosted runner
+    runs-on: [self-hosted, macOS, ARM64]  # Self-hosted Mac Mini
 
     steps:
-      - name: Setup JDK
-        uses: actions/setup-java@v1.4.4
-        with:
-          java-version: 17
+      # - name: Setup JDK  # Not needed on self-hosted runner (Java pre-installed)
+      #   uses: actions/setup-java@v1.4.4
+      #   with:
+      #     java-version: 17
       - name: Cache build deps
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
+            ~/.gradle/caches
             ~/.gradle/wrapper
+            .gradle
             ~/.konan/cache
             ~/.konan/dependencies
-          key: build-deps-${{ hashFiles('~/.gradle/**') }}-${{ hashFiles('~/.konan/**') }}
+          key: build-deps-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('gradle/**', 'gradlew*', 'gradle.properties', '*.gradle*') }}
 
       - name: Checkout source
         uses: actions/checkout@v2