diff --git a/buildbox/build-telegram.sh b/buildbox/build-telegram.sh
index d92a4c4cb4..8226476423 100644
--- a/buildbox/build-telegram.sh
+++ b/buildbox/build-telegram.sh
@@ -94,10 +94,8 @@ if [ ! -d "$BUILDBOX_DIR/$CODESIGNING_SUBPATH" ]; then
 fi
 
 SOURCE_DIR=$(basename "$BASE_DIR")
-cd ..
-rm -f "$SOURCE_DIR/$BUILDBOX_DIR/transient-data/source.tar"
-tar cf "$SOURCE_DIR/$BUILDBOX_DIR/transient-data/source.tar" --exclude "$SOURCE_DIR/$BUILDBOX_DIR" "$SOURCE_DIR"
-cd "$BASE_DIR"
+rm -f "$BUILDBOX_DIR/transient-data/source.tar"
+tar cf "$BUILDBOX_DIR/transient-data/source.tar" --exclude "$BUILDBOX_DIR" --exclude-vcs "."
 
 PROCESS_ID="$$"
 VM_NAME="$VM_BASE_NAME-$(openssl rand -hex 10)-build-telegram-$PROCESS_ID"
@@ -105,9 +103,6 @@ VM_NAME="$VM_BASE_NAME-$(openssl rand -hex 10)-build-telegram-$PROCESS_ID"
 if [ "$BUILD_MACHINE" == "linux" ]; then
 	virt-clone --original "$VM_BASE_NAME" --name "$VM_NAME" --auto-clone
 	virsh start "$VM_NAME"
-	while 1; do
-		VM_IP=virsh domifaddr "$VM_NAME"
-	done
 
 	echo "Getting VM IP"
 
diff --git a/buildbox/guest-build-telegram.sh b/buildbox/guest-build-telegram.sh
index 1cf45bbc71..fba3cd7d97 100644
--- a/buildbox/guest-build-telegram.sh
+++ b/buildbox/guest-build-telegram.sh
@@ -74,9 +74,32 @@ else
 		exit 1
 	fi
 
-	echo "Unpacking files..."
-	tar -xf "source.tar"
+	mkdir "$SOURCE_PATH"
 
+
+	SIZE_IN_BLOCKS=$((10*1024*1024*1024/512))
+	DEV=`hdid -nomount ram://$SIZE_IN_BLOCKS`
+
+	if [ $? -eq 0 ]; then
+		newfs_hfs -v 'ram disk' $DEV
+		eval `/usr/bin/stat -s "$SOURCE_PATH"`
+		mount -t hfs -o union -o nobrowse -o nodev -o noatime $DEV "$SOURCE_PATH"
+		chown $st_uid:$st_gid "$SOURCE_PATH"
+		chmod $st_mode "$SOURCE_PATH"
+	else
+		echo "Error creating ramdisk"
+		exit 1
+	fi
+
+	echo "Unpacking files..."
+	mkdir "$SOURCE_PATH"
+	BASE_DIR=$(pwd)
 	cd "$SOURCE_PATH"
+	tar -xf "../source.tar"
+
 	FASTLANE_PASSWORD="$FASTLANE_PASSWORD" FASTLANE_ITC_TEAM_NAME="$FASTLANE_ITC_TEAM_NAME" fastlane "$FASTLANE_BUILD_CONFIGURATION" build_number:"$BUILD_NUMBER" commit_hash:"$COMMIT_ID" commit_author:"$COMMIT_AUTHOR"
+
+	cd "$BASE_DIR"
+	umount -f "$SOURCE_PATH"
+	hdiutil detach "$DEV"
 fi