diff --git a/configs/sama5d4-ek/knsh/defconfig b/configs/sama5d4-ek/knsh/defconfig
index f0b17178e13..560193f4c1a 100644
--- a/configs/sama5d4-ek/knsh/defconfig
+++ b/configs/sama5d4-ek/knsh/defconfig
@@ -281,6 +281,8 @@ CONFIG_ARCH_TEXT_NPAGES=256
 CONFIG_ARCH_DATA_NPAGES=256
 CONFIG_ARCH_HEAP_NPAGES=256
 # CONFIG_ARCH_STACK_DYNAMIC is not set
+CONFIG_ARCH_KERNEL_STACK=y
+CONFIG_ARCH_KERNEL_STACKSIZE=1568
 CONFIG_ARCH_PGPOOL_MAPPING=y
 CONFIG_ARCH_PGPOOL_PBASE=0x28000000
 CONFIG_ARCH_PGPOOL_VBASE=0x28000000
@@ -688,7 +690,6 @@ CONFIG_EOL_IS_EITHER_CRLF=y
 CONFIG_LIBC_EXECFUNCS=y
 # CONFIG_EXECFUNCS_HAVE_SYMTAB is not set
 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
-CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
diff --git a/configs/sama5d4-ek/knsh/defconfig.ROMFS b/configs/sama5d4-ek/knsh/defconfig.ROMFS
index 8b4cbe1b78f..fda9d694dc8 100644
--- a/configs/sama5d4-ek/knsh/defconfig.ROMFS
+++ b/configs/sama5d4-ek/knsh/defconfig.ROMFS
@@ -265,6 +265,8 @@ CONFIG_ARCH_TEXT_NPAGES=256
 CONFIG_ARCH_DATA_NPAGES=256
 CONFIG_ARCH_HEAP_NPAGES=256
 # CONFIG_ARCH_STACK_DYNAMIC is not set
+CONFIG_ARCH_KERNEL_STACK=y
+CONFIG_ARCH_KERNEL_STACKSIZE=1568
 CONFIG_ARCH_PGPOOL_MAPPING=y
 CONFIG_ARCH_PGPOOL_PBASE=0x28000000
 CONFIG_ARCH_PGPOOL_VBASE=0x28000000
@@ -656,7 +658,6 @@ CONFIG_EOL_IS_EITHER_CRLF=y
 CONFIG_LIBC_EXECFUNCS=y
 # CONFIG_EXECFUNCS_HAVE_SYMTAB is not set
 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
-CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y