diff --git a/.github/workflows/build-android-app.yml b/.github/workflows/build-android-app.yml
index 3c04a32..30216ab 100644
--- a/.github/workflows/build-android-app.yml
+++ b/.github/workflows/build-android-app.yml
@@ -47,7 +47,8 @@ env:
 jobs:
   build:
     name: Build Android app
-    runs-on: [self-hosted, macOS, X64, mobile-1]
+    runs-on:
+      group: crispy-self-hosted-runners
     defaults:
       run:
         working-directory: android
diff --git a/.github/workflows/build-ios-app.yml b/.github/workflows/build-ios-app.yml
index 9da84f6..04ed6e9 100644
--- a/.github/workflows/build-ios-app.yml
+++ b/.github/workflows/build-ios-app.yml
@@ -41,7 +41,8 @@ env:
 jobs:
   build:
     name: Build iOS
-    runs-on: [self-hosted, macOS, X64, mobile-1]
+    runs-on:
+      group: crispy-self-hosted-runners
     defaults:
       run:
         working-directory: ios
diff --git a/.github/workflows/upload-store-android-app.yml b/.github/workflows/upload-store-android-app.yml
index 0b3ed4b..ccf8eb7 100644
--- a/.github/workflows/upload-store-android-app.yml
+++ b/.github/workflows/upload-store-android-app.yml
@@ -47,8 +47,9 @@ env:
 jobs:
   upload:
     name: Upload Artifact to Play Store
-    if: ${{ inputs.ANDROID_ENABLE_UPLOAD != 'false' }} 
-    runs-on: [self-hosted, macOS, X64, mobile-1]
+    if: ${{ inputs.ANDROID_ENABLE_UPLOAD != 'false' }}
+    runs-on:
+      group: crispy-self-hosted-runners
     defaults:
       run:
         working-directory: android
diff --git a/.github/workflows/upload-testflight-ios-app.yml b/.github/workflows/upload-testflight-ios-app.yml
index a6185fb..b83c7f8 100644
--- a/.github/workflows/upload-testflight-ios-app.yml
+++ b/.github/workflows/upload-testflight-ios-app.yml
@@ -58,8 +58,9 @@ env:
 jobs:
   upload:
     name: Upload Artifact to TestFlight
-    if: ${{ inputs.IOS_ENABLE_UPLOAD != 'false' }} 
-    runs-on: [self-hosted, macOS, X64, mobile-1]
+    if: ${{ inputs.IOS_ENABLE_UPLOAD != 'false' }}
+    runs-on:
+      group: crispy-self-hosted-runners
     defaults:
       run:
         working-directory: ios