diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj
index f6e7ef887..f7423fc64 100644
--- a/NetNewsWire.xcodeproj/project.pbxproj
+++ b/NetNewsWire.xcodeproj/project.pbxproj
@@ -2226,16 +2226,16 @@
 				TargetAttributes = {
 					513C5CE5232571C2003D4054 = {
 						CreatedOnToolsVersion = 11.0;
-						DevelopmentTeam = M8L2WTLA8W;
+						DevelopmentTeam = SHJK2V3AJG;
 						ProvisioningStyle = Automatic;
 					};
 					6581C73220CED60000F4AD34 = {
 						DevelopmentTeam = SHJK2V3AJG;
-						ProvisioningStyle = Manual;
+						ProvisioningStyle = Automatic;
 					};
 					840D617B2029031C009BC708 = {
 						CreatedOnToolsVersion = 9.3;
-						DevelopmentTeam = M8L2WTLA8W;
+						DevelopmentTeam = SHJK2V3AJG;
 						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
@@ -2246,7 +2246,7 @@
 					849C645F1ED37A5D003D8FC0 = {
 						CreatedOnToolsVersion = 8.2.1;
 						DevelopmentTeam = SHJK2V3AJG;
-						ProvisioningStyle = Manual;
+						ProvisioningStyle = Automatic;
 						SystemCapabilities = {
 							com.apple.HardenedRuntime = {
 								enabled = 1;
@@ -2255,7 +2255,7 @@
 					};
 					849C64701ED37A5D003D8FC0 = {
 						CreatedOnToolsVersion = 8.2.1;
-						DevelopmentTeam = 9C84TZ7Q6Z;
+						DevelopmentTeam = SHJK2V3AJG;
 						ProvisioningStyle = Automatic;
 						TestTargetID = 849C645F1ED37A5D003D8FC0;
 					};
@@ -2571,7 +2571,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "##xcrun -sdk macosx swiftc -target x86_64-macosx10.11  buildscripts/VerifyNoBuildSettings.swift -o $CONFIGURATION_TEMP_DIR/VerifyNoBS\n##$CONFIGURATION_TEMP_DIR/VerifyNoBS ${PROJECT_NAME}.xcodeproj/project.pbxproj\n";
+			shellScript = "xcrun -sdk macosx swiftc -target x86_64-macosx10.11  buildscripts/VerifyNoBuildSettings.swift -o $CONFIGURATION_TEMP_DIR/VerifyNoBS\n$CONFIGURATION_TEMP_DIR/VerifyNoBS ${PROJECT_NAME}.xcodeproj/project.pbxproj\n";
 		};
 		51D6803823330CFF0097A009 /* Update Feedbin Mercury API Keys */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -3151,9 +3151,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 515D4FCE2325B3D000EE1167 /* NetNewsWire_iOSshareextension_target.xcconfig */;
 			buildSettings = {
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				DEVELOPMENT_TEAM = M8L2WTLA8W;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.NetNewsWire.iOS.Share-Extension";
 			};
 			name = Debug;
 		};
@@ -3161,9 +3158,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 515D4FCE2325B3D000EE1167 /* NetNewsWire_iOSshareextension_target.xcconfig */;
 			buildSettings = {
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				DEVELOPMENT_TEAM = M8L2WTLA8W;
-				PRODUCT_BUNDLE_IDENTIFIER = "com.ranchero.NetNewsWire.iOS.Share-Extension";
 			};
 			name = Release;
 		};
@@ -3185,10 +3179,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 51121AA12265430A00BC0EC1 /* NetNewsWire_iOSapp_target.xcconfig */;
 			buildSettings = {
-				CODE_SIGN_ENTITLEMENTS = iOS/Resources/NetNewsWire.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				DEVELOPMENT_TEAM = M8L2WTLA8W;
-				PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWire.iOS;
 			};
 			name = Debug;
 		};
@@ -3196,10 +3186,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 51121AA12265430A00BC0EC1 /* NetNewsWire_iOSapp_target.xcconfig */;
 			buildSettings = {
-				CODE_SIGN_ENTITLEMENTS = iOS/Resources/NetNewsWire.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				DEVELOPMENT_TEAM = M8L2WTLA8W;
-				PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWire.iOS;
 			};
 			name = Release;
 		};
diff --git a/README.md b/README.md
index da7e22850..2f9cab550 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,7 @@ give it the contents:
 CODE_SIGN_IDENTITY = Mac Developer
 DEVELOPMENT_TEAM = <Your Team ID>
 CODE_SIGN_STYLE = Automatic
+ORGANIZATION_IDENTIFIER = <Your Domain Name Reversed>
 PROVISIONING_PROFILE_SPECIFIER =
 ```
 
diff --git a/iOS/Resources/NetNewsWire.entitlements b/iOS/Resources/NetNewsWire.entitlements
index acce3514f..d6b369115 100644
--- a/iOS/Resources/NetNewsWire.entitlements
+++ b/iOS/Resources/NetNewsWire.entitlements
@@ -4,7 +4,7 @@
 <dict>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.com.ranchero.NetNewsWire.iOS</string>
+		<string>group.$(ORGANIZATION_IDENTIFIER).NetNewsWire.iOS</string>
 	</array>
 </dict>
 </plist>
diff --git a/iOS/ShareExtension/NetNewsWire_iOS_ShareExtension.entitlements b/iOS/ShareExtension/NetNewsWire_iOS_ShareExtension.entitlements
index 0c67376eb..d6b369115 100644
--- a/iOS/ShareExtension/NetNewsWire_iOS_ShareExtension.entitlements
+++ b/iOS/ShareExtension/NetNewsWire_iOS_ShareExtension.entitlements
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict/>
+<dict>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.$(ORGANIZATION_IDENTIFIER).NetNewsWire.iOS</string>
+	</array>
+</dict>
 </plist>
diff --git a/xcconfig/NetNewsWire_iOSapp_target.xcconfig b/xcconfig/NetNewsWire_iOSapp_target.xcconfig
index acfbf86f6..a10ee2172 100644
--- a/xcconfig/NetNewsWire_iOSapp_target.xcconfig
+++ b/xcconfig/NetNewsWire_iOSapp_target.xcconfig
@@ -1,6 +1,7 @@
 CODE_SIGN_IDENTITY = Developer ID Application
 DEVELOPMENT_TEAM = DY2XQRVWN9
 CODE_SIGN_STYLE = Automatic
+BUNDLE_ROOT = com.ranchero
 PROVISIONING_PROFILE_SPECIFIER =
 
 // developers can locally override the Xcode settings for code signing
@@ -16,6 +17,7 @@ PROVISIONING_PROFILE_SPECIFIER =
 //    CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer
 //    CODE_SIGN_IDENTITY[sdk=iphonesimulator*] = iPhone Developer
 //    DEVELOPMENT_TEAM = <Your Team ID>
+//    BUNDLE_ROOT = <Your Domain Name Reversed>
 //    CODE_SIGN_STYLE = Automatic
 //    PROVISIONING_PROFILE_SPECIFIER =
 //
@@ -41,7 +43,8 @@ GCC_C_LANGUAGE_STANDARD = gnu11;
 IPHONEOS_DEPLOYMENT_TARGET = 13.0
 LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks
 INFOPLIST_FILE = iOS/Resources/Info.plist
-PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWire.iOS
+CODE_SIGN_ENTITLEMENTS = iOS/Resources/NetNewsWire.entitlements
+PRODUCT_BUNDLE_IDENTIFIER = $(ORGANIZATION_IDENTIFIER).NetNewsWire.iOS
 PRODUCT_NAME = NetNewsWire
 SDKROOT = iphoneos;
 TARGETED_DEVICE_FAMILY = 1,2
diff --git a/xcconfig/NetNewsWire_iOSshareextension_target.xcconfig b/xcconfig/NetNewsWire_iOSshareextension_target.xcconfig
index b791827aa..f68f620e8 100644
--- a/xcconfig/NetNewsWire_iOSshareextension_target.xcconfig
+++ b/xcconfig/NetNewsWire_iOSshareextension_target.xcconfig
@@ -3,5 +3,5 @@
 
 CODE_SIGN_ENTITLEMENTS = iOS/ShareExtension/NetNewsWire_iOS_ShareExtension.entitlements
 INFOPLIST_FILE = iOS/ShareExtension/Info.plist
-PRODUCT_BUNDLE_IDENTIFIER = com.ranchero.NetNewsWire.iOS.Share-Extension
+PRODUCT_BUNDLE_IDENTIFIER = $(ORGANIZATION_IDENTIFIER).NetNewsWire.iOS.Share-Extension
 PRODUCT_NAME = $(TARGET_NAME)
diff --git a/xcconfig/NetNewsWire_macapp_target.xcconfig b/xcconfig/NetNewsWire_macapp_target.xcconfig
index 3dbe4ae53..470bf3cb3 100644
--- a/xcconfig/NetNewsWire_macapp_target.xcconfig
+++ b/xcconfig/NetNewsWire_macapp_target.xcconfig
@@ -17,6 +17,7 @@ PROVISIONING_PROFILE_SPECIFIER =
 //    CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer
 //    CODE_SIGN_IDENTITY[sdk=iphonesimulator*] = iPhone Developer
 //    DEVELOPMENT_TEAM = <Your Team ID>
+//    ORGANIZATION_IDENTIFIER = <Your Domain Name Reversed>
 //    CODE_SIGN_STYLE = Automatic
 //    PROVISIONING_PROFILE_SPECIFIER =
 //