diff --git a/e2e/bitrise.yml b/e2e/bitrise.yml
index a91853f..3513cf9 100644
--- a/e2e/bitrise.yml
+++ b/e2e/bitrise.yml
@@ -12,10 +12,12 @@ app:
     - BITRISE_KEYCHAIN_PATH: $HOME/Library/Keychains/login.keychain
     # Shared secrets
     - BITRISE_KEYCHAIN_PASSWORD: $BITRISE_KEYCHAIN_PASSWORD
-    - APPLE_CERTIFICATE_URL_LIST: $APPLE_CERTIFICATE_URL_LIST
-    - APPLE_CERTIFICATE_PASSHRASE_LIST: $APPLE_CERTIFICATE_PASSHRASE_LIST
-    - APPSTORECONNECT_API_KEY_URL: $APPSTORECONNECT_API_KEY_URL
-    - APPSTORECONNECT_API_KEY_ISSUER: $APPSTORECONNECT_API_KEY_ISSUER
+    - BITFALL_APPLE_APPLE_CERTIFICATE_URL_LIST: $BITFALL_APPLE_APPLE_CERTIFICATE_URL_LIST
+    - BITFALL_APPLE_IOS_CERTIFICATE_URL_LIST: $BITFALL_APPLE_IOS_CERTIFICATE_URL_LIST
+    - BITFALL_APPLE_APPLE_CERTIFICATE_PASSPHRASE_LIST: $BITFALL_APPLE_APPLE_CERTIFICATE_PASSPHRASE_LIST
+    - BITFALL_APPLE_IOS_CERTIFICATE_PASSPHRASE_LIST: $BITFALL_APPLE_IOS_CERTIFICATE_PASSPHRASE_LIST
+    - BITFALL_APPSTORECONNECT_API_KEY_URL: $BITFALL_APPSTORECONNECT_API_KEY_URL
+    - BITFALL_APPSTORECONNECT_API_KEY_ISSUER_ID: $BITFALL_APPSTORECONNECT_API_KEY_ISSUER_ID
     - ITUNES_CONNECT_APP_SPECIFIC_PASSWORD: $ITUNES_CONNECT_APP_SPECIFIC_PASSWORD
     - ITUNES_CONNECT_TEAM_ID: $ITUNES_CONNECT_TEAM_ID
     - ITUNES_CONNECT_APP_ID: $ITUNES_CONNECT_APP_ID
@@ -93,8 +95,8 @@ workflows:
     title: Test API key Step Input authentication
     envs:
       - CONNECTION: "off"
-      - API_KEY_URL: $APPSTORECONNECT_API_KEY_URL
-      - API_KEY_ISSUER: $APPSTORECONNECT_API_KEY_ISSUER
+      - API_KEY_URL: $BITFALL_APPSTORECONNECT_API_KEY_URL
+      - API_KEY_ISSUER: $BITFALL_APPSTORECONNECT_API_KEY_ISSUER_ID
       - APP_SPECIFIC_PASSWORD: ""
       - TEAM_ID: ""
       - APP_ID: $ITUNES_CONNECT_APP_ID
@@ -130,10 +132,10 @@ workflows:
             - distribution_type: app-store
             - generate_profiles: "yes"
             - scheme: $BITRISE_SCHEME
-            - api_key_path: $APPSTORECONNECT_API_KEY_URL
-            - api_issuer: $APPSTORECONNECT_API_KEY_ISSUER
-            - certificate_urls: $APPLE_CERTIFICATE_URL_LIST
-            - passphrases: $APPLE_CERTIFICATE_PASSHRASE_LIST
+            - api_key_path: $BITFALL_APPSTORECONNECT_API_KEY_URL
+            - api_issuer: $BITFALL_APPSTORECONNECT_API_KEY_ISSUER_ID
+            - certificate_urls: $BITFALL_APPLE_APPLE_CERTIFICATE_URL_LIST|$BITFALL_APPLE_IOS_CERTIFICATE_URL_LIST
+            - passphrases: $BITFALL_APPLE_APPLE_CERTIFICATE_PASSPHRASE_LIST|$BITFALL_APPLE_IOS_CERTIFICATE_PASSPHRASE_LIST
             - keychain_path: $BITRISE_KEYCHAIN_PATH
             - keychain_password: $BITRISE_KEYCHAIN_PASSWORD
       - script: