diff --git a/boards/arm/akita_gen2_devboard/CMakeLists.txt b/boards/arm/akita_gen2_devboard/CMakeLists.txt
index a700f3c235d0..e048e986e641 100644
--- a/boards/arm/akita_gen2_devboard/CMakeLists.txt
+++ b/boards/arm/akita_gen2_devboard/CMakeLists.txt
@@ -1,3 +1,8 @@
 zephyr_library()
 zephyr_library_sources(pinmux.c)
 zephyr_library_include_directories(${PROJECT_SOURCE_DIR}/drivers)
+
+zephyr_compile_definitions(
+    -DFLASH_AREA_NFFS_OFFSET=0
+    -DFLASH_AREA_NFFS_SIZE=8192
+)
diff --git a/boards/arm/akita_gen2_devboard/Kconfig.defconfig b/boards/arm/akita_gen2_devboard/Kconfig.defconfig
index 28e72f758bbe..fda711afbce7 100644
--- a/boards/arm/akita_gen2_devboard/Kconfig.defconfig
+++ b/boards/arm/akita_gen2_devboard/Kconfig.defconfig
@@ -98,7 +98,31 @@ if FLASH
 	config SPI_FLASH_W25QXXXX_SPI_SLAVE
 		default 0
 
-endif # SPI_FLASH_W25QXXXX
+endif # FLASH
+
+
+if FILE_SYSTEM_NFFS
+
+	config FS_NFFS_FLASH_DEV_NAME
+		default "W25QXXXX"
+	config FS_NFFS_NUM_INODES
+		default 100
+	config FS_NFFS_NUM_BLOCKS
+		default 100
+	config FS_NFFS_NUM_FILES
+		default 4
+	config FS_NFFS_NUM_DIRS
+		default 4
+	config FS_NFFS_NUM_CACHE_INODES
+		default 1
+	config FS_NFFS_NUM_CACHE_BLOCKS
+		default 1
+	config NFFS_FILESYSTEM_MAX_AREAS
+		default 8
+	config NFFS_FILESYSTEM_MAX_BLOCK_SIZE
+		default 256
+
+endif # FILE_SYSTEM_NFFS
 
 
 if FXOS8700
diff --git a/samples/json/CMakeLists.txt b/samples/json/CMakeLists.txt
index 0b54c09df878..0c4b9ad2eea0 100644
--- a/samples/json/CMakeLists.txt
+++ b/samples/json/CMakeLists.txt
@@ -1,11 +1,6 @@
 include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
 project(NONE)
 
-zephyr_compile_definitions(
-    -DFLASH_AREA_NFFS_OFFSET=0
-    -DFLASH_AREA_NFFS_SIZE=8192
-)
-
 target_link_libraries(app NFFS)
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
diff --git a/samples/json/prj.conf b/samples/json/prj.conf
index ee8fe5f53461..6ce54ab3756c 100644
--- a/samples/json/prj.conf
+++ b/samples/json/prj.conf
@@ -4,3 +4,4 @@ CONFIG_FLASH=y
 CONFIG_FILE_SYSTEM=y
 CONFIG_FILE_SYSTEM_NFFS=y
 CONFIG_JSON_LIBRARY=y
+CONFIG_MAIN_STACK_SIZE=2048
diff --git a/samples/nffs/CMakeLists.txt b/samples/nffs/CMakeLists.txt
index 0b54c09df878..0c4b9ad2eea0 100644
--- a/samples/nffs/CMakeLists.txt
+++ b/samples/nffs/CMakeLists.txt
@@ -1,11 +1,6 @@
 include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
 project(NONE)
 
-zephyr_compile_definitions(
-    -DFLASH_AREA_NFFS_OFFSET=0
-    -DFLASH_AREA_NFFS_SIZE=8192
-)
-
 target_link_libraries(app NFFS)
 FILE(GLOB app_sources src/*.c)
 target_sources(app PRIVATE ${app_sources})
diff --git a/samples/nffs/prj.conf b/samples/nffs/prj.conf
index 5474c0acc756..79d522391ff4 100644
--- a/samples/nffs/prj.conf
+++ b/samples/nffs/prj.conf
@@ -3,3 +3,4 @@ CONFIG_FLASH=y
 CONFIG_FILE_SYSTEM=y
 CONFIG_FILE_SYSTEM_NFFS=y
 CONFIG_SPI=y
+CONFIG_MAIN_STACK_SIZE=2048