diff --git a/Config/BuM-Beta/BuildSettings.swift b/Config/BuM-Beta/BuildSettings.swift
index 2e2581bba..63a03547e 100644
--- a/Config/BuM-Beta/BuildSettings.swift
+++ b/Config/BuM-Beta/BuildSettings.swift
@@ -17,10 +17,6 @@
 
 import Foundation
 
-#if LOCATION
-import Keys
-#endif
-
 /// BuildSettings provides settings computed at build time.
 /// In future, it may be automatically generated from xcconfig files
 @objcMembers
@@ -556,17 +552,5 @@ final class BuildSettings: NSObject {
     static let tileServerMapStyleURL = URL(string: "https://map.tyler.org")!
 
     static let locationSharingEnabled = false
-    
-    static var liveLocationSharingEnabled: Bool {
-        guard #available(iOS 14, *) else {
-            return false
-        }
-        
-        guard self.locationSharingEnabled else {
-            return false
-        }
-        
-        // Do not enable live location sharing atm
-        return false
-    }
+    static var liveLocationSharingEnabled = false
 }
diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift
index 4271e36e5..7bb856006 100644
--- a/Config/BuildSettings.swift
+++ b/Config/BuildSettings.swift
@@ -17,10 +17,6 @@
 
 import Foundation
 
-#if LOCATION
-import Keys
-#endif
-
 /// BuildSettings provides settings computed at build time.
 /// In future, it may be automatically generated from xcconfig files
 @objcMembers
@@ -551,21 +547,8 @@ final class BuildSettings: NSObject {
     
     // MARK: - Location Sharing
 
-    static let tileServerMapURL = ""
-    static let tileServerMapStyleURL = URL(string: "https://map.tyler.org")!
+    static let tileServerMapStyleURL = URL(string: "https://map.sty.le/style.json")!
 
     static let locationSharingEnabled = false
-    
-    static var liveLocationSharingEnabled: Bool {
-        guard #available(iOS 14, *) else {
-            return false
-        }
-        
-        guard self.locationSharingEnabled else {
-            return false
-        }
-        
-        // Do not enable live location sharing atm
-        return false
-    }
+    static var liveLocationSharingEnabled = false
 }
diff --git a/Riot/Modules/Application/AppCoordinator.swift b/Riot/Modules/Application/AppCoordinator.swift
index 5e3a288be..6172b095a 100755
--- a/Riot/Modules/Application/AppCoordinator.swift
+++ b/Riot/Modules/Application/AppCoordinator.swift
@@ -88,10 +88,8 @@ final class AppCoordinator: NSObject, AppCoordinatorType {
         // Setup navigation router store
         _ = NavigationRouterStore.shared
         
-    #if LOCATION
         // Setup user location services
         _ = UserLocationServiceProvider.shared
-    #endif
         
         if BuildSettings.enableSideMenu {
             self.addSideMenu()
diff --git a/Riot/Modules/Room/Location/LocationUserMarkerView.swift b/Riot/Modules/Room/Location/LocationUserMarkerView.swift
deleted file mode 100644
index 7fcadd3fb..000000000
--- a/Riot/Modules/Room/Location/LocationUserMarkerView.swift
+++ /dev/null
@@ -1,48 +0,0 @@
-// File created from SimpleUserProfileExample
-// $ createScreen.sh Room/UserSuggestion UserSuggestion
-// 
-// Copyright 2021 New Vector Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import UIKit
-import Reusable
-import Mapbox
-
-<<<<<<< HEAD:Riot/Modules/Room/Location/LocationUserMarkerView.swift
-class LocationUserMarkerView: MGLAnnotationView, NibLoadable {
-    
-    @IBOutlet private var avatarView: UserAvatarView!
-    
-    override func awakeFromNib() {
-        super.awakeFromNib()
-        translatesAutoresizingMaskIntoConstraints = false
-    }
-    
-    func setAvatarData(_ avatarData: AvatarViewDataProtocol) {
-        avatarView.fill(with: avatarData)
-    }
-=======
-
-/// Bubble style room cell layout constants
-@objcMembers
-final class BubbleRoomCellLayoutConstants: NSObject {
-    
-    static let outgoingBubbleBackgroundMargins: UIEdgeInsets = UIEdgeInsets(top: 0, left: 80, bottom: 0, right: 34)
-
-    static let incomingBubbleBackgroundMargins: UIEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 80)
-    
-    static let threadSummaryViewMargins: UIEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 5, right: 0)
->>>>>>> 6898f51dbcdf5d9940da07aaf4174014cc84addc:Riot/Modules/Room/Views/BubbleCells/Styles/Bubble/BubbleRoomCellLayoutConstants.swift
-}
diff --git a/Riot/Modules/Room/Location/LocationUserMarkerView.xib b/Riot/Modules/Room/Location/LocationUserMarkerView.xib
deleted file mode 100644
index 26495f925..000000000
--- a/Riot/Modules/Room/Location/LocationUserMarkerView.xib
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="LocationUserMarkerView" customModule="Riot" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="50" height="54"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="location_user_marker" translatesAutoresizingMaskIntoConstraints="NO" id="ldO-kc-R5W">
-                    <rect key="frame" x="0.0" y="0.0" width="50" height="54"/>
-                </imageView>
-                <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qut-wn-BX3" customClass="UserAvatarView" customModule="Riot" customModuleProvider="target">
-                    <rect key="frame" x="2" y="2" width="46" height="46"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                </view>
-            </subviews>
-            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
-            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-            <constraints>
-                <constraint firstItem="ldO-kc-R5W" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="VF5-CP-8eH"/>
-                <constraint firstItem="ldO-kc-R5W" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Voc-LH-fTw"/>
-                <constraint firstAttribute="trailing" secondItem="ldO-kc-R5W" secondAttribute="trailing" id="Vt0-UN-s20"/>
-                <constraint firstAttribute="bottom" secondItem="ldO-kc-R5W" secondAttribute="bottom" id="Ybf-8x-UaG"/>
-            </constraints>
-            <nil key="simulatedTopBarMetrics"/>
-            <nil key="simulatedBottomBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <connections>
-                <outlet property="avatarView" destination="qut-wn-BX3" id="wHA-bz-A2y"/>
-            </connections>
-            <point key="canvasLocation" x="-84.057971014492765" y="-80.357142857142847"/>
-        </view>
-    </objects>
-    <resources>
-        <image name="location_user_marker" width="51" height="54.5"/>
-    </resources>
-</document>
diff --git a/Riot/Modules/Room/Location/RoomTimelineLocationView.swift b/Riot/Modules/Room/Location/RoomTimelineLocationView.swift
index cd290a412..f8928704e 100644
--- a/Riot/Modules/Room/Location/RoomTimelineLocationView.swift
+++ b/Riot/Modules/Room/Location/RoomTimelineLocationView.swift
@@ -80,7 +80,7 @@ class RoomTimelineLocationView: UIView, NibLoadable, Themable, MGLMapViewDelegat
     
     private struct Constants {
         static let mapHeight: CGFloat = 300.0
-        static let mapZoomLevel = 15.0
+        static let mapZoomLevel = 13.0
         static let cellBorderRadius: CGFloat = 1.0
         static let cellCornerRadius: CGFloat = 8.0
     }
diff --git a/Riot/Modules/Room/Location/RoomTimelineLocationView.xib b/Riot/Modules/Room/Location/RoomTimelineLocationView.xib
index 37e52c8c1..5a54ff73c 100644
--- a/Riot/Modules/Room/Location/RoomTimelineLocationView.xib
+++ b/Riot/Modules/Room/Location/RoomTimelineLocationView.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -30,7 +30,7 @@
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HzR-Av-TiG">
                             <rect key="frame" x="0.0" y="0.0" width="395" height="20"/>
                             <subviews>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" insetsLayoutMarginsFromSafeArea="NO" text="©MapTiler ©OpenStreetMap contributors" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jWW-0w-1YM">
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" insetsLayoutMarginsFromSafeArea="NO" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jWW-0w-1YM">
                                     <rect key="frame" x="8" y="0.0" width="379" height="20"/>
                                     <edgeInsets key="layoutMargins" top="0.0" left="0.0" bottom="0.0" right="0.0"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="10"/>
diff --git a/Riot/Modules/Room/RoomCoordinator.swift b/Riot/Modules/Room/RoomCoordinator.swift
index 98cc9fff7..131a9e23c 100644
--- a/Riot/Modules/Room/RoomCoordinator.swift
+++ b/Riot/Modules/Room/RoomCoordinator.swift
@@ -260,8 +260,6 @@ final class RoomCoordinator: NSObject, RoomCoordinatorProtocol {
     
     private func showLiveLocationViewer(for roomId: String) {
         
-        #if LOCATION
-        
         guard let mxSession = self.mxSession, let navigationRouter = self.navigationRouter else {
             return
         }
@@ -287,8 +285,6 @@ final class RoomCoordinator: NSObject, RoomCoordinatorProtocol {
         
         navigationRouter.present(coordinator, animated: true)
         coordinator.start()
-        
-        #endif
     }
     
     private func stopLiveLocationSharing(forBeaconInfoEventId beaconInfoEventId: String? = nil, inRoomWithId roomId: String) {
@@ -336,7 +332,6 @@ final class RoomCoordinator: NSObject, RoomCoordinatorProtocol {
     }
     
     private func showLocationCoordinatorWithEvent(_ event: MXEvent, bubbleData: MXKRoomBubbleCellDataStoring) {
-#if LOCATION
         guard #available(iOS 14.0, *) else {
             return
         }
@@ -363,7 +358,8 @@ final class RoomCoordinator: NSObject, RoomCoordinatorProtocol {
         let parameters = StaticLocationViewingCoordinatorParameters(mediaManager: mediaManager,
                                                                     avatarData: avatarData,
                                                                     location: location,
-                                                                    coordinateType: locationSharingCoordinatetype)
+                                                                    coordinateType: locationSharingCoordinatetype,
+                                                                    mxSession: mxSession)
         
         let coordinator = StaticLocationViewingCoordinator(parameters: parameters)
         
@@ -380,15 +376,12 @@ final class RoomCoordinator: NSObject, RoomCoordinatorProtocol {
         
         navigationRouter.present(coordinator, animated: true)
         coordinator.start()
-#endif
     }
 
     private func startLocationCoordinator() {
         guard #available(iOS 14.0, *) else {
             return
         }
-#if LOCATION
-        
         
         guard let navigationRouter = self.navigationRouter,
               let mediaManager = mxSession?.mediaManager,
@@ -420,8 +413,6 @@ final class RoomCoordinator: NSObject, RoomCoordinatorProtocol {
         
         navigationRouter.present(coordinator, animated: true)
         coordinator.start()
-        
-#endif
     }
     
     private func startEditPollCoordinator(startEvent: MXEvent? = nil) {
@@ -568,11 +559,8 @@ extension RoomCoordinator: RoomViewControllerDelegate {
         guard let location = event.location else {
             return nil
         }
-        #if LOCATION
         return LocationSharingCoordinator.shareLocationActivityController(CLLocationCoordinate2D(latitude: location.latitude, longitude: location.longitude))
-        #else
         return nil
-        #endif
     }
     
     func roomViewController(_ roomViewController: RoomViewController, canEndPollWithEventIdentifier eventIdentifier: String) -> Bool {
diff --git a/Riot/Modules/Room/RoomViewController+LocationSharing.swift b/Riot/Modules/Room/RoomViewController+LocationSharing.swift
index 710aa8a2d..ffc9bf57d 100644
--- a/Riot/Modules/Room/RoomViewController+LocationSharing.swift
+++ b/Riot/Modules/Room/RoomViewController+LocationSharing.swift
@@ -28,13 +28,10 @@ import Foundation
     }
     
     func hideLiveLocationBannerView() {
-#if LOCATION
         self.liveLocationSharingBannerView?.removeFromSuperview()
-#endif
     }
     
     func showLiveLocationBannerView() {
-#if LOCATION
         guard liveLocationSharingBannerView == nil else {
             return
         }
@@ -62,6 +59,5 @@ import Foundation
         self.topBannersStackView?.addArrangedSubview(bannerView)
 
         self.liveLocationSharingBannerView = bannerView
-#endif
     }
 }
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index 2f25a2dca..01fabeb11 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -489,9 +489,7 @@ static CGSize kThreadListBarButtonItemImageSize;
     
     [self updateThreadListBarButtonBadgeWith:self.mainSession.threadingService];
     
-#if LOCATION
     [self.liveLocationSharingBannerView updateWithTheme:ThemeService.shared.theme];
-#endif
     
     [self setNeedsStatusBarAppearanceUpdate];
 }
@@ -2979,7 +2977,6 @@ static CGSize kThreadListBarButtonItemImageSize;
             }
         }
     }
-#ifdef LOCATION
     else if (bubbleData.tag == RoomBubbleCellDataTagLocation || bubbleData.tag == RoomBubbleCellDataTagLiveLocation)
     {
         if (bubbleData.isIncoming)
@@ -3013,7 +3010,6 @@ static CGSize kThreadListBarButtonItemImageSize;
             }
         }
     }
-#endif
     else if (roomBubbleCellData.getFirstBubbleComponentWithDisplay.event.isEmote)
     {
         if (bubbleData.isIncoming)
diff --git a/Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m b/Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
index e3aaecb52..b10b02654 100644
--- a/Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
+++ b/Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
@@ -111,7 +111,6 @@
 
 - (void)registerLocationCellsForTableView:(UITableView*)tableView
 {
-#if LOCATION
     // Incoming
     [tableView registerClass:LocationIncomingBubbleCell.class forCellReuseIdentifier:LocationIncomingBubbleCell.defaultReuseIdentifier];
     [tableView registerClass:LocationIncomingWithoutSenderInfoBubbleCell.class forCellReuseIdentifier:LocationIncomingWithoutSenderInfoBubbleCell.defaultReuseIdentifier];
@@ -120,7 +119,6 @@
     // Outgoing
     [tableView registerClass:LocationOutgoingWithoutSenderInfoBubbleCell.class forCellReuseIdentifier:LocationOutgoingWithoutSenderInfoBubbleCell.defaultReuseIdentifier];
     [tableView registerClass:LocationOutgoingWithPaginationTitleBubbleCell.class forCellReuseIdentifier:LocationOutgoingWithPaginationTitleBubbleCell.defaultReuseIdentifier];
-#endif
 }
 
 - (void)registerFileWithoutThumbnailCellsForTableView:(UITableView*)tableView
@@ -285,7 +283,6 @@
 - (NSDictionary<NSNumber*, Class>*)locationCellsMapping
 {
     return @{
-#if LOCATION
         // Incoming
         @(RoomTimelineCellIdentifierIncomingLocation) : LocationIncomingBubbleCell.class,
         @(RoomTimelineCellIdentifierIncomingLocationWithoutSenderInfo) : LocationIncomingWithoutSenderInfoBubbleCell.class,
@@ -294,7 +291,6 @@
         @(RoomTimelineCellIdentifierOutgoingLocation) : LocationOutgoingWithoutSenderInfoBubbleCell.class,
         @(RoomTimelineCellIdentifierOutgoingLocationWithoutSenderInfo) : LocationOutgoingWithoutSenderInfoBubbleCell.class,
         @(RoomTimelineCellIdentifierOutgoingLocationWithPaginationTitle) : LocationOutgoingWithPaginationTitleBubbleCell.class
-#endif
     };
 }
 
diff --git a/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m b/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
index fdcc9fbb5..64b02c745 100644
--- a/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
+++ b/Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
@@ -257,11 +257,9 @@
 
 - (void)registerLocationCellsForTableView:(UITableView*)tableView
 {
-#if LOCATION
     [tableView registerClass:LocationPlainCell.class forCellReuseIdentifier:LocationPlainCell.defaultReuseIdentifier];
     [tableView registerClass:LocationWithoutSenderInfoPlainCell.class forCellReuseIdentifier:LocationWithoutSenderInfoPlainCell.defaultReuseIdentifier];
     [tableView registerClass:LocationWithPaginationTitlePlainCell.class forCellReuseIdentifier:LocationWithPaginationTitlePlainCell.defaultReuseIdentifier];
-#endif
 }
 
 #pragma mark Cell class association
@@ -536,7 +534,6 @@
 - (NSDictionary<NSNumber*, Class>*)locationCellsMapping
 {
     return @{
-#if LOCATION
         // Incoming
         @(RoomTimelineCellIdentifierIncomingLocation) : LocationPlainCell.class,
         @(RoomTimelineCellIdentifierIncomingLocationWithoutSenderInfo) : LocationWithoutSenderInfoPlainCell.class,
@@ -545,7 +542,6 @@
         @(RoomTimelineCellIdentifierOutgoingLocation) : LocationPlainCell.class,
         @(RoomTimelineCellIdentifierOutgoingLocationWithoutSenderInfo) : LocationWithoutSenderInfoPlainCell.class,
         @(RoomTimelineCellIdentifierOutgoingLocationWithPaginationTitle) : LocationWithPaginationTitlePlainCell.class
-#endif
     };
 }
 
diff --git a/Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift b/Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift
index dfb196fc8..f5a082d01 100644
--- a/Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift
+++ b/Riot/Modules/Spaces/SpaceRoomList/ExploreRoomCoordinator.swift
@@ -431,15 +431,12 @@ extension ExploreRoomCoordinator: RoomViewControllerDelegate {
     }
 
     func roomViewController(_ roomViewController: RoomViewController, locationShareActivityViewControllerFor event: MXEvent) -> UIActivityViewController? {
-#if LOCATION
         guard let location = event.location else {
             return nil
         }
         
         return LocationSharingCoordinator.shareLocationActivityController(CLLocationCoordinate2D(latitude: location.latitude, longitude: location.longitude))
-#else
         return nil
-#endif
     }
 
     func roomViewController(_ roomViewController: RoomViewController, canEditPollWithEventIdentifier eventIdentifier: String) -> Bool {
diff --git a/Riot/target-bum-beta.yml b/Riot/target-bum-beta.yml
index b0e8406cc..5ab51aab3 100644
--- a/Riot/target-bum-beta.yml
+++ b/Riot/target-bum-beta.yml
@@ -43,6 +43,7 @@ targets:
     - target: RiotNSE
     - target: DesignKit
     - target: CommonKit
+    - package: Mapbox
     - package: OrderedCollections
 
     configFiles:
@@ -66,9 +67,6 @@ targets:
       excludes:
       - "Common/Locale/LocaleProvider.swift"
       - "**/Test/**"
-      - "Room/LocationSharing/*"
-      - "Room/StaticLocationSharingViewer/*"
-      - "Room/LiveLocationSharingViewer/*"
     - path: ../Tools
       excludes:
         - "Logs"
@@ -85,13 +83,6 @@ targets:
         - "Modules/Room/EmojiPicker/Data/EmojiMart/EmojiJSONStore.swift"
         - "Modules/Analytics/Test/Unit/BWIAnalyticsTests.swift"
         - "**/*.strings" # Exclude all strings files
-        - "Modules/Room/TimelineCells/Styles/Plain/Cells/Location/*"
-        - "Modules/Room/TimelineCells/Styles/Bubble/Cells/Location/*"
-        - "Modules/Room/Location/*"
-        - "Modules/Room/LocationSharing/*"
-        - "Modules/Room/Views/BubbleCells/Location/*"
-        - "Modules/Room/Views/BubbleCells/Styles/Bubble/Cells/Location/*"
-        - "Modules/LocationSharing/*"
     - path: ../bwi
       excludes:
         - "Tests"
diff --git a/Riot/target-messenger.yml b/Riot/target-messenger.yml
index dccae4e1f..7b37df7be 100644
--- a/Riot/target-messenger.yml
+++ b/Riot/target-messenger.yml
@@ -43,6 +43,7 @@ targets:
     - target: RiotNSE
     - target: DesignKit
     - target: CommonKit
+    - package: Mapbox
     - package: OrderedCollections
 
     configFiles:
@@ -66,9 +67,6 @@ targets:
       excludes:
       - "Common/Locale/LocaleProvider.swift"
       - "**/Test/**"
-      - "Room/LocationSharing/*"
-      - "Room/StaticLocationSharingViewer/*"
-      - "Room/LiveLocationSharingViewer/*"
     - path: ../Tools
       excludes:
         - "Logs"
@@ -83,13 +81,6 @@ targets:
         - "Modules/Room/EmojiPicker/Data/EmojiMart/EmojiJSONStore.swift"
         - "Modules/Analytics/Test/Unit/BWIAnalyticsTests.swift"
         - "**/*.strings" # Exclude all strings files
-        - "Modules/Room/TimelineCells/Styles/Plain/Cells/Location/*"
-        - "Modules/Room/TimelineCells/Styles/Bubble/Cells/Location/*"
-        - "Modules/Room/Location/*"
-        - "Modules/Room/LocationSharing/*"
-        - "Modules/Room/Views/BubbleCells/Location/*"
-        - "Modules/Room/Views/BubbleCells/Styles/Bubble/Cells/Location/*"
-        - "Modules/LocationSharing/*"
     - path: ../bwi
       excludes:
         - "Tests"
diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/LocationSharingCoordinator.swift b/RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/LocationSharingCoordinator.swift
index b4e11f34e..d13cb97ce 100644
--- a/RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/LocationSharingCoordinator.swift
+++ b/RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/LocationSharingCoordinator.swift
@@ -80,7 +80,9 @@ final class LocationSharingCoordinator: Coordinator, Presentable {
         
         let locationSharingService = LocationSharingService(userLocationService: parameters.roomDataSource.mxSession.userLocationService)
         
-        let viewModel = LocationSharingViewModel(mapStyleURL: BuildSettings.tileServerMapStyleURL,
+        let tileServerMapStyleURL = parameters.roomDataSource.mxSession.vc_homeserverConfiguration().tileServer.mapStyleURL
+        
+        let viewModel = LocationSharingViewModel(mapStyleURL: tileServerMapStyleURL,
                                                  avatarData: parameters.avatarData,
                                                  isLiveLocationSharingEnabled: RiotSettings.shared.enableLiveLocationSharing, service: locationSharingService)
         let view = LocationSharingView(context: viewModel.context)
diff --git a/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingMapView.swift b/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingMapView.swift
index 8ad3ccceb..4ec7fe983 100644
--- a/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingMapView.swift
+++ b/RiotSwiftUI/Modules/Room/LocationSharing/View/LocationSharingMapView.swift
@@ -24,7 +24,7 @@ struct LocationSharingMapView: UIViewRepresentable {
     // MARK: - Constants
     
     private struct Constants {
-        static let mapZoomLevel = 15.0
+        static let mapZoomLevel = 13.0
     }
     
     // MARK: - Properties
@@ -86,6 +86,7 @@ struct LocationSharingMapView: UIViewRepresentable {
         if self.showsUserLocation {
             mapView.showsUserLocation = true
             mapView.userTrackingMode = .follow
+            mapView.maximumZoomLevel = Constants.mapZoomLevel
         } else {
             mapView.showsUserLocation = false
             mapView.userTrackingMode = .none
diff --git a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/Coordinator/StaticLocationViewingCoordinator.swift b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/Coordinator/StaticLocationViewingCoordinator.swift
index cf241f85a..a8a82e3e6 100644
--- a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/Coordinator/StaticLocationViewingCoordinator.swift
+++ b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/Coordinator/StaticLocationViewingCoordinator.swift
@@ -24,6 +24,7 @@ struct StaticLocationViewingCoordinatorParameters {
     let avatarData: AvatarInputProtocol
     let location: CLLocationCoordinate2D
     let coordinateType: LocationSharingCoordinateType
+    let mxSession: MXSession?
 }
 
 final class StaticLocationViewingCoordinator: Coordinator, Presentable {
@@ -50,10 +51,20 @@ final class StaticLocationViewingCoordinator: Coordinator, Presentable {
     init(parameters: StaticLocationViewingCoordinatorParameters) {
         self.parameters = parameters
         
-        let viewModel = StaticLocationViewingViewModel(mapStyleURL: BuildSettings.tileServerMapStyleURL,
-                                                             avatarData: parameters.avatarData,
-                                                             location: parameters.location,
-                                                             coordinateType: parameters.coordinateType)
+        var viewModel: StaticLocationViewingViewModel
+        if let mapStyleUrl = parameters.mxSession?.vc_homeserverConfiguration()?.tileServer.mapStyleURL {
+            viewModel = StaticLocationViewingViewModel(mapStyleURL: mapStyleUrl,
+                                                                 avatarData: parameters.avatarData,
+                                                                 location: parameters.location,
+                                                                 coordinateType: parameters.coordinateType)
+        } else {
+            viewModel = StaticLocationViewingViewModel(mapStyleURL: BuildSettings.tileServerMapStyleURL,
+                                                                 avatarData: parameters.avatarData,
+                                                                 location: parameters.location,
+                                                                 coordinateType: parameters.coordinateType)
+        }
+        
+
         let view = StaticLocationView(viewModel: viewModel.context)
             .addDependency(AvatarService.instantiate(mediaManager: parameters.mediaManager))
         staticLocationViewingViewModel = viewModel
diff --git a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/StaticLocationViewingModels.swift b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/StaticLocationViewingModels.swift
index 94607f8c9..f92495a37 100644
--- a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/StaticLocationViewingModels.swift
+++ b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/StaticLocationViewingModels.swift
@@ -49,6 +49,10 @@ struct StaticLocationViewingViewState: BindableState {
     var shareButtonEnabled: Bool {
         !showLoadingIndicator
     }
+    
+    var shareButtonVisible: Bool {
+        BwiBuildSettings.bwiLocationShareButtonVisible
+    }
 
     let errorSubject = PassthroughSubject<LocationSharingViewError, Never>()
     
diff --git a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/View/StaticLocationView.swift b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/View/StaticLocationView.swift
index a217d3afc..79305da2c 100644
--- a/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/View/StaticLocationView.swift
+++ b/RiotSwiftUI/Modules/Room/StaticLocationSharingViewer/View/StaticLocationView.swift
@@ -62,8 +62,9 @@ struct StaticLocationView: View {
                     } label: {
                         Image(uiImage: Asset.Images.locationShareIcon.image)
                     }
-                    .disabled(!viewModel.viewState.shareButtonEnabled)
+                    //.disabled(!viewModel.viewState.shareButtonEnabled)
                     .accessibilityIdentifier("shareButton")
+                    .opacity(BwiBuildSettings.bwiLocationShareButtonVisible ? 1.0 : 0.0)
                 }
             }
             .navigationBarTitleDisplayMode(.inline)
diff --git a/bwi/BwiBuildSettings.swift b/bwi/BwiBuildSettings.swift
index dd8a71082..b39b0dc8f 100644
--- a/bwi/BwiBuildSettings.swift
+++ b/bwi/BwiBuildSettings.swift
@@ -71,4 +71,6 @@ final class BwiBuildSettings: NSObject {
     static let bwiShowRoomCreationSectionFooter = false
     
     static let bwiAutoCreateAliasOnRoomCreation = true
+    
+    static let bwiLocationShareButtonVisible = false
 }
diff --git a/project.yml b/project.yml
index acc2675a4..c60a2905a 100644
--- a/project.yml
+++ b/project.yml
@@ -42,10 +42,10 @@ include:
   - path: CommonKit/targetUnitTests.yml
 
 packages:
-#  Mapbox:
-#    url: https://github.com/maplibre/maplibre-gl-native-distribution
-#    minVersion: 5.12.2
-#    maxVersion: 5.13.0
+  Mapbox:
+    url: https://github.com/maplibre/maplibre-gl-native-distribution
+    minVersion: 5.12.2
+    maxVersion: 5.13.0
   OrderedCollections:
     url: https://github.com/apple/swift-collections
     minVersion: 1.0.2