diff --git a/src/System Application/App/Entitlements/DelegatedAdminagentPartner.Entitlement.al b/src/System Application/App/Entitlements/DelegatedAdminagentPartner.Entitlement.al
index 821dd6739d..cd2466277f 100644
--- a/src/System Application/App/Entitlements/DelegatedAdminagentPartner.Entitlement.al	
+++ b/src/System Application/App/Entitlements/DelegatedAdminagentPartner.Entitlement.al	
@@ -8,6 +8,7 @@ namespace System.Security.AccessControl;
 using System.Azure.Identity;
 using System.Environment.Configuration;
 using System.Email;
+using System.ExternalFileStorage;
 using System.Apps;
 using System.Integration;
 
@@ -25,6 +26,7 @@ entitlement "Delegated Admin agent - Partner"
                          "Exten. Mgt. - Admin",
                          "Email - Admin",
                          "Feature Key - Admin",
+                         "File Storage - Admin",
                          "VSC Intgr. - Admin";
 #pragma warning restore
 }
diff --git a/src/System Application/App/External File Storage/permissions/FileStorageObjects.PermissionSet.al b/src/System Application/App/External File Storage/permissions/FileStorageObjects.PermissionSet.al
index 76876d3a5e..26a61b8e4b 100644
--- a/src/System Application/App/External File Storage/permissions/FileStorageObjects.PermissionSet.al	
+++ b/src/System Application/App/External File Storage/permissions/FileStorageObjects.PermissionSet.al	
@@ -6,6 +6,10 @@ permissionset 9452 "File Storage - Objects"
     Assignable = false;
 
     Permissions =
+        codeunit "File Account" = X,
+        codeunit "External File Storage" = X,
+        codeunit "File Pagination Data" = X,
+        codeunit "File Scenario" = X,
         table "File Account" = X,
         table "File Account Content" = X,
         table "File Account Scenario" = X,
diff --git a/src/System Application/App/External File Storage/src/Account/FileAccount.Codeunit.al b/src/System Application/App/External File Storage/src/Account/FileAccount.Codeunit.al
index 796fb00ce0..5a2f974ae8 100644
--- a/src/System Application/App/External File Storage/src/Account/FileAccount.Codeunit.al	
+++ b/src/System Application/App/External File Storage/src/Account/FileAccount.Codeunit.al	
@@ -12,8 +12,6 @@ namespace System.ExternalFileStorage;
 codeunit 9450 "File Account"
 {
     Access = Public;
-    InherentPermissions = X;
-    InherentEntitlements = X;
 
     /// <summary>
     /// Gets all of the file accounts registered in Business Central.
diff --git a/src/System Application/App/External File Storage/src/FileStorage/ExternalFileStorage.Codeunit.al b/src/System Application/App/External File Storage/src/FileStorage/ExternalFileStorage.Codeunit.al
index 186ae7ed72..266e886c12 100644
--- a/src/System Application/App/External File Storage/src/FileStorage/ExternalFileStorage.Codeunit.al	
+++ b/src/System Application/App/External File Storage/src/FileStorage/ExternalFileStorage.Codeunit.al	
@@ -7,9 +7,6 @@ namespace System.ExternalFileStorage;
 
 codeunit 9454 "External File Storage"
 {
-    InherentPermissions = X;
-    InherentEntitlements = X;
-
     var
         ExternalFileStorageImpl: Codeunit "External File Storage Impl.";
 
diff --git a/src/System Application/App/External File Storage/src/Lookup/FilePaginationData.Codeunit.al b/src/System Application/App/External File Storage/src/Lookup/FilePaginationData.Codeunit.al
index a9ce9f6d7f..31a83ee026 100644
--- a/src/System Application/App/External File Storage/src/Lookup/FilePaginationData.Codeunit.al	
+++ b/src/System Application/App/External File Storage/src/Lookup/FilePaginationData.Codeunit.al	
@@ -7,9 +7,6 @@ namespace System.ExternalFileStorage;
 
 codeunit 9456 "File Pagination Data"
 {
-    InherentPermissions = X;
-    InherentEntitlements = X;
-
     var
         FilePaginationDataImpl: Codeunit "File Pagination Data Impl.";
 
diff --git a/src/System Application/App/External File Storage/src/Scenario/FileScenario.Codeunit.al b/src/System Application/App/External File Storage/src/Scenario/FileScenario.Codeunit.al
index a1ae1f3a4f..12551b47c2 100644
--- a/src/System Application/App/External File Storage/src/Scenario/FileScenario.Codeunit.al	
+++ b/src/System Application/App/External File Storage/src/Scenario/FileScenario.Codeunit.al	
@@ -10,9 +10,6 @@ namespace System.ExternalFileStorage;
 /// </summary>
 codeunit 9452 "File Scenario"
 {
-    InherentPermissions = X;
-    InherentEntitlements = X;
-
     /// <summary>
     /// Gets the default file account.
     /// </summary>
diff --git a/src/System Application/App/Permissions/SystemApplicationEdit.PermissionSet.al b/src/System Application/App/Permissions/SystemApplicationEdit.PermissionSet.al
index d5a22806d0..7b1dabc417 100644
--- a/src/System Application/App/Permissions/SystemApplicationEdit.PermissionSet.al	
+++ b/src/System Application/App/Permissions/SystemApplicationEdit.PermissionSet.al	
@@ -8,6 +8,7 @@ namespace System.Security.AccessControl;
 using System.Visualization;
 using System.Privacy;
 using System.Email;
+using System.ExternalFileStorage;
 using System.Text;
 using System.Environment.Configuration;
 using System.Globalization;
@@ -23,6 +24,7 @@ permissionset 22 "System Application - Edit"
                              "Data Classification - Edit",
                              "Email - Edit",
                              "Entity Text - Edit",
+                             "File Storage - Edit",
                              "Guided Experience - Edit",
                              "Language - Edit",
                              "PageScripting - Rec",
diff --git a/src/System Application/App/Permissions/SystemApplicationObjects.PermissionSet.al b/src/System Application/App/Permissions/SystemApplicationObjects.PermissionSet.al
index ef1125095a..061c0af3a6 100644
--- a/src/System Application/App/Permissions/SystemApplicationObjects.PermissionSet.al	
+++ b/src/System Application/App/Permissions/SystemApplicationObjects.PermissionSet.al	
@@ -14,6 +14,7 @@ using System.Privacy;
 using System.Reflection;
 using System.Integration;
 using System.Integration.Excel;
+using System.ExternalFileStorage;
 using System.Email;
 using System.Text;
 using System.Globalization;
@@ -42,6 +43,7 @@ permissionset 219 "System Application - Objects"
                              "Entity Text - Objects",
                              "Extension Management - Objects",
                              "Feature Key - Objects",
+                             "File Storage - Objects",
                              "Guided Experience - Objects",
                              "Language - Objects",
                              "Page Summary Provider - Obj.",
diff --git a/src/System Application/App/Permissions/SystemApplicationRead.PermissionSet.al b/src/System Application/App/Permissions/SystemApplicationRead.PermissionSet.al
index c68f8eea4a..fad19c54e4 100644
--- a/src/System Application/App/Permissions/SystemApplicationRead.PermissionSet.al	
+++ b/src/System Application/App/Permissions/SystemApplicationRead.PermissionSet.al	
@@ -11,6 +11,7 @@ using System.Visualization;
 using System.Privacy;
 using System.Environment.Configuration;
 using System.Integration.Excel;
+using System.ExternalFileStorage;
 using System.Reflection;
 using System.Globalization;
 using System.Integration;
@@ -39,6 +40,7 @@ permissionset 21 "System Application - Read"
                              "Extension Management - Read",
                              "Feature Key - Read",
                              "Field Selection - Read",
+                             "File Storage - Read",
                              "Guided Experience - Read",
                              "Headlines - Read",
                              "Object Selection - Read",