diff --git a/bitrise.yml b/bitrise.yml
index 2b29055..ee7c429 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -14,8 +14,10 @@ trigger_map:
     workflow: deploy
   - pull_request_source_branch: "*"
     workflow: test
-  - tag: "*"
-    workflow: deploy
+  - tag: "ios-v*"
+    workflow: deploy_ios
+  - tag: "android-v*"
+    workflow: deploy_android
 
 workflows:
   # ── Shared setup ──────────────────────────────────────────
@@ -66,6 +68,59 @@ workflows:
             - module: app
             - variant: debug
 
+  # ── iOS test / PR build (simulator) ──────────────────────
+  test_ios:
+    before_run:
+      - _setup
+    steps:
+      - script@1:
+          title: Sync iOS native project
+          inputs:
+            - content: |
+                #!/bin/bash
+                set -ex
+                npx cap sync ios
+      - cocoapods-install@2:
+          inputs:
+            - podfile_path: ios/App/Podfile
+      - xcode-archive@4:
+          title: Build iOS (simulator)
+          inputs:
+            - project_path: ios/App/App.xcodeproj
+            - scheme: App
+            - configuration: Debug
+            - destination: generic/platform=iOS Simulator
+            - output_tool: xcodebuild
+            - cache_level: swift
+
+  # ── iOS deploy ───────────────────────────────────────────
+  deploy_ios:
+    before_run:
+      - _setup
+    steps:
+      - script@1:
+          title: Sync iOS native project
+          inputs:
+            - content: |
+                #!/bin/bash
+                set -ex
+                npx cap sync ios
+      - cocoapods-install@2:
+          inputs:
+            - podfile_path: ios/App/Podfile
+      - certificate-and-profile-installer@1: {}
+      - xcode-archive@4:
+          title: Archive iOS (release)
+          inputs:
+            - project_path: ios/App/App.xcodeproj
+            - scheme: App
+            - configuration: Release
+            - destination: generic/platform=iOS
+            - output_tool: xcodebuild
+            - export_method: app-store
+            - cache_level: swift
+      - deploy-to-bitrise-io@2: {}
+
   # ── Android deploy ───────────────────────────────────────
   deploy_android:
     before_run:
@@ -96,57 +151,7 @@ workflows:
             - variant: release
       - deploy-to-bitrise-io@2: {}
 
-  # ── iOS test / PR build ─────────────────────────────────
-  test_ios:
-    before_run:
-      - _setup
-    steps:
-      - script@1:
-          title: Sync iOS native project
-          inputs:
-            - content: |
-                #!/bin/bash
-                set -ex
-                npx cap sync ios
-      - cocoapods-install@2:
-          inputs:
-            - podfile_path: ios/App/Podfile
-      - xcode-archive@4:
-          title: Build iOS (simulator)
-          inputs:
-            - project_path: ios/App/App.xcodeproj
-            - scheme: App
-            - configuration: Debug
-            - destination: platform=iOS Simulator,name=iPhone 15,OS=latest
-            - output_tool: xcodebuild
-
-  # ── iOS deploy ───────────────────────────────────────────
-  deploy_ios:
-    before_run:
-      - _setup
-    steps:
-      - script@1:
-          title: Sync iOS native project
-          inputs:
-            - content: |
-                #!/bin/bash
-                set -ex
-                npx cap sync ios
-      - cocoapods-install@2:
-          inputs:
-            - podfile_path: ios/App/Podfile
-      - xcode-archive@4:
-          title: Archive iOS (release)
-          inputs:
-            - project_path: ios/App/App.xcodeproj
-            - scheme: App
-            - configuration: Release
-            - destination: generic/platform=iOS
-            - output_tool: xcodebuild
-            - export_method: app-store
-      - deploy-to-bitrise-io@2: {}
-
-  # ── Full deploy (both platforms) ─────────────────────────
+  # ── Combined deploy (default branch push) ────────────────
   deploy:
     before_run:
       - _setup
@@ -186,6 +191,7 @@ workflows:
       - cocoapods-install@2:
           inputs:
             - podfile_path: ios/App/Podfile
+      - certificate-and-profile-installer@1: {}
       - xcode-archive@4:
           title: Archive iOS (release)
           inputs:
@@ -195,4 +201,5 @@ workflows:
             - destination: generic/platform=iOS
             - output_tool: xcodebuild
             - export_method: app-store
-      - deploy-to-bitrise-io@2: {}
+            - cache_level: swift
+      - deploy-to-bitrise-io@2: {}
\ No newline at end of file