diff --git a/Telegram-iOS/Config-AppStoreLLC.xcconfig b/Telegram-iOS/Config-AppStoreLLC.xcconfig
index 02bd936396..76c1f1e594 100644
--- a/Telegram-iOS/Config-AppStoreLLC.xcconfig
+++ b/Telegram-iOS/Config-AppStoreLLC.xcconfig
@@ -1 +1,8 @@
-#include "../../Telegram-iOS-Shared/Config/AppStoreLLC/Config.xcconfig"
+APP_NAME=Telegram
+APP_BUNDLE_ID=ph.telegra.Telegraph
+APP_SPECIFIC_URL_SCHEME=tgapp
+
+GLOBAL_CONSTANTS = APP_CONFIG_IS_INTERNAL_BUILD=false APP_CONFIG_IS_APPSTORE_BUILD=true APP_CONFIG_APPSTORE_ID=686449807 APP_SPECIFIC_URL_SCHEME="\"$(APP_SPECIFIC_URL_SCHEME)\""
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) $(GLOBAL_CONSTANTS)
+
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) APP_CONFIG_API_ID=8 APP_CONFIG_API_HASH="\"7245de8e747a0d6fbe11f7cc14fcc0bb\"" APP_CONFIG_HOCKEYAPP_ID="\"ad8831329ffc8f8aff9a2b0b86558b24\""
diff --git a/buildbox/build-telegram.sh b/buildbox/build-telegram.sh
index 342da0c46c..9f5fbb86ac 100644
--- a/buildbox/build-telegram.sh
+++ b/buildbox/build-telegram.sh
@@ -81,7 +81,7 @@ VM_IP=$(prlctl exec "$VM_NAME" "ifconfig | grep inet | grep broadcast | grep -Eo
 scp -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -pr "$BUILDBOX_DIR/$CODESIGNING_SUBPATH" telegram@"$VM_IP":codesigning_data
 
 if [ "$BUILD_CONFIGURATION" == "verify" ]; then
-	scp -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -pr "$BUILDBOX_DIR/fake-shared" telegram@"$VM_IP":telegram-ios-shared
+	ssh -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null telegram@"$VM_IP" -o ServerAliveInterval=60 -t "mkdir -p telegram-ios-shared/fastlane; echo '' > telegram-ios-shared/fastlane/Fastfile"
 else
 	scp -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -pr "$BUILDBOX_DIR/transient-data/telegram-ios-shared" telegram@"$VM_IP":telegram-ios-shared
 fi
diff --git a/buildbox/fake-shared/Config/AppStoreLLC/Config.xcconfig b/buildbox/fake-shared/Config/AppStoreLLC/Config.xcconfig
deleted file mode 100644
index d381ccc3d0..0000000000
--- a/buildbox/fake-shared/Config/AppStoreLLC/Config.xcconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-APP_NAME=Telegram
-APP_BUNDLE_ID=ph.telegra.Telegraph
-APP_SPECIFIC_URL_SCHEME=tgapp
-
-GLOBAL_CONSTANTS = APP_CONFIG_IS_INTERNAL_BUILD=false APP_CONFIG_IS_APPSTORE_BUILD=true APP_CONFIG_APPSTORE_ID=686449807 APP_SPECIFIC_URL_SCHEME="\"$(APP_SPECIFIC_URL_SCHEME)\""
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) $(GLOBAL_CONSTANTS)
-
-#include "Data.xcconfig"
diff --git a/buildbox/fake-shared/Config/AppStoreLLC/Data.xcconfig b/buildbox/fake-shared/Config/AppStoreLLC/Data.xcconfig
deleted file mode 100644
index 935e871569..0000000000
--- a/buildbox/fake-shared/Config/AppStoreLLC/Data.xcconfig
+++ /dev/null
@@ -1 +0,0 @@
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) APP_CONFIG_DATA="\"\""
\ No newline at end of file
diff --git a/buildbox/fake-shared/fastlane/Fastfile b/buildbox/fake-shared/fastlane/Fastfile
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/submodules/TelegramCore b/submodules/TelegramCore
index 7c125c7fe1..e62a476550 160000
--- a/submodules/TelegramCore
+++ b/submodules/TelegramCore
@@ -1 +1 @@
-Subproject commit 7c125c7fe1dd02778ef1234fc4c42435868bce9c
+Subproject commit e62a47655084e2f31350eddf2fb4cb8605d5dcca
diff --git a/submodules/TelegramUI b/submodules/TelegramUI
index 80f6e1808f..728043b50b 160000
--- a/submodules/TelegramUI
+++ b/submodules/TelegramUI
@@ -1 +1 @@
-Subproject commit 80f6e1808fdc8bb6078a7303be07093733541f5b
+Subproject commit 728043b50b0d30aef57d94c50a75831a2eb5bae5