diff --git a/experimental/templates/multiplatform-template/cleanup.sh b/experimental/templates/multiplatform-template/cleanup.sh
new file mode 100755
index 0000000000..693ca57ad0
--- /dev/null
+++ b/experimental/templates/multiplatform-template/cleanup.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+rm -rf .idea
+./gradlew clean
+rm -rf build
+rm -rf */build
+rm -rf iosApp/iosApp.xcworkspace
+rm -rf iosApp/Pods
+rm -rf iosApp/iosApp.xcodeproj/project.xcworkspace
+rm -rf iosApp/iosApp.xcodeproj/xcuserdata 
diff --git a/experimental/templates/multiplatform-template/gradle/wrapper/gradle-wrapper.jar b/experimental/templates/multiplatform-template/gradle/wrapper/gradle-wrapper.jar
index 62d4c05355..249e5832f0 100644
Binary files a/experimental/templates/multiplatform-template/gradle/wrapper/gradle-wrapper.jar and b/experimental/templates/multiplatform-template/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/experimental/templates/multiplatform-template/iosApp/Configuration/Config.xcconfig b/experimental/templates/multiplatform-template/iosApp/Configuration/Config.xcconfig
new file mode 100644
index 0000000000..f391597827
--- /dev/null
+++ b/experimental/templates/multiplatform-template/iosApp/Configuration/Config.xcconfig
@@ -0,0 +1,3 @@
+TEAM_ID=
+BUNDLE_ID=com.myapplication.MyApplication
+APP_NAME=My application
diff --git a/experimental/templates/multiplatform-template/iosApp/Configuration/TeamId.xcconfig b/experimental/templates/multiplatform-template/iosApp/Configuration/TeamId.xcconfig
deleted file mode 100644
index bf06eb27e9..0000000000
--- a/experimental/templates/multiplatform-template/iosApp/Configuration/TeamId.xcconfig
+++ /dev/null
@@ -1 +0,0 @@
-TEAM_ID=
diff --git a/experimental/templates/multiplatform-template/iosApp/iosApp.xcodeproj/project.pbxproj b/experimental/templates/multiplatform-template/iosApp/iosApp.xcodeproj/project.pbxproj
index d036d32452..ba431831fe 100644
--- a/experimental/templates/multiplatform-template/iosApp/iosApp.xcodeproj/project.pbxproj
+++ b/experimental/templates/multiplatform-template/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -20,10 +20,10 @@
 		2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = "<group>"; };
 		4FF3202A603A284706412EDC /* Pods-iosApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.debug.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig"; sourceTree = "<group>"; };
 		6B1049432C0C2B312090ABF6 /* Pods_iosApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iosApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		7555FF7B242A565900829871 /* MyApplication.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MyApplication.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		7555FF7B242A565900829871 /* iosApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iosApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		7555FF82242A565900829871 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
 		7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		AB3632DC29227652001CCB65 /* TeamId.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = TeamId.xcconfig; sourceTree = "<group>"; };
+		AB3632DC29227652001CCB65 /* Config.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; };
 		FF8CA3F5360CEAB49D74065F /* Pods-iosApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.release.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -69,7 +69,7 @@
 		7555FF7C242A565900829871 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				7555FF7B242A565900829871 /* MyApplication.app */,
+				7555FF7B242A565900829871 /* iosApp.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -89,7 +89,7 @@
 		AB1DB47929225F7C00F7AF9C /* Configuration */ = {
 			isa = PBXGroup;
 			children = (
-				AB3632DC29227652001CCB65 /* TeamId.xcconfig */,
+				AB3632DC29227652001CCB65 /* Config.xcconfig */,
 			);
 			path = Configuration;
 			sourceTree = "<group>";
@@ -121,7 +121,7 @@
 			);
 			name = iosApp;
 			productName = iosApp;
-			productReference = 7555FF7B242A565900829871 /* MyApplication.app */;
+			productReference = 7555FF7B242A565900829871 /* iosApp.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -207,7 +207,7 @@
 /* Begin XCBuildConfiguration section */
 		7555FFA3242A565B00829871 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = AB3632DC29227652001CCB65 /* TeamId.xcconfig */;
+			baseConfigurationReference = AB3632DC29227652001CCB65 /* Config.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -269,7 +269,7 @@
 		};
 		7555FFA4242A565B00829871 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = AB3632DC29227652001CCB65 /* TeamId.xcconfig */;
+			baseConfigurationReference = AB3632DC29227652001CCB65 /* Config.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -339,8 +339,8 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.myapplication.MyApplication${TEAM_ID}";
-				PRODUCT_NAME = MyApplication;
+				PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_ID}${TEAM_ID}";
+				PRODUCT_NAME = "${APP_NAME}";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -363,8 +363,8 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "com.myapplication.MyApplication${TEAM_ID}";
-				PRODUCT_NAME = MyApplication;
+				PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_ID}${TEAM_ID}";
+				PRODUCT_NAME = "${APP_NAME}";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";