diff --git a/zephcore/boards/common/mg24_common.conf b/zephcore/boards/common/mg24_common.conf
index f982a35..8e7b4ef 100644
--- a/zephcore/boards/common/mg24_common.conf
+++ b/zephcore/boards/common/mg24_common.conf
@@ -25,13 +25,6 @@ CONFIG_ASSERT=y
 # Silabs BLE stack requires larger heap (override zephcore_common 2KB default)
 CONFIG_HEAP_MEM_POOL_SIZE=32768
 
-# ========== Storage ==========
-# BLE bonds via file-based settings on LittleFS (same as nRF52)
-CONFIG_NVS=n
-CONFIG_SETTINGS_NVS=n
-CONFIG_SETTINGS_FILE=y
-CONFIG_SETTINGS_FILE_PATH="/lfs/settings"
-
 # ========== ADC ==========
 # No battery voltage divider on MG24 boards — disable ADC driver
 CONFIG_ADC=n
diff --git a/zephcore/boards/common/nrf52_common.conf b/zephcore/boards/common/nrf52_common.conf
index f15c061..a240565 100644
--- a/zephcore/boards/common/nrf52_common.conf
+++ b/zephcore/boards/common/nrf52_common.conf
@@ -35,13 +35,6 @@ CONFIG_SOC_FLASH_NRF_PARTIAL_ERASE=y
 # Boards with QSPI (Wio Tracker L1) override in board.conf.
 CONFIG_NORDIC_QSPI_NOR=n
 
-# ========== Storage ==========
-# BLE bonds via file-based settings on LittleFS (replaces NVS).
-CONFIG_NVS=n
-CONFIG_SETTINGS_NVS=n
-CONFIG_SETTINGS_FILE=y
-CONFIG_SETTINGS_FILE_PATH="/lfs/settings"
-
 # ========== SEGGER RTT (J-Link debug) ==========
 # RTT log backend is in boards/common/logging.conf (only included for debug builds).
 CONFIG_USE_SEGGER_RTT=y
diff --git a/zephcore/boards/common/zephcore_common.conf b/zephcore/boards/common/zephcore_common.conf
index e1b3d04..39719bc 100644
--- a/zephcore/boards/common/zephcore_common.conf
+++ b/zephcore/boards/common/zephcore_common.conf
@@ -152,10 +152,14 @@ CONFIG_SETTINGS_RUNTIME=y
 # ========== Flash & Storage (common to ALL platforms) ==========
 CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
-CONFIG_NVS=y
-CONFIG_SETTINGS=y
-CONFIG_SETTINGS_NVS=y
 CONFIG_FLASH_PAGE_LAYOUT=y
+CONFIG_SETTINGS=y
+
+# BLE bonds via file-based settings on LittleFS (all platforms)
+CONFIG_NVS=n
+CONFIG_SETTINGS_NVS=n
+CONFIG_SETTINGS_FILE=y
+CONFIG_SETTINGS_FILE_PATH="/lfs/settings"
 
 # LittleFS for DataStore
 CONFIG_FILE_SYSTEM=y
diff --git a/zephcore/boards/mg24/xiao_mg24/board.overlay b/zephcore/boards/mg24/xiao_mg24/board.overlay
index 180fea6..9320ecc 100644
--- a/zephcore/boards/mg24/xiao_mg24/board.overlay
+++ b/zephcore/boards/mg24/xiao_mg24/board.overlay
@@ -21,10 +21,6 @@
 		lora0 = &lora;
 	};
 
-	chosen {
-		zephyr,settings-partition = &storage_partition;
-	};
-
 	/* No battery voltage divider on this board — disable ADC battery reading */
 	/delete-node/ zephyr,user;
 };
@@ -76,8 +72,7 @@
  *
  * 0x00000 - 0x0C000   (48KB)   MCUboot (reserved)
  * 0x0C000 - 0x15C000  (1344KB) Application (slot0 — expanded into slot1 space)
- * 0x15C000 - 0x160000 (16KB)   NVS storage (BLE bonds) — 2 sectors × 8KB
- * 0x160000 - 0x180000 (128KB)  LittleFS (identity, contacts, channels)
+ * 0x15C000 - 0x180000 (144KB)  LittleFS (identity, contacts, channels, BLE bonds)
  */
 /delete-node/ &slot0_partition;
 /delete-node/ &slot1_partition;
@@ -91,16 +86,10 @@
 			reg = <0x0C000 0x150000>;  /* 1344KB */
 		};
 
-		/* NVS 16KB for BLE bonds + settings (2 × 8KB sectors) */
-		storage_partition: partition@15c000 {
-			label = "storage";
-			reg = <0x15C000 0x4000>;
-		};
-
-		/* LittleFS 128KB for DataStore */
-		lfs_partition: partition@160000 {
+		/* LittleFS 144KB for DataStore + file-based BLE settings */
+		lfs_partition: partition@15c000 {
 			label = "lfs";
-			reg = <0x160000 0x20000>;
+			reg = <0x15C000 0x24000>;
 		};
 	};
 };