diff --git a/.github/workflows/deploy_appstore.yml b/.github/workflows/deploy_appstore.yml
index 020b88c1b4..59329f3951 100644
--- a/.github/workflows/deploy_appstore.yml
+++ b/.github/workflows/deploy_appstore.yml
@@ -41,14 +41,19 @@ jobs:
           lane: release
         env:
           BUILD_NUMBER: ${{ github.run_number }}
+          APP_STORE_CONNECT_TEAM_ID: ${{ secrets.APP_STORE_CONNECT_TEAM_ID }}
           APP_ID: ${{ secrets.APP_ID }}
+          APP_IDENTIFIER_RELEASE: ${{ secrets.APP_IDENTIFIER_RELEASE }}
+          DEVELOPER_PORTAL_TEAM_ID: ${{ secrets.DEVELOPER_PORTAL_TEAM_ID }}
+          FASTLANE_APPLE_ID: ${{ secrets.FASTLANE_APPLE_ID }}
+          FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }}
+          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           GIT_AUTHORIZATION: ${{ secrets.GIT_AUTHORIZATION }}
-          TEMP_KEYCHAIN_USER: ${{ secrets.TEMP_KEYCHAIN_USER }}
           TEMP_KEYCHAIN_PASSWORD: ${{ secrets.TEMP_KEYCHAIN_PASSWORD }}
-          APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
+          TEMP_KEYCHAIN_USER: ${{ secrets.TEMP_KEYCHAIN_USER }}
           APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }}
+          APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
           APPLE_KEY_CONTENT: ${{ secrets.APPLE_KEY_CONTENT }}
-          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
 
           XCCONFIG_PROD_INFURA_PROJECT_ID: ${{ secrets.XCCONFIG_PROD_INFURA_PROJECT_ID }}
           XCCONFIG_PROD_INFURA_PROJECT_SECRET: ${{ secrets.XCCONFIG_PROD_INFURA_PROJECT_SECRET }}
diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml
index 5ca75cb13a..dd16cf8969 100644
--- a/.github/workflows/deploy_dev.yml
+++ b/.github/workflows/deploy_dev.yml
@@ -41,15 +41,20 @@ jobs:
           lane: dev
         env:
           BUILD_NUMBER: ${{ github.run_number }}
+          APP_STORE_CONNECT_TEAM_ID: ${{ secrets.APP_STORE_CONNECT_TEAM_ID }}
           APP_ID: ${{ secrets.APP_ID }}
+          APP_IDENTIFIER_DEV: ${{ secrets.APP_IDENTIFIER_DEV }}
+          DEVELOPER_PORTAL_TEAM_ID: ${{ secrets.DEVELOPER_PORTAL_TEAM_ID }}
+          FASTLANE_APPLE_ID: ${{ secrets.FASTLANE_APPLE_ID }}
+          FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }}
+          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
           GIT_AUTHORIZATION: ${{ secrets.GIT_AUTHORIZATION }}
-          TEMP_KEYCHAIN_USER: ${{ secrets.TEMP_KEYCHAIN_USER }}
           TEMP_KEYCHAIN_PASSWORD: ${{ secrets.TEMP_KEYCHAIN_PASSWORD }}
-          APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
+          TEMP_KEYCHAIN_USER: ${{ secrets.TEMP_KEYCHAIN_USER }}
           APPLE_KEY_ID: ${{ secrets.APPLE_KEY_ID }}
+          APPLE_ISSUER_ID: ${{ secrets.APPLE_ISSUER_ID }}
           APPLE_KEY_CONTENT: ${{ secrets.APPLE_KEY_CONTENT }}
           APP_CENTER_API_TOKEN: ${{ secrets.APP_CENTER_API_TOKEN }}
-          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
 
           XCCONFIG_DEV_INFURA_PROJECT_ID: ${{ secrets.XCCONFIG_DEV_INFURA_PROJECT_ID }}
           XCCONFIG_DEV_INFURA_PROJECT_SECRET: ${{ secrets.XCCONFIG_DEV_INFURA_PROJECT_SECRET }}
diff --git a/fastlane/Appfile b/fastlane/Appfile
new file mode 100644
index 0000000000..fb1c02293e
--- /dev/null
+++ b/fastlane/Appfile
@@ -0,0 +1,14 @@
+for_platform :ios do
+  for_lane :dev do
+    app_identifier(ENV["APP_IDENTIFIER_DEV"])
+  end
+
+  for_lane :release do
+    app_identifier(ENV["APP_IDENTIFIER_RELEASE"])
+  end
+end
+
+apple_id(ENV["FASTLANE_APPLE_ID"])
+
+itc_team_id(ENV["APP_STORE_CONNECT_TEAM_ID"])
+team_id(ENV["DEVELOPER_PORTAL_TEAM_ID"])