diff --git a/Mac/Resources/NetNewsWire.entitlements b/Mac/Resources/NetNewsWire.entitlements
index 92833b16c..7b1d03115 100644
--- a/Mac/Resources/NetNewsWire.entitlements
+++ b/Mac/Resources/NetNewsWire.entitlements
@@ -2,9 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.developer.aps-environment</key>
+	<string>development</string>
 	<key>com.apple.developer.icloud-container-identifiers</key>
 	<array>
-		<string>iCloud.com.ranchero.NetNewsWire</string>
+		<string>iCloud.$(ORGANIZATION_IDENTIFIER).NetNewsWire</string>
 	</array>
 	<key>com.apple.developer.icloud-services</key>
 	<array>
diff --git a/iOS/Resources/NetNewsWire.entitlements b/iOS/Resources/NetNewsWire.entitlements
index ad77f53e2..028d33157 100644
--- a/iOS/Resources/NetNewsWire.entitlements
+++ b/iOS/Resources/NetNewsWire.entitlements
@@ -6,7 +6,7 @@
 	<string>development</string>
 	<key>com.apple.developer.icloud-container-identifiers</key>
 	<array>
-		<string>iCloud.com.ranchero.NetNewsWire</string>
+		<string>iCloud.$(ORGANIZATION_IDENTIFIER).NetNewsWire</string>
 	</array>
 	<key>com.apple.developer.icloud-services</key>
 	<array>