diff --git a/extras/Build/juce_build_tools/utils/juce_Entitlements.cpp b/extras/Build/juce_build_tools/utils/juce_Entitlements.cpp
index 2a4d6ac815..aa3d913fcf 100644
--- a/extras/Build/juce_build_tools/utils/juce_Entitlements.cpp
+++ b/extras/Build/juce_build_tools/utils/juce_Entitlements.cpp
@@ -54,20 +54,21 @@ namespace build_tools
         }
         if (isiCloudPermissionsEnabled)
         {
+
             entitlements.set ("com.apple.developer.icloud-container-identifiers",
                               "<array>\n"
-                              "        <string>iCloud.$(CFBundleIdentifier)</string>\n"
-                              "    </array>");
+                              "\t\t<string>iCloud." + projectBundlerIdentifierString.trim() + "</string>\n"
+                              "\t</array>");
 
             entitlements.set ("com.apple.developer.icloud-services",
                               "<array>\n"
-                              "        <string>CloudDocuments</string>\n"
-                              "    </array>");
+                              "\t\t<string>CloudDocuments</string>\n"
+                              "\t</array>");
 
             entitlements.set ("com.apple.developer.ubiquity-container-identifiers",
                               "<array>\n"
-                              "        <string>iCloud.$(CFBundleIdentifier)</string>\n"
-                              "    </array>");
+                              "\t\t<string>iCloud." + projectBundlerIdentifierString.trim() + "</string>\n"
+                              "\t</array>");
         }
 
         if (isPushNotificationsEnabled)
diff --git a/extras/Build/juce_build_tools/utils/juce_Entitlements.h b/extras/Build/juce_build_tools/utils/juce_Entitlements.h
index 1449998301..a528726072 100644
--- a/extras/Build/juce_build_tools/utils/juce_Entitlements.h
+++ b/extras/Build/juce_build_tools/utils/juce_Entitlements.h
@@ -46,7 +46,7 @@ namespace build_tools
         bool isNetworkingMulticastEnabled   = false;
 
         String appGroupIdString;
-
+        String projectBundlerIdentifierString;
         StringArray hardenedRuntimeOptions;
         StringArray appSandboxOptions;
 
diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h
index 8c86b1f21b..a3920023c1 100644
--- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h
+++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h
@@ -242,7 +242,7 @@ public:
 
     String getDevelopmentTeamIDString() const               { return iosDevelopmentTeamIDValue.get(); }
     String getAppGroupIdString() const                      { return iosAppGroupsIDValue.get(); }
-
+    String getProjectBundlerIdentifierString() const        { return project.getBundleIdentifierString(); }
     String getBuildNumber() const
     {
         const auto buildNumberString = buildNumber.get().toString();
@@ -3146,6 +3146,7 @@ private:
         options.isAppSandboxInhertianceEnabled  = isAppSandboxInhertianceEnabled();
         options.isNetworkingMulticastEnabled    = isNetworkingMulticastEnabled();
         options.appGroupIdString                = getAppGroupIdString();
+        options.projectBundlerIdentifierString  = getProjectBundlerIdentifierString();
         options.hardenedRuntimeOptions          = getHardenedRuntimeOptions();
         options.appSandboxOptions               = getAppSandboxOptions();
         options.appSandboxTemporaryPaths        = getAppSandboxTemporaryPaths();