diff --git a/boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig b/boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig
index ab74ee360f..3a27d4f12a 100644
--- a/boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig
+++ b/boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig
@@ -945,7 +945,7 @@ CONFIG_SCHED_LPWORKSTACKSIZE=1800
 # Stack and heap information
 #
 CONFIG_IDLETHREAD_STACKSIZE=750
-CONFIG_USERMAIN_STACKSIZE=2500
+CONFIG_USERMAIN_STACKSIZE=2624
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_PTHREAD_STACK_DEFAULT=2048
 # CONFIG_LIB_SYSCALL is not set
diff --git a/boards/auav/x21/nuttx-config/nsh/defconfig b/boards/auav/x21/nuttx-config/nsh/defconfig
index 280caae4b1..7e06e6773c 100644
--- a/boards/auav/x21/nuttx-config/nsh/defconfig
+++ b/boards/auav/x21/nuttx-config/nsh/defconfig
@@ -945,7 +945,7 @@ CONFIG_SCHED_LPWORKSTACKSIZE=1800
 # Stack and heap information
 #
 CONFIG_IDLETHREAD_STACKSIZE=750
-CONFIG_USERMAIN_STACKSIZE=2500
+CONFIG_USERMAIN_STACKSIZE=2624
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_PTHREAD_STACK_DEFAULT=2048
 # CONFIG_LIB_SYSCALL is not set
diff --git a/boards/av/x-v1/nuttx-config/nsh/defconfig b/boards/av/x-v1/nuttx-config/nsh/defconfig
index 9463490e04..ddaf6fd1b9 100644
--- a/boards/av/x-v1/nuttx-config/nsh/defconfig
+++ b/boards/av/x-v1/nuttx-config/nsh/defconfig
@@ -761,7 +761,7 @@ CONFIG_SCHED_LPWORKSTACKSIZE=1800
 # Stack and heap information
 #
 CONFIG_IDLETHREAD_STACKSIZE=750
-CONFIG_USERMAIN_STACKSIZE=2500
+CONFIG_USERMAIN_STACKSIZE=2624
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_PTHREAD_STACK_DEFAULT=2048
 # CONFIG_LIB_SYSCALL is not set
diff --git a/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig b/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig
index e1db470edb..6801582dfb 100644
--- a/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig
+++ b/boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig
@@ -904,7 +904,7 @@ CONFIG_SCHED_LPWORKSTACKSIZE=1600
 # Stack and heap information
 #
 CONFIG_IDLETHREAD_STACKSIZE=750
-CONFIG_USERMAIN_STACKSIZE=2500
+CONFIG_USERMAIN_STACKSIZE=2624
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_PTHREAD_STACK_DEFAULT=2048
 # CONFIG_LIB_SYSCALL is not set
diff --git a/boards/intel/aerofc-v1/nuttx-config/nsh/defconfig b/boards/intel/aerofc-v1/nuttx-config/nsh/defconfig
index 092bf1824c..28864013f0 100644
--- a/boards/intel/aerofc-v1/nuttx-config/nsh/defconfig
+++ b/boards/intel/aerofc-v1/nuttx-config/nsh/defconfig
@@ -921,7 +921,7 @@ CONFIG_SCHED_LPWORKSTACKSIZE=1800
 # Stack and heap information
 #
 CONFIG_IDLETHREAD_STACKSIZE=750
-CONFIG_USERMAIN_STACKSIZE=2500
+CONFIG_USERMAIN_STACKSIZE=2624
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_PTHREAD_STACK_DEFAULT=2048
 # CONFIG_LIB_SYSCALL is not set
diff --git a/boards/omnibus/f4sd/nuttx-config/nsh/defconfig b/boards/omnibus/f4sd/nuttx-config/nsh/defconfig
index 410e52e571..1f5fee0b2e 100644
--- a/boards/omnibus/f4sd/nuttx-config/nsh/defconfig
+++ b/boards/omnibus/f4sd/nuttx-config/nsh/defconfig
@@ -918,7 +918,7 @@ CONFIG_SCHED_LPWORKSTACKSIZE=1800
 # Stack and heap information
 #
 CONFIG_IDLETHREAD_STACKSIZE=750
-CONFIG_USERMAIN_STACKSIZE=2600
+CONFIG_USERMAIN_STACKSIZE=2624
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_PTHREAD_STACK_DEFAULT=2048
 # CONFIG_LIB_SYSCALL is not set
diff --git a/boards/px4/fmu-v2/nuttx-config/nsh/defconfig b/boards/px4/fmu-v2/nuttx-config/nsh/defconfig
index ad44eb91e6..5593b33d23 100644
--- a/boards/px4/fmu-v2/nuttx-config/nsh/defconfig
+++ b/boards/px4/fmu-v2/nuttx-config/nsh/defconfig
@@ -945,7 +945,7 @@ CONFIG_SCHED_LPWORKSTACKSIZE=1800
 # Stack and heap information
 #
 CONFIG_IDLETHREAD_STACKSIZE=750
-CONFIG_USERMAIN_STACKSIZE=2500
+CONFIG_USERMAIN_STACKSIZE=2624
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_PTHREAD_STACK_DEFAULT=2048
 # CONFIG_LIB_SYSCALL is not set
diff --git a/boards/px4/fmu-v3/nuttx-config/nsh/defconfig b/boards/px4/fmu-v3/nuttx-config/nsh/defconfig
index ad44eb91e6..5593b33d23 100644
--- a/boards/px4/fmu-v3/nuttx-config/nsh/defconfig
+++ b/boards/px4/fmu-v3/nuttx-config/nsh/defconfig
@@ -945,7 +945,7 @@ CONFIG_SCHED_LPWORKSTACKSIZE=1800
 # Stack and heap information
 #
 CONFIG_IDLETHREAD_STACKSIZE=750
-CONFIG_USERMAIN_STACKSIZE=2500
+CONFIG_USERMAIN_STACKSIZE=2624
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_PTHREAD_STACK_DEFAULT=2048
 # CONFIG_LIB_SYSCALL is not set
diff --git a/boards/px4/fmu-v3/nuttx-config/stackcheck/defconfig b/boards/px4/fmu-v3/nuttx-config/stackcheck/defconfig
index 6d8302caab..22500093f5 100644
--- a/boards/px4/fmu-v3/nuttx-config/stackcheck/defconfig
+++ b/boards/px4/fmu-v3/nuttx-config/stackcheck/defconfig
@@ -956,7 +956,7 @@ CONFIG_SCHED_LPWORKSTACKSIZE=1800
 # Stack and heap information
 #
 CONFIG_IDLETHREAD_STACKSIZE=750
-CONFIG_USERMAIN_STACKSIZE=2500
+CONFIG_USERMAIN_STACKSIZE=2624
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_PTHREAD_STACK_DEFAULT=2048
 # CONFIG_LIB_SYSCALL is not set
diff --git a/boards/px4/fmu-v4/nuttx-config/nsh/defconfig b/boards/px4/fmu-v4/nuttx-config/nsh/defconfig
index b647871dae..f272d8cdf2 100755
--- a/boards/px4/fmu-v4/nuttx-config/nsh/defconfig
+++ b/boards/px4/fmu-v4/nuttx-config/nsh/defconfig
@@ -944,7 +944,7 @@ CONFIG_SCHED_LPWORKSTACKSIZE=1800
 # Stack and heap information
 #
 CONFIG_IDLETHREAD_STACKSIZE=750
-CONFIG_USERMAIN_STACKSIZE=2600
+CONFIG_USERMAIN_STACKSIZE=2624
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_PTHREAD_STACK_DEFAULT=2048
 # CONFIG_LIB_SYSCALL is not set
diff --git a/boards/px4/fmu-v4/nuttx-config/stackcheck/defconfig b/boards/px4/fmu-v4/nuttx-config/stackcheck/defconfig
index cefb4635fd..cc17655f70 100644
--- a/boards/px4/fmu-v4/nuttx-config/stackcheck/defconfig
+++ b/boards/px4/fmu-v4/nuttx-config/stackcheck/defconfig
@@ -944,7 +944,7 @@ CONFIG_SCHED_LPWORKSTACKSIZE=1800
 # Stack and heap information
 #
 CONFIG_IDLETHREAD_STACKSIZE=750
-CONFIG_USERMAIN_STACKSIZE=2600
+CONFIG_USERMAIN_STACKSIZE=2624
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_PTHREAD_STACK_DEFAULT=2048
 # CONFIG_LIB_SYSCALL is not set
diff --git a/boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig b/boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig
index 5f2de83f99..6fd153f903 100644
--- a/boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig
+++ b/boards/px4/fmu-v4pro/nuttx-config/nsh/defconfig
@@ -948,7 +948,7 @@ CONFIG_SCHED_LPWORKSTACKSIZE=1800
 # Stack and heap information
 #
 CONFIG_IDLETHREAD_STACKSIZE=750
-CONFIG_USERMAIN_STACKSIZE=2500
+CONFIG_USERMAIN_STACKSIZE=2624
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_PTHREAD_STACK_DEFAULT=2048
 # CONFIG_LIB_SYSCALL is not set
diff --git a/boards/px4/fmu-v5/nuttx-config/nsh/defconfig b/boards/px4/fmu-v5/nuttx-config/nsh/defconfig
index 98630318ee..79fa96c122 100644
--- a/boards/px4/fmu-v5/nuttx-config/nsh/defconfig
+++ b/boards/px4/fmu-v5/nuttx-config/nsh/defconfig
@@ -734,7 +734,7 @@ CONFIG_SCHED_LPWORKSTACKSIZE=1800
 # Stack and heap information
 #
 CONFIG_IDLETHREAD_STACKSIZE=750
-CONFIG_USERMAIN_STACKSIZE=2500
+CONFIG_USERMAIN_STACKSIZE=2624
 CONFIG_PTHREAD_STACK_MIN=512
 CONFIG_PTHREAD_STACK_DEFAULT=2048
 # CONFIG_LIB_SYSCALL is not set