diff --git a/.env.Showcase b/.env.Showcase
index 9a34f57e3..d15a1ba0e 100644
--- a/.env.Showcase
+++ b/.env.Showcase
@@ -1,4 +1,4 @@
 SCHEME = "Showcase" 
 APP_IDENTIFIER = "com.walletconnect.chat" 
-APPLE_ID = "1634760092"
-PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.walletconnect.chat"
\ No newline at end of file
+MATCH_IDENTIFIERS = "com.walletconnect.chat"
+APPLE_ID = "1634760092"
\ No newline at end of file
diff --git a/.env.WalletApp b/.env.WalletApp
index d5954a7f6..18924e39f 100644
--- a/.env.WalletApp
+++ b/.env.WalletApp
@@ -1,4 +1,4 @@
 SCHEME = "WalletApp" 
 APP_IDENTIFIER = "com.walletconnect.walletapp" 
-APPLE_ID = "1667351690"
-PROVISIONING_PROFILE_SPECIFIER = "match AppStore com.walletconnect.walletapp"
\ No newline at end of file
+MATCH_IDENTIFIERS = "com.walletconnect.chat,com.walletconnect.walletapp.PNDecryptionService"
+APPLE_ID = "1667351690"
\ No newline at end of file
diff --git a/Example/ExampleApp.xcodeproj/project.pbxproj b/Example/ExampleApp.xcodeproj/project.pbxproj
index 4bef61689..603c2e024 100644
--- a/Example/ExampleApp.xcodeproj/project.pbxproj
+++ b/Example/ExampleApp.xcodeproj/project.pbxproj
@@ -2704,10 +2704,10 @@
 					"@executable_path/../../Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.walletconnect.walletapp;
+				PRODUCT_BUNDLE_IDENTIFIER = com.walletconnect.walletapp.PNDecryptionService;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.walletconnect.walletapp";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development com.walletconnect.walletapp.PNDecryptionService";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
@@ -2737,10 +2737,10 @@
 					"@executable_path/../../Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.walletconnect.walletapp;
+				PRODUCT_BUNDLE_IDENTIFIER = com.walletconnect.walletapp.PNDecryptionService;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.walletconnect.walletapp";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.walletconnect.walletapp.PNDecryptionService";
 				SKIP_INSTALL = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 69cc0127f..aac915608 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -62,7 +62,7 @@ platform :ios do
     match(
       readonly: false,
       type: "appstore",
-      app_identifier: ENV["APP_IDENTIFIER"],
+      app_identifier: ENV["MATCH_IDENTIFIERS"],
       git_url: "https://github.com/WalletConnect/match-swift.git",
       git_basic_authorization: options[:token],
       api_key: api_key
@@ -80,11 +80,6 @@ platform :ios do
       project: "Example/ExampleApp.xcodeproj",
       scheme: ENV["SCHEME"],
       export_method: "app-store",
-      export_options: {
-        provisioningProfiles: { 
-            ENV["APP_IDENTIFIER"] => ENV["PROVISIONING_PROFILE_SPECIFIER"]
-        }
-      }
     )
     upload_to_testflight(
       apple_id: ENV["APPLE_ID"],