diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf6012ec6..c046b597a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -991,6 +991,14 @@ else()
     set_target_properties(${PROJECT_NAME} PROPERTIES
           XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/resources/entitlements/appstore/Jami.entitlements")
   else()
+    # Include container-migration.plist in the Resources directory of the app bundle
+    set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/resources/container-migration.plist" PROPERTIES
+      MACOSX_PACKAGE_LOCATION "Resources"
+    )
+    # Add container-migration.plist to the target
+    target_sources(${PROJECT_NAME} PRIVATE
+      "${CMAKE_CURRENT_SOURCE_DIR}/resources/container-migration.plist"
+    )
     set_target_properties(${PROJECT_NAME} PROPERTIES
           SPARKLE_URL "${SPARKLE_URL}"
           SPARKLE_PUBLIC_KEY "${SPARKLE_PUBLIC_KEY}"
diff --git a/resources/Info.plist b/resources/Info.plist
index 6fac284b8..739b83f7f 100644
--- a/resources/Info.plist
+++ b/resources/Info.plist
@@ -28,6 +28,8 @@
 	<string>${SPARKLE_PUBLIC_KEY}</string>
 	<key>SUFeedURL</key>
 	<string>${SPARKLE_URL}</string>
+	<key>SUEnableInstallerLauncherService</key>
+	<true/>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSCameraUsageDescription</key>
diff --git a/resources/container-migration.plist b/resources/container-migration.plist
new file mode 100644
index 000000000..10f6140ae
--- /dev/null
+++ b/resources/container-migration.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Move</key>
+    <array>
+        <string>${ApplicationSupport}/jami</string>
+        <string>${Caches}/cx.ring</string>
+        <string>${Caches}/jami</string>
+    </array>
+</dict>
+</plist>
diff --git a/resources/entitlements/Jami.entitlements b/resources/entitlements/Jami.entitlements
index 5c566afa1..25221b1d3 100644
--- a/resources/entitlements/Jami.entitlements
+++ b/resources/entitlements/Jami.entitlements
@@ -2,15 +2,34 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
 	<key>com.apple.security.device.camera</key>
 	<true/>
+	<key>com.apple.security.device.microphone</key>
+	<true/>
 	<key>com.apple.security.device.audio-input</key>
 	<true/>
 	<key>com.apple.security.files.user-selected.read-write</key>
 	<true/>
+	<key>com.apple.security.assets.movies.read-write</key>
+	<true/>
+	<key>com.apple.security.files.downloads.read-write</key>
+	<true/>
+	<key>com.apple.security.assets.pictures.read-write</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+	<key>com.apple.security.network.server</key>
+	<true/>
 	<key>com.apple.security.cs.allow-jit</key>
 	<true/>
 	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
 	<true/>
+	<key>com.apple.security.temporary-exception.mach-lookup.global-name</key>
+	<array>
+		<string>cx.ring-spks</string>
+		<string>cx.ring-spki</string>
+	</array>
 </dict>
 </plist>