diff --git a/BroadcastUploadExtension/Common.xcconfig b/BroadcastUploadExtension/Common.xcconfig
index b08841548..df4460eef 100644
--- a/BroadcastUploadExtension/Common.xcconfig
+++ b/BroadcastUploadExtension/Common.xcconfig
@@ -21,15 +21,10 @@
 #include "Config/AppVersion.xcconfig"
 
 PRODUCT_NAME = BroadcastUploadExtension
-PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).broadcastUploadExtension
+PRODUCT_BUNDLE_IDENTIFIER = $(BROADCAST_UPLOAD_EXTENSION_BUNDLE_IDENTIFIER)
 
 INFOPLIST_FILE = BroadcastUploadExtension/SupportingFiles/Info.plist
-ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
 
 CODE_SIGN_ENTITLEMENTS = BroadcastUploadExtension/SupportingFiles/BroadcastUploadExtension.entitlements
         
-APPLICATION_EXTENSION_API_ONLY = YES
 SKIP_INSTALL = YES
-LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks
-
-SWIFT_OBJC_INTERFACE_HEADER_NAME = GeneratedInterface-Swift.h
diff --git a/BroadcastUploadExtension/Release.xcconfig b/BroadcastUploadExtension/Release.xcconfig
index 45d0bb011..63f7005bb 100644
--- a/BroadcastUploadExtension/Release.xcconfig
+++ b/BroadcastUploadExtension/Release.xcconfig
@@ -20,7 +20,7 @@
 #include "Common.xcconfig"
 
 // Add the provisioning profiles when they are made
-// PROVISIONING_PROFILE = $(SHARE_EXTENSION_PROVISIONING_PROFILE)
-// PROVISIONING_PROFILE_SPECIFIER = $(SHARE_EXTENSION_PROVISIONING_PROFILE_SPECIFIER)
+ PROVISIONING_PROFILE = $(BROADCAST_UPLOAD_EXTENSION_PROVISIONING_PROFILE)
+ PROVISIONING_PROFILE_SPECIFIER = $(BROADCAST_UPLOAD_EXTENSION_PROVISIONING_PROFILE_SPECIFIER)
 
 COPY_PHASE_STRIP = NO
diff --git a/BroadcastUploadExtension/target.yml b/BroadcastUploadExtension/target.yml
index 404691e23..1ef21b6b3 100644
--- a/BroadcastUploadExtension/target.yml
+++ b/BroadcastUploadExtension/target.yml
@@ -38,3 +38,5 @@ targets:
     sources:
     - path: .
     - path: ../Config/BuildSettings.swift
+    - path: ../Riot/Categories/Bundle.swift
+    - path: ../Riot/Modules/Room/TimelineCells/Styles/RoomTimelineStyleIdentifier.swift
diff --git a/Config/AppIdentifiers.xcconfig b/Config/AppIdentifiers.xcconfig
index a55dc348f..3dedb84e3 100644
--- a/Config/AppIdentifiers.xcconfig
+++ b/Config/AppIdentifiers.xcconfig
@@ -37,3 +37,6 @@ SHARE_EXTENSION_PROVISIONING_PROFILE = 8c797ca0-0440-49bd-be8d-11d761152995
 
 SIRI_INTENTS_PROVISIONING_PROFILE_SPECIFIER = "Vector Siri Intents: App Store"
 SIRI_INTENTS_PROVISIONING_PROFILE = 1690e81a-5ad3-4d99-b578-02693579be71
+
+BROADCAST_UPLOAD_EXTENSION_PROVISIONING_PROFILE_SPECIFIER = "Vector Broadcast Upload Extension: App Store"
+BROADCAST_UPLOAD_EXTENSION_PROVISIONING_PROFILE = c86239f4-0d3a-47f4-a5f2-9f4763c42b5d
diff --git a/Config/Project.xcconfig b/Config/Project.xcconfig
index 95b6295d6..bbca50a1b 100644
--- a/Config/Project.xcconfig
+++ b/Config/Project.xcconfig
@@ -23,6 +23,7 @@
 
 // Application constants
 KEYCHAIN_ACCESS_GROUP = $(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER).keychain.shared
+BROADCAST_UPLOAD_EXTENSION_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).broadcastUploadExtension
 
 // Build settings
 IPHONEOS_DEPLOYMENT_TARGET = 14.0
diff --git a/Riot/SupportingFiles/Info.plist b/Riot/SupportingFiles/Info.plist
index be0ad4085..e1ed4aff1 100644
--- a/Riot/SupportingFiles/Info.plist
+++ b/Riot/SupportingFiles/Info.plist
@@ -6,6 +6,8 @@
 	<string>en</string>
 	<key>RTCAppGroupIdentifier</key>
 	<string>$(APPLICATION_GROUP_IDENTIFIER)</string>
+	<key>RTCScreenSharingExtension</key>
+	<string>$(BROADCAST_UPLOAD_EXTENSION_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleDisplayName</key>
 	<string>$(BUNDLE_DISPLAY_NAME)</string>
 	<key>CFBundleDocumentTypes</key>
diff --git a/Riot/target.yml b/Riot/target.yml
index 8cd537cd3..8139be715 100644
--- a/Riot/target.yml
+++ b/Riot/target.yml
@@ -37,6 +37,7 @@ targets:
     - target: RiotShareExtension
     - target: SiriIntents
     - target: RiotNSE
+    - target: BroadcastUploadExtension
     - target: DesignKit
     - target: CommonKit
     - package: AnalyticsEvents