diff --git a/.gitea/workflows/frontend_deploy-beta.yaml b/.gitea/workflows/frontend_deploy-beta.yaml
index a0f6db5..6eb6c95 100644
--- a/.gitea/workflows/frontend_deploy-beta.yaml
+++ b/.gitea/workflows/frontend_deploy-beta.yaml
@@ -42,11 +42,10 @@ jobs:
       build_type: beta
       build_name: ${{ env.BUILD_NAME }}
     secrets:
-      MATCH_REPO_SSH_KEY: ${{ secrets.MATCH_REPO_SSH_KEY }}
-      GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
       IOS_ASC_KEY_ID: ${{ secrets.IOS_ASC_KEY_ID }}
       IOS_ASC_ISSUER_ID: ${{ secrets.IOS_ASC_ISSUER_ID }}
       IOS_ASC_KEY: ${{ secrets.IOS_ASC_KEY }}
-      MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+      IOS_MATCH_REPO_SSH_KEY_BASE64: ${{ secrets.IOS_MATCH_REPO_SSH_KEY_BASE64 }}
+      IOS_MATCH_PASSWORD: ${{ secrets.IOS_MATCH_PASSWORD }}
       IOS_GOOGLE_MAPS_API_KEY: ${{ secrets.IOS_GOOGLE_MAPS_API_KEY }}
     needs: get-version
diff --git a/.gitea/workflows/frontend_deploy-release.yaml b/.gitea/workflows/frontend_deploy-release.yaml
index 7efbb98..f4262fa 100644
--- a/.gitea/workflows/frontend_deploy-release.yaml
+++ b/.gitea/workflows/frontend_deploy-release.yaml
@@ -40,11 +40,10 @@ jobs:
       build_type: release
       build_name: ${{ env.BUILD_NAME }}
     secrets:
-      MATCH_REPO_SSH_KEY: ${{ secrets.MATCH_REPO_SSH_KEY }}
-      GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
       IOS_ASC_KEY_ID: ${{ secrets.IOS_ASC_KEY_ID }}
       IOS_ASC_ISSUER_ID: ${{ secrets.IOS_ASC_ISSUER_ID }}
       IOS_ASC_KEY: ${{ secrets.IOS_ASC_KEY }}
-      MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+      IOS_MATCH_PASSWORD: ${{ secrets.IOS_MATCH_PASSWORD }}
+      IOS_MATCH_REPO_SSH_KEY_BASE64: ${{ secrets.IOS_MATCH_REPO_SSH_KEY_BASE64 }}
       IOS_GOOGLE_MAPS_API_KEY: ${{ secrets.IOS_GOOGLE_MAPS_API_KEY }}
     needs: get-version
diff --git a/.gitea/workflows/workflow_build-app-ios.yaml b/.gitea/workflows/workflow_build-app-ios.yaml
index db4ca59..6384c86 100644
--- a/.gitea/workflows/workflow_build-app-ios.yaml
+++ b/.gitea/workflows/workflow_build-app-ios.yaml
@@ -10,17 +10,15 @@ on:
         required: true
         type: string
     secrets:
-      MATCH_REPO_SSH_KEY:
-        required: true
-      GOOGLE_MAPS_API_KEY:
-        required: true
       IOS_ASC_KEY_ID:
         required: true
       IOS_ASC_ISSUER_ID:
         required: true
       IOS_ASC_KEY:
         required: true
-      MATCH_PASSWORD:
+      IOS_MATCH_REPO_SSH_KEY_BASE64:
+        required: true
+      IOS_MATCH_PASSWORD:
         required: true
       IOS_GOOGLE_MAPS_API_KEY:
         required: true
@@ -76,7 +74,6 @@ jobs:
         env:
           BUILD_NUMBER: ${{ gitea.run_number }}
           BUILD_NAME: ${{ inputs.build_name }}
-          GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
           IOS_ASC_KEY_ID: ${{ secrets.IOS_ASC_KEY_ID }}
           IOS_ASC_ISSUER_ID: ${{ secrets.IOS_ASC_ISSUER_ID }}
           IOS_ASC_KEY: ${{ secrets.IOS_ASC_KEY }}