diff --git a/ion/src/sdl/ios/Info.plist b/ion/src/sdl/ios/Info.plist
index 136757409..33cac31ee 100644
--- a/ion/src/sdl/ios/Info.plist
+++ b/ion/src/sdl/ios/Info.plist
@@ -11,7 +11,7 @@
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>
-    <string>NumWorks Graphing Calculator</string>
+    <string>NumWorks</string>
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleSupportedPlatforms</key>
diff --git a/ion/src/sdl/ios/Makefile b/ion/src/sdl/ios/Makefile
index 2b96c8434..54c77f894 100644
--- a/ion/src/sdl/ios/Makefile
+++ b/ion/src/sdl/ios/Makefile
@@ -13,25 +13,16 @@ $(BUILD_DIR)/%/epsilon.bin: force_remake
 	$(Q) echo "MAKE    ARCH=$*"
 	$(Q) $(MAKE) ARCH=$*
 
-ifndef ARCH
 ifeq ($(IOS_PLATFORM),iphoneos)
 ARCHS ?= arm64
 else ifeq ($(IOS_PLATFORM),iphonesimulator)
 ARCHS ?= x86_64
 endif
-endif
 
 # iOS resources
 
 ios_resource = $(addprefix $(BUILD_DIR)/app/Payload/Epsilon.app/,$(1))
 
-$(BUILD_DIR)/app/entitlements.plist: ion/src/sdl/ios/entitlements.plist
-	$(call rule_label,PLUTIL)
-	$(Q) cp $^ $@
-	$(Q) plutil -insert "com\.apple\.developer\.team-identifier" -string "$(IOS_IDENTIFIER)" $@
-	$(Q) plutil -insert "application-identifier" -string "$(IOS_IDENTIFIER).com.numworks.calculator" $@
-	$(Q) plutil -insert "keychain-access-groups.0" -string "$(IOS_IDENTIFIER).com.numworks.calculator" $@
-
 $(call ios_resource,Epsilon): $(patsubst %,$(BUILD_DIR)/%/epsilon.bin,$(ARCHS)) | $$(@D)/.
 	$(call rule_label,LIPO)
 	$(Q) $(LIPO) -create $^ -output $@
@@ -58,9 +49,18 @@ $(call ios_resource,launch.storyboardc): ion/src/sdl/ios/launch.storyboard | $$(
 	$(call rule_label,IBTOOL)
 	$(Q) $(IBTOOL) --minimum-deployment-target $(IOS_MIN_VERSION) --compile $@ $^
 
+ifdef IOS_PROVISIONNING_PROFILE
 $(call ios_resource,embedded.mobileprovision): $(IOS_PROVISIONNING_PROFILE) | $$(@D)/.
 	$(call rule_label,COPY)
 	$(Q) cp $^ $@
+else
+$(call ios_resource,embedded.mobileprovision):
+	$(error Please define IOS_PROVISIONNING_PROFILE to point to the .mobileprovision file you want to use)
+endif
+
+$(BUILD_DIR)/app/entitlements.plist: $(call ios_resource,embedded.mobileprovision)
+	$(call rule_label,SCMS)
+	$(Q) security cms -D -i $(IOS_PROVISIONNING_PROFILE) | plutil -extract Entitlements xml1 - -o $@
 
 asset_for = $(addprefix $(BUILD_DIR)/app/assets/Assets.xcassets/AppIcon.appiconset/,$(1))
 
@@ -79,18 +79,17 @@ $(call asset_for,icon_%.png): ion/src/sdl/assets/logo.svg | $$(@D)/.
 
 $(call ios_resource,Assets.car): $(call asset_for,Contents.json) | $$(@D)/.
 	$(call rule_label,ACTOOL)
-	$(Q) $(ACTOOL) --compile $(BUILD_DIR)/app/Payload/Epsilon.app --minimum-deployment-target $(IOS_MIN_VERSION) --platform $(IOS_PLATFORM) --app-icon AppIcon --output-partial-info-plist $(BUILD_DIR)/app/assets/partial.plist $(BUILD_DIR)/app/assets/Assets.xcassets
+	$(Q) $(ACTOOL) --compile $(BUILD_DIR)/app/Payload/Epsilon.app --minimum-deployment-target $(IOS_MIN_VERSION) --platform $(IOS_PLATFORM) --app-icon AppIcon --output-partial-info-plist $(BUILD_DIR)/app/assets/partial.plist $(BUILD_DIR)/app/assets/Assets.xcassets > /dev/null
 
-epsilon_ipa_deps: $(call ios_resource,\
+epsilon_app_deps = $(call ios_resource,\
   Assets.car \
   Epsilon \
   Info.plist \
   background.jpg \
-  embedded.mobileprovision \
   launch.storyboardc \
 )
 
-$(BUILD_DIR)/app/epsilon.ipa: epsilon_ipa_deps $(BUILD_DIR)/app/entitlements.plist
+$(BUILD_DIR)/app/epsilon.ipa: $(epsilon_app_deps) $(BUILD_DIR)/app/entitlements.plist
 	$(call rule_label,SIGN)
 	$(Q) codesign --force --entitlements $(BUILD_DIR)/app/entitlements.plist --sign "iPhone Distribution: NumWorks" $(BUILD_DIR)/app/Payload/Epsilon.app
 	$(call rule_label,ZIP)
@@ -99,5 +98,8 @@ $(BUILD_DIR)/app/epsilon.ipa: epsilon_ipa_deps $(BUILD_DIR)/app/entitlements.pli
 .PHONY: epsilon.ipa
 epsilon.ipa: $(BUILD_DIR)/app/epsilon.ipa
 
-epsilon_run: $(BUILD_DIR)/app/Epsilon.app
-	xcrun simctl install booted $(BUILD_DIR)/app/Epsilon.app
+ifeq ($(IOS_PLATFORM),iphonesimulator)
+.PHONY: epsilon_run
+epsilon_run: $(epsilon_app_deps)
+	xcrun simctl install booted $(BUILD_DIR)/app/Payload/Epsilon.app
+endif
diff --git a/scripts/platform.sdl.ios.mak b/scripts/platform.sdl.ios.mak
index 6db3d35a7..bf80489f2 100644
--- a/scripts/platform.sdl.ios.mak
+++ b/scripts/platform.sdl.ios.mak
@@ -3,10 +3,9 @@ EXE = bin
 
 IOS_PLATFORM ?= iphoneos
 IOS_MIN_VERSION = 8.0
-IOS_IDENTIFIER ?= unknown
-IOS_PROVISIONNING_PROFILE ?= unknown
 
-# Stop from here
+# Variables below will e autoconfigured
+#
 IOS_PLATFORM_VERSION = $(shell xcrun --sdk $(IOS_PLATFORM) --show-sdk-version)
 IOS_PLATFORM_BUILD = $(shell xcrun --sdk $(IOS_PLATFORM) --show-sdk-build-version)
 
diff --git a/scripts/toolchain.ios.mak b/scripts/toolchain.ios.mak
index 5ebcc3576..5d4081cd8 100644
--- a/scripts/toolchain.ios.mak
+++ b/scripts/toolchain.ios.mak
@@ -24,5 +24,5 @@ LD = false
 endif
 
 ACTOOL = $(shell xcrun --sdk $(IOS_PLATFORM) --find actool)
-IBTOOL = $(shell xcrun --sdk $(IOS_PLATFORM) --find actool)
+IBTOOL = $(shell xcrun --sdk $(IOS_PLATFORM) --find ibtool)
 LIPO = $(shell xcrun --sdk $(IOS_PLATFORM) --find lipo)