diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 45c86f4595..d862847e85 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -177,8 +177,43 @@ private_lane :build_release do |options|
 end
 
 private_lane :build_alpha do |options|
-  sync_signing_alpha(options)
+  # Workaround for match + gym failing at build phase https://forums.swift.org/t/xcode-14-beta-code-signing-issues-when-spm-targets-include-resources/59685/32
+  if is_ci
+    configurations = [
+      {
+        targets: ["DuckDuckGo"],
+        profile_name: "match AdHoc com.duckduckgo.mobile.ios.alpha"
+      },
+      {
+        targets: ["ShareExtension"],
+        profile_name: "match AdHoc com.duckduckgo.mobile.ios.alpha.ShareExtension"
+      },
+      {
+        targets: ["OpenAction"],
+        profile_name: "match AdHoc com.duckduckgo.mobile.ios.alpha.OpenAction2"
+      },
+      {
+        targets: ["WidgetsExtension"],
+        profile_name: "match AdHoc com.duckduckgo.mobile.ios.alpha.Widgets"
+      },
+      {
+        targets: ["PacketTunnelProvider"],
+        profile_name: "match AdHoc com.duckduckgo.mobile.ios.alpha.NetworkExtension"
+      }
+    ]
 
+    configurations.each do |config|
+      update_code_signing_settings(
+        use_automatic_signing: false,
+        build_configurations: ["Alpha"],
+        code_sign_identity: "iPhone Distribution",
+        **config
+      )
+    end
+  end
+
+  sync_signing_alpha(options)
+  
   build_app(
     export_method: "app-store",
     configuration: "Alpha",
diff --git a/fastlane/Matchfile b/fastlane/Matchfile
index 218469b18a..c20fafeb23 100644
--- a/fastlane/Matchfile
+++ b/fastlane/Matchfile
@@ -4,17 +4,10 @@ git_branch "ios"
 platform "ios"
 
 type "appstore"
+app_identifier ["com.duckduckgo.mobile.ios", "com.duckduckgo.mobile.ios.ShareExtension", "com.duckduckgo.mobile.ios.OpenAction2", "com.duckduckgo.mobile.ios.Widgets", "com.duckduckgo.mobile.ios.NetworkExtension"]
 generate_apple_certs false
 template_name "Default Web Browser iOS (Dist)"
 
-for_lane :sync_signing do
-    app_identifier ["com.duckduckgo.mobile.ios", "com.duckduckgo.mobile.ios.ShareExtension", "com.duckduckgo.mobile.ios.OpenAction2", "com.duckduckgo.mobile.ios.Widgets", "com.duckduckgo.mobile.ios.NetworkExtension"]
-end
-
-for_lane :build_release do
-    app_identifier ["com.duckduckgo.mobile.ios", "com.duckduckgo.mobile.ios.ShareExtension", "com.duckduckgo.mobile.ios.OpenAction2", "com.duckduckgo.mobile.ios.Widgets", "com.duckduckgo.mobile.ios.NetworkExtension"]
-end
-
 for_lane :sync_signing_adhoc do
     type "adhoc"
     force_for_new_devices true
@@ -32,3 +25,8 @@ end
 for_lane :build_alpha do
     app_identifier ["com.duckduckgo.mobile.ios.alpha", "com.duckduckgo.mobile.ios.alpha.ShareExtension", "com.duckduckgo.mobile.ios.alpha.OpenAction2", "com.duckduckgo.mobile.ios.alpha.Widgets", "com.duckduckgo.mobile.ios.alpha.NetworkExtension"]
 end
+
+for_lane :alpha do
+    type "appstore"
+    app_identifier ["com.duckduckgo.mobile.ios.alpha", "com.duckduckgo.mobile.ios.alpha.ShareExtension", "com.duckduckgo.mobile.ios.alpha.OpenAction2", "com.duckduckgo.mobile.ios.alpha.Widgets", "com.duckduckgo.mobile.ios.alpha.NetworkExtension"]
+end