diff --git a/openair2/COMMON/platform_constants.h b/openair2/COMMON/platform_constants.h
index 59602b9bb984b6616ba46e9687c8f026be6d05b2..8e67e96f616baf38f0bf53d03575342708ced96c 100644
--- a/openair2/COMMON/platform_constants.h
+++ b/openair2/COMMON/platform_constants.h
@@ -75,11 +75,11 @@
 #    define MAX_eNB                      2
 #    define MAX_gNB                      2
 # else
-#    define MAX_MOBILES_PER_ENB         4
-#    define MAX_MOBILES_PER_ENB_NB_IoT  4
-#    define MAX_MOBILES_PER_GNB         4
-#    define MAX_eNB                      1
-#    define MAX_gNB                      1
+#    define MAX_MOBILES_PER_ENB         16
+#    define MAX_MOBILES_PER_ENB_NB_IoT  16
+#    define MAX_MOBILES_PER_GNB         16
+#    define MAX_eNB                      2
+#    define MAX_gNB                      2
 # endif
 #else
 #    define MAX_MOBILES_PER_ENB         256
@@ -89,8 +89,8 @@
 #    define MAX_gNB                      2
 #endif
 
-#define NUMBER_OF_NR_DLSCH_MAX 4
-#define NUMBER_OF_NR_ULSCH_MAX 4
+#define NUMBER_OF_NR_DLSCH_MAX 16
+#define NUMBER_OF_NR_ULSCH_MAX 16
 
 #define MAX_MANAGED_ENB_PER_MOBILE  2
 #define MAX_MANAGED_GNB_PER_MOBILE  2
diff --git a/targets/COMMON/openairinterface5g_limits.h b/targets/COMMON/openairinterface5g_limits.h
index 9b4ee23dc8bc1e179cfa95616b3703a235d68bec..9645acf4ddb4bb30ce2a395df81cc32ea2319b17 100644
--- a/targets/COMMON/openairinterface5g_limits.h
+++ b/targets/COMMON/openairinterface5g_limits.h
@@ -8,10 +8,10 @@
 #        define NUMBER_OF_NR_RU_MAX 2
 #        ifndef PHYSIM
 #        ifndef UE_EXPANSION
-#                define NUMBER_OF_UE_MAX 4
-#                define NUMBER_OF_NR_UE_MAX 4
-#                define NUMBER_OF_CONNECTED_eNB_MAX 1
-#                define NUMBER_OF_CONNECTED_gNB_MAX 1
+#                define NUMBER_OF_UE_MAX 16
+#                define NUMBER_OF_NR_UE_MAX 16
+#                define NUMBER_OF_CONNECTED_eNB_MAX 3
+#                define NUMBER_OF_CONNECTED_gNB_MAX 3
 #        else
 #                define NUMBER_OF_UE_MAX 256
 #                define NUMBER_OF_NR_UE_MAX 256