diff --git a/openair2/COMMON/platform_constants.h b/openair2/COMMON/platform_constants.h
index 6d3e1339751ea7b6d31df17f9e0ca58386e31a15..876b99137a938cd5ae3be27f14944edc4da6a6c4 100644
--- a/openair2/COMMON/platform_constants.h
+++ b/openair2/COMMON/platform_constants.h
@@ -85,8 +85,8 @@
       #define MAX_gNB                      2
     #else
     // TODO: Change after gaining stability on 20 UES or less
-      #define MAX_MOBILES_PER_ENB         20
-      #define MAX_MOBILES_PER_ENB_NB_IoT  20
+      #define MAX_MOBILES_PER_ENB         40
+      #define MAX_MOBILES_PER_ENB_NB_IoT  40
       #define MAX_MOBILES_PER_GNB         2//16
       #define MAX_eNB                      2
       #define MAX_gNB                      2
diff --git a/targets/COMMON/openairinterface5g_limits.h b/targets/COMMON/openairinterface5g_limits.h
index 995b8d7c3bab64d58d0fb91e8886e7d9077cad64..82a4f8b6ffee8fbdcf007d5f37cb2d031ef8de53 100644
--- a/targets/COMMON/openairinterface5g_limits.h
+++ b/targets/COMMON/openairinterface5g_limits.h
@@ -14,7 +14,7 @@
 // now , if we use --mu option in UE, compiling error will occur.
 // This problem will be fixed in the future.
 #                ifndef UESIM_EXPANSION
-#                    define NUMBER_OF_UE_MAX 20
+#                    define NUMBER_OF_UE_MAX 40
 #                    define NUMBER_OF_NR_UE_MAX 4
 #                    define NUMBER_OF_UCI_VARS_MAX 14
 #                    define NUMBER_OF_CONNECTED_eNB_MAX 1