diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
index bc64b065bdd..9f167f647d7 100644
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -22,7 +22,7 @@ jobs:
 
   build-android:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
     needs: build-hold
@@ -96,7 +96,7 @@ jobs:
 
   upload-android:
     name: Upload
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
       pull-requests: write
@@ -116,7 +116,7 @@ jobs:
 
   upload-internal:
     name: Internal Sharing
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
       pull-requests: write
diff --git a/.github/workflows/build-ios.yml b/.github/workflows/build-ios.yml
index 7507fd20139..6eda1b04dfe 100644
--- a/.github/workflows/build-ios.yml
+++ b/.github/workflows/build-ios.yml
@@ -81,7 +81,7 @@ jobs:
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           APP_STORE_CONNECT_API_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }}
           APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
-          FASTLANE_REPO_PAT: ${{ secrets.FASTLANE_REPO_PAT }}
+          FASTLANE_REPO_PAT: ${{ secrets.TEST_FASTLANE_NEW_PAT }}
           BUGSNAG_KEY_OFFICIAL: ${{ secrets.BUGSNAG_KEY_OFFICIAL }}
           APP_STORE_CONNECT_API_KEY_BASE64: ${{ secrets.APP_STORE_CONNECT_API_KEY_BASE64 }}
           GOOGLE_SERVICES_IOS: ${{ secrets.GOOGLE_SERVICES_IOS }}
@@ -177,6 +177,6 @@ jobs:
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           APP_STORE_CONNECT_API_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }}
           APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
-          FASTLANE_REPO_PAT: ${{ secrets.FASTLANE_REPO_PAT }}
+          FASTLANE_REPO_PAT: ${{ secrets.TEST_FASTLANE_NEW_PAT }}
           APP_STORE_CONNECT_API_KEY_BASE64: ${{ secrets.APP_STORE_CONNECT_API_KEY_BASE64 }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/e2e-build-ios.yml b/.github/workflows/e2e-build-ios.yml
index 0fd92248ba0..87c92eb196d 100644
--- a/.github/workflows/e2e-build-ios.yml
+++ b/.github/workflows/e2e-build-ios.yml
@@ -17,7 +17,7 @@ on:
         required: true
       APP_STORE_CONNECT_API_KEY_ISSUER_ID:
         required: true
-      FASTLANE_REPO_PAT:
+      TEST_FASTLANE_NEW_PAT:
         required: true
     inputs:
       seed-only:
@@ -150,7 +150,7 @@ jobs:
           MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           APP_STORE_CONNECT_API_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }}
           APP_STORE_CONNECT_API_KEY_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ISSUER_ID }}
-          FASTLANE_REPO_PAT: ${{ secrets.FASTLANE_REPO_PAT }}
+          FASTLANE_REPO_PAT: ${{ secrets.TEST_FASTLANE_NEW_PAT }}
           RUNNING_E2E_TESTS: true
 
       - name: Find latest xcarchive path
diff --git a/ios/fastlane/Matchfile b/ios/fastlane/Matchfile
index a5eb6669bdf..0e67efb675a 100644
--- a/ios/fastlane/Matchfile
+++ b/ios/fastlane/Matchfile
@@ -1,4 +1,4 @@
-git_url("https://#{ENV['FASTLANE_REPO_PAT']}@github.com/RocketChat/Rocket.Chat.Cordova.Fastlane")
+git_url("https://x-access-token:#{ENV['FASTLANE_REPO_PAT']}@github.com/RocketChat/Rocket.Chat.Cordova.Fastlane")
 
 type("development") # The default type, can be: appstore, adhoc, enterprise or development