diff --git a/lime/tools/platforms/IOSPlatform.hx b/lime/tools/platforms/IOSPlatform.hx
index e6a8cb444..f1af2500a 100644
--- a/lime/tools/platforms/IOSPlatform.hx
+++ b/lime/tools/platforms/IOSPlatform.hx
@@ -118,6 +118,12 @@ class IOSPlatform extends PlatformTarget {
 			
 		}
 		
+		if (!project.config.exists ("ios.identity")) {
+			
+			project.config.set ("ios.identity", "iPhone Developer");
+			
+		}
+		
 		IOSHelper.getIOSVersion (project);
 		project.haxedefs.set ("IPHONE_VER", project.environment.get ("IPHONE_VER"));
 		
@@ -126,6 +132,7 @@ class IOSPlatform extends PlatformTarget {
 		context.HAS_ICON = false;
 		context.HAS_LAUNCH_IMAGE = false;
 		context.OBJC_ARC = false;
+		context.KEY_STORE_IDENTITY = project.config.getString ("ios.identity");
 		
 		if (project.config.exists ("ios.team-id")) {
 			
diff --git a/lime/tools/platforms/TVOSPlatform.hx b/lime/tools/platforms/TVOSPlatform.hx
index 25b070860..5db10dc83 100644
--- a/lime/tools/platforms/TVOSPlatform.hx
+++ b/lime/tools/platforms/TVOSPlatform.hx
@@ -118,11 +118,18 @@ class TVOSPlatform extends PlatformTarget {
 			
 		}
 		
+		if (!project.config.exists ("tvos.identity")) {
+			
+			project.config.set ("tvos.identity", "tvOS Developer");
+			
+		}
+		
 		var context = project.templateContext;
 		
 		context.HAS_ICON = false;
 		context.HAS_LAUNCH_IMAGE = false;
 		context.OBJC_ARC = false;
+		context.KEY_STORE_IDENTITY = project.config.getString ("tvos.identity");
 		
 		context.linkedLibraries = [];
 		
diff --git a/templates/iphone/PROJ.xcodeproj/project.pbxproj b/templates/iphone/PROJ.xcodeproj/project.pbxproj
index 1935eb81f..a0e30d38a 100644
--- a/templates/iphone/PROJ.xcodeproj/project.pbxproj
+++ b/templates/iphone/PROJ.xcodeproj/project.pbxproj
@@ -259,7 +259,10 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				::end::
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "::KEY_STORE_IDENTITY::";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "::config.ios.identity::";
+				::if (config.ios.provisioning-profile)::
+				PROVISIONING_PROFILE = "::config.ios.provisioning-profile::";
+				::
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -290,7 +293,10 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				::end::
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "::KEY_STORE_IDENTITY::";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "::config.ios.identity::";
+				::if (config.ios.provisioning-profile)::
+				PROVISIONING_PROFILE = "::config.ios.provisioning-profile::";
+				::
 				/* COMPRESS_PNG_FILES = NO; */
 				COPY_PHASE_STRIP = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
diff --git a/templates/tvos/PROJ.xcodeproj/project.pbxproj b/templates/tvos/PROJ.xcodeproj/project.pbxproj
index 05dce8ac5..459d3242c 100644
--- a/templates/tvos/PROJ.xcodeproj/project.pbxproj
+++ b/templates/tvos/PROJ.xcodeproj/project.pbxproj
@@ -247,7 +247,7 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				::end::
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "::KEY_STORE_IDENTITY::";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "::config.tvos.identity::";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -278,7 +278,7 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				::end::
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "::KEY_STORE_IDENTITY::";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "::config.tvos.identity::";
 				/* COMPRESS_PNG_FILES = NO; */
 				COPY_PHASE_STRIP = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;