diff --git a/src/System Application/App/Retention Policy/src/Apply Retention Policy/ApplyRetentionPolicyImpl.Codeunit.al b/src/System Application/App/Retention Policy/src/Apply Retention Policy/ApplyRetentionPolicyImpl.Codeunit.al
index 9f25194213..7bdd56355a 100644
--- a/src/System Application/App/Retention Policy/src/Apply Retention Policy/ApplyRetentionPolicyImpl.Codeunit.al	
+++ b/src/System Application/App/Retention Policy/src/Apply Retention Policy/ApplyRetentionPolicyImpl.Codeunit.al	
@@ -19,7 +19,7 @@ codeunit 3904 "Apply Retention Policy Impl."
     Permissions = tabledata AllObjWithCaption = r;
 
     var
-        TotalNumberOfRecordsDeleted: Integer;
+        TotalNumberOfRecordsDeleted: BigInteger;
         EndCurrentRun: Boolean;
         ApplyAllRetentionPolicies: Boolean;
         IsUserInvokedRun: Boolean;
@@ -222,7 +222,7 @@ codeunit 3904 "Apply Retention Policy Impl."
         RecordRefDuplicate: RecordRef;
         RetenPolDeleting: Interface "Reten. Pol. Deleting";
         Handled: Boolean;
-        NumberOfRecordsDeleted: Integer;
+        NumberOfRecordsDeleted: BigInteger;
         RecordCountBefore: Integer;
         RecordCountAfter: Integer;
     begin
@@ -427,12 +427,12 @@ codeunit 3904 "Apply Retention Policy Impl."
         exit(RetentionPolicyLogCategory::"Retention Policy - Apply");
     end;
 
-    internal procedure MaxNumberOfRecordsToDelete(): Integer
+    internal procedure MaxNumberOfRecordsToDelete(): BigInteger
     begin
         exit(10000)
     end;
 
-    internal procedure NumberOfRecordsToDeleteBuffer(): Integer
+    internal procedure NumberOfRecordsToDeleteBuffer(): BigInteger
     begin
         exit(0)
     end;
diff --git a/src/System Application/App/Retention Policy/src/Apply Retention Policy/RetenPolDeletingParam.Table.al b/src/System Application/App/Retention Policy/src/Apply Retention Policy/RetenPolDeletingParam.Table.al
index 1ff1b0f3aa..334162923a 100644
--- a/src/System Application/App/Retention Policy/src/Apply Retention Policy/RetenPolDeletingParam.Table.al	
+++ b/src/System Application/App/Retention Policy/src/Apply Retention Policy/RetenPolDeletingParam.Table.al	
@@ -56,11 +56,13 @@ table 3907 "Reten. Pol. Deleting Param"
         /// <summary>
         /// Indicates the maximum number of records to be deleted.
         /// </summary>
-        field(4; "Max. Number of Rec. to Delete"; Integer)
+#pragma warning disable AS0004
+        field(4; "Max. Number of Rec. to Delete"; BigInteger)
         {
             DataClassification = SystemMetadata;
             MinValue = 0;
         }
+#pragma warning restore AS0004
         /// <summary>
         /// if set to true the event OnApplyRetentionPolicyRecordLimitExceeded will not be raised.
         /// </summary>
@@ -69,13 +71,15 @@ table 3907 "Reten. Pol. Deleting Param"
             DataClassification = SystemMetadata;
         }
         /// <summary>
-        /// Indicates the maximum number of records that can be deleted at the same time accross all retention policies
+        /// Indicates the maximum number of records that can be deleted at the same time across all retention policies
         /// </summary>
-        field(6; "Total Max. Nr. of Rec. to Del."; Integer)
+#pragma warning disable AS0004
+        field(6; "Total Max. Nr. of Rec. to Del."; BigInteger)
         {
             DataClassification = SystemMetadata;
             MinValue = 0;
         }
+#pragma warning restore AS0004
         /// <summary>
         /// If true, indicates that user is applying the retention policies manually.
         /// If false, the retention policies are applied by a scheduled task.
@@ -88,10 +92,12 @@ table 3907 "Reten. Pol. Deleting Param"
         /// The number of records in the table before the deletion.
         /// The count is calculated once before passing this table to the deletion implementation and is used to limit the number of records to be deleted as well as record the number of records actually deleted.
         /// </summary>
-        field(8; "Record Count Before Delete"; Integer)
+#pragma warning disable AS0004
+        field(8; "Record Count Before Delete"; BigInteger)
         {
             DataClassification = SystemMetadata;
         }
+#pragma warning restore AS0004
     }
 
     keys
diff --git a/src/System Application/App/Retention Policy/src/Retention Policy Setup/RetentionPolicySetup.Table.al b/src/System Application/App/Retention Policy/src/Retention Policy Setup/RetentionPolicySetup.Table.al
index 7015a2f4d7..116eb150d7 100644
--- a/src/System Application/App/Retention Policy/src/Retention Policy Setup/RetentionPolicySetup.Table.al	
+++ b/src/System Application/App/Retention Policy/src/Retention Policy Setup/RetentionPolicySetup.Table.al	
@@ -148,12 +148,14 @@ table 3901 "Retention Policy Setup"
         {
             DataClassification = SystemMetadata;
         }
-        field(100; "Number Of Records Deleted"; Integer)
+#pragma warning disable AS0004
+        field(100; "Number Of Records Deleted"; BigInteger)
         {
             DataClassification = SystemMetadata;
             Access = Internal;
             Editable = false;
         }
+#pragma warning restore AS0004
     }
 
     keys