diff --git a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/schemas/InitialModFileGenesisSchema.java b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/schemas/InitialModFileGenesisSchema.java
index 09ccdbdbcdc1..6c8c3bb59c86 100644
--- a/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/schemas/InitialModFileGenesisSchema.java
+++ b/hedera-node/hedera-file-service-impl/src/main/java/com/hedera/node/app/service/file/impl/schemas/InitialModFileGenesisSchema.java
@@ -95,7 +95,7 @@ public class InitialModFileGenesisSchema extends Schema {
      * A hint to the database system of the maximum number of files we will store. This MUST NOT BE CHANGED. If it is
      * changed, then the database has to be rebuilt.
      */
-    private static final int MAX_FILES_HINT = 50_000_000;
+    private static final int MAX_FILES_HINT = 500_000_000;
 
     private final ConfigProvider configProvider;
     private Supplier<VirtualMapLike<VirtualBlobKey, VirtualBlobValue>> fss;
diff --git a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/state/InitialModServiceContractSchema.java b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/state/InitialModServiceContractSchema.java
index ea2d58666654..269c5abd0220 100644
--- a/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/state/InitialModServiceContractSchema.java
+++ b/hedera-node/hedera-smart-contract-service-impl/src/main/java/com/hedera/node/app/service/contract/impl/state/InitialModServiceContractSchema.java
@@ -54,8 +54,8 @@ public class InitialModServiceContractSchema extends Schema {
     private static final Logger log = LogManager.getLogger(InitialModServiceContractSchema.class);
     public static final String STORAGE_KEY = "STORAGE";
     public static final String BYTECODE_KEY = "BYTECODE";
-    private static final int MAX_BYTECODES = 50_000_000;
-    private static final int MAX_STORAGE_ENTRIES = 500_000_000;
+    private static final int MAX_BYTECODES = 500_000_000;
+    private static final int MAX_STORAGE_ENTRIES = 1_000_000_000;
 
     private VirtualMapLike<ContractKey, IterableContractValue> storageFromState;
     private Supplier<VirtualMapLike<VirtualBlobKey, VirtualBlobValue>> contractBytecodeFromState;
diff --git a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/schemas/InitialModServiceTokenSchema.java b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/schemas/InitialModServiceTokenSchema.java
index 5ef92d437ee1..3d7bdbf003cf 100644
--- a/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/schemas/InitialModServiceTokenSchema.java
+++ b/hedera-node/hedera-token-service-impl/src/main/java/com/hedera/node/app/service/token/impl/schemas/InitialModServiceTokenSchema.java
@@ -103,10 +103,10 @@ public class InitialModServiceTokenSchema extends Schema {
     // These need to be big so databases are created at right scale. If they are too small then the on disk hash map
     // buckets will be too full which results in very poor performance. Have chosen 10 billion as should give us
     // plenty of runway.
-    private static final long MAX_TOKENS = 10_000_000_000L;
-    private static final long MAX_ACCOUNTS = 10_000_000_000L;
-    private static final long MAX_TOKEN_RELS = 10_000_000_000L;
-    private static final long MAX_MINTABLE_NFTS = 10_000_000_000L;
+    private static final long MAX_TOKENS = 1_000_000_000L;
+    private static final long MAX_ACCOUNTS = 1_000_000_000L;
+    private static final long MAX_TOKEN_RELS = 1_000_000_000L;
+    private static final long MAX_MINTABLE_NFTS = 1_000_000_000L;
     private static final long FIRST_RESERVED_SYSTEM_CONTRACT = 350L;
     private static final long LAST_RESERVED_SYSTEM_CONTRACT = 399L;
     private static final long FIRST_POST_SYSTEM_FILE_ENTITY = 200L;