diff --git a/client/AmneziaVPN.entitlements b/client/AmneziaVPN.entitlements
new file mode 100644
index 00000000..dd0d73f2
--- /dev/null
+++ b/client/AmneziaVPN.entitlements
@@ -0,0 +1,14 @@
+<?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>com.apple.security.application-groups</key>
+	<array>
+		<string>group.org.amnezia.AmneziaVPN</string>
+	</array>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)group.org.amnezia.AmneziaVPN</string>
+	</array>
+</dict>
+</plist>
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 557188d1..e7f29f7b 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -5,6 +5,17 @@ project(${PROJECT})
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
+if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.17)
+    cmake_policy(SET CMP0099 OLD)
+endif()
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+set_property(GLOBAL PROPERTY AUTOGEN_TARGETS_FOLDER "Autogen")
+set_property(GLOBAL PROPERTY AUTOMOC_TARGETS_FOLDER "Autogen")
+set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "Autogen")
 
 find_package(Qt6 REQUIRED COMPONENTS 
     Widgets Core Gui Network Xml 
@@ -177,6 +188,10 @@ if(APPLE)
            set(BUILD_VPN_DEVELOPMENT_TEAM X7UJ388FXK CACHE STRING "Amnezia VPN Development Team")
        endif()
 
+       set(CMAKE_XCODE_GENERATE_SCHEME FALSE)
+         set(CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM ${BUILD_VPN_DEVELOPMENT_TEAM})
+         set(CMAKE_XCODE_ATTRIBUTE_GROUP_ID_IOS ${BUILD_IOS_GROUP_IDENTIFIER})
+
     if(IOS)
         message("ios in mac")
       #do nothing, IOS is added in below