diff --git a/RNode_Firmware.ino b/RNode_Firmware.ino
index 0b8f7f31..e3abb25e 100644
--- a/RNode_Firmware.ino
+++ b/RNode_Firmware.ino
@@ -233,7 +233,7 @@ RNS::Interface lora_interface(RNS::Type::NONE);
 #if defined(RNS_USE_FS)
   // CBA microStore
   #if MCU_VARIANT == MCU_ESP32
-    #if defined(USTORE_USE_SD)
+    #if defined(HAS_SDCARD)
       #include <microStore/Adapters/SDFileSystem.h>
       microStore::FileSystem filesystem{microStore::Adapters::SDFileSystem(SDCARD_SCLK, SDCARD_MISO, SDCARD_MOSI, SDCARD_CS)};
     #else
@@ -253,6 +253,7 @@ RNS::Interface lora_interface(RNS::Type::NONE);
     microStore::FileSystem filesystem{microStore::Adapters::PosixFileSystem()};
   #endif
   #else // RNS_USE_FS
+    #include <microStore/Adapters/NoopFileSystem.h>
     microStore::FileSystem filesystem{microStore::Adapters::NoopFileSystem()};
   #endif // RNS_USE_FS
 #endif  // HAS_RNS
@@ -597,17 +598,13 @@ void setup() {
   try {
     // CBA Init filesystem
     HEAD("Initializing filesystem...", RNS::LOG_TRACE);
-#if MCU_VARIANT == MCU_NRF52
+#if MCU_VARIANT == MCU_NRF52 && RNS_USE_FS
     // First attempt to initialize RAK15001 flash
     TRACE("Looking for RAK15001 flash...");
     static const SPIFlash_Device_t device_rak15001 = RAK15001;
     filesystem = microStore::Adapters::FlashFSFileSystem(&device_rak15001);
     if (filesystem.init()) {
       TRACE("Initialized RAK15001 flash");
-      // Raise path store limits to account for larger external flash size
-      RNS::Transport::path_table_maxsize(500);
-      RNS::Transport::path_store_segment_size(24576);
-      RNS::Transport::path_store_segment_count(8);
     }
     else {
       // Finaly attempt to initialize internl flash
diff --git a/platformio.ini b/platformio.ini
index ca9d1aad..93080868 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -66,7 +66,6 @@ board_build.filesystem = littlefs
 build_flags =
 	${env.build_flags}
 	-DBOARD_MODEL=BOARD_RNODE_NG_20
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=500
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -86,7 +85,6 @@ board_build.filesystem = littlefs
 build_flags =
 	${env.build_flags}
 	-DBOARD_MODEL=BOARD_RNODE_NG_21
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=500
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -112,7 +110,6 @@ board_build.filesystem = littlefs
 build_flags =
 	${env.build_flags}
 	-DBOARD_MODEL=BOARD_TBEAM
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=500
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -138,7 +135,6 @@ build_flags =
 	${env.build_flags}
 	-DBOARD_MODEL=BOARD_TBEAM
 	-DMODEM=SX1262
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=500
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -166,7 +162,6 @@ build_flags =
 	-DMODEM=SX1262
     -DBOARD_HAS_PSRAM=1
 	-DRNS_CONTAINER_ALLOCATOR=RNS_PSRAM_ALLOCATOR
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=2000
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=98304 ; 96 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -196,7 +191,6 @@ build_flags =
 	-DMODEM=SX1262
     -DBOARD_HAS_PSRAM=1
 	-DRNS_CONTAINER_ALLOCATOR=RNS_PSRAM_ALLOCATOR
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=2000
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=98304 ; 96 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -224,7 +218,6 @@ build_flags =
 	-DMODEM=SX1276
     -DBOARD_HAS_PSRAM=1
 	-DRNS_CONTAINER_ALLOCATOR=RNS_PSRAM_ALLOCATOR
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=2000
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=98304 ; 96 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -252,7 +245,6 @@ build_flags =
 	-DMODEM=SX1280
     -DBOARD_HAS_PSRAM=1
 	-DRNS_CONTAINER_ALLOCATOR=RNS_PSRAM_ALLOCATOR
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=2000
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=98304 ; 96 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -293,7 +285,6 @@ build_flags =
     ; -UARDUINO_USB_CDC_ON_BOOT
     -DBOARD_HAS_PSRAM=1
 	-DRNS_CONTAINER_ALLOCATOR=RNS_PSRAM_ALLOCATOR
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=2000
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=98304 ; 96 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -318,7 +309,6 @@ board_build.filesystem = littlefs
 build_flags =
 	${env.build_flags}
 	-DBOARD_MODEL=BOARD_LORA32_V1_0
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=500
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -343,7 +333,6 @@ board_build.filesystem = littlefs
 build_flags =
 	${env.build_flags}
 	-DBOARD_MODEL=BOARD_LORA32_V2_0
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=500
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -369,7 +358,6 @@ build_flags =
 	${env.build_flags}
 	-DBOARD_MODEL=BOARD_LORA32_V1_0
 	-DEXTERNAL_LEDS=true
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=500
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -399,7 +387,6 @@ build_flags =
 	-DSDCARD_MISO=2
 	-DSDCARD_MOSI=15
 	-DSDCARD_CS=13
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=500
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -425,7 +412,6 @@ build_flags =
 	${env.build_flags}
 	-DBOARD_MODEL=BOARD_LORA32_V2_1
 	-DEXTERNAL_LEDS=true
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=500
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -451,7 +437,6 @@ build_flags =
 	${env.build_flags}
 	-DBOARD_MODEL=BOARD_LORA32_V2_1
 	-DENABLE_TCXO=true
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=500
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -476,7 +461,6 @@ board_build.filesystem = littlefs
 build_flags =
 	${env.build_flags}
 	-DBOARD_MODEL=BOARD_LORA32_V2_1
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=500
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -502,7 +486,6 @@ build_flags =
 	${env.build_flags}
 	-DBOARD_MODEL=BOARD_LORA32_V2_1
 	-DEXTERNAL_LEDS=true
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=500
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -529,7 +512,6 @@ build_flags =
 	-DBOARD_MODEL=BOARD_HELTEC32_V3
 	; CBA BOARD_HAS_PSRAM=1 causes malloc to automatically use PSRAM
     ;-DBOARD_HAS_PSRAM=1
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=500
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -561,7 +543,6 @@ build_flags =
 	-DARDUINO_USB_CDC_ON_BOOT=1
     -DBOARD_HAS_PSRAM=1
 	-DRNS_CONTAINER_ALLOCATOR=RNS_PSRAM_ALLOCATOR
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=2000
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=98304 ; 96 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -585,7 +566,6 @@ board_build.filesystem = littlefs
 build_flags =
 	${env.build_flags}
 	-DBOARD_MODEL=BOARD_HUZZAH32
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=500
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -610,7 +590,6 @@ board_build.filesystem = littlefs
 build_flags =
 	${env.build_flags}
 	-DBOARD_MODEL=BOARD_XIAO_S3
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=500
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -635,8 +614,6 @@ board_build.filesystem = littlefs
 build_flags =
 	${env.build_flags}
 	-DBOARD_MODEL=BOARD_GENERIC_ESP32
-    -DUSTORE_USE_POSIXFS=1
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=500
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -673,8 +650,6 @@ build_flags =
 	-DBOARD_MODEL=BOARD_RAK4631
     -DRNS_CONTAINER_ALLOCATOR=RNS_HEAP_POOL_ALLOCATOR
     -DRNS_HEAP_POOL_BUFFER_SIZE=131072
-    -DUSTORE_USE_INTERNALFS
-    -DUSTORE_USE_FLASHFS
 	-DURTN_PATH_TABLE_MAX_RECS=25
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=2048 ; 2 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=6
@@ -683,7 +658,7 @@ lib_deps =
 	https://github.com/attermann/microStore.git
 	https://github.com/attermann/microReticulum.git
     adafruit/SdFat - Adafruit Fork
-    https://github.com/attermann/Adafruit_SPIFlash#littlefs
+    adafruit/Adafruit SPIFlash
 
 
 
@@ -698,7 +673,6 @@ build_flags =
 	${env.build_flags}
 	-DBOARD_MODEL=BOARD_TBEAM
 	; CBA TEST
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=500
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -722,7 +696,6 @@ build_flags =
 	; CBA TEST
 	;-UHAS_RNS
 	;-DRNS_MEM_LOG
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=500
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -746,7 +719,6 @@ build_flags =
 	; CBA TEST
 	;-UHAS_RNS
 	;-DRNS_MEM_LOG
-    -DUSTORE_USE_SD=1
 	-DSDCARD_SCLK=14
 	-DSDCARD_MISO=2
 	-DSDCARD_MOSI=15
@@ -777,8 +749,6 @@ build_flags =
 	; CBA TEST
 	;-UHAS_RNS
 	;-DRNS_MEM_LOG
-    -DUSTORE_USE_POSIXFS=1
-    ;-DUSTORE_USE_LITTLEFS
 	-DURTN_PATH_TABLE_MAX_RECS=500
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -806,7 +776,6 @@ build_flags =
 	; CBA Define following to enable UDP transport via WiFi
 	-DUDP_TRANSPORT
 	;-DRNS_MEM_LOG
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=500
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=24576 ; 24 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -847,7 +816,6 @@ build_flags =
 	;-DRNS_PSRAM_POOL_BUFFER_SIZE=2000000
 	;-DRNS_PSRAM_POOL_BUFFER_SIZE=1000000
 	;-DRNS_MEM_LOG
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=2000
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=98304 ; 96 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -895,7 +863,6 @@ build_flags =
 	;-DRNS_PSRAM_POOL_BUFFER_SIZE=2000000
 	;-DRNS_PSRAM_POOL_BUFFER_SIZE=1000000
 	;-DRNS_MEM_LOG
-    -DUSTORE_USE_POSIXFS=1
 	-DURTN_PATH_TABLE_MAX_RECS=2000
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=98304 ; 96 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=8
@@ -941,8 +908,6 @@ build_flags =
 	-DRNS_HEAP_POOL_BUFFER_SIZE=131072
 	;-DRNS_HEAP_POOL_BUFFER_SIZE=65536
 	;-UHAS_RNS
-    -DUSTORE_USE_INTERNALFS
-    -DUSTORE_USE_FLASHFS
 	-DURTN_PATH_TABLE_MAX_RECS=25
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=2048 ; 2 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=6
@@ -951,8 +916,7 @@ lib_deps =
 	microStore=symlink://../microStore
 	microReticulum=symlink://../microReticulum
     adafruit/SdFat - Adafruit Fork
-    ;https://github.com/attermann/Adafruit_SPIFlash#littlefs
-	Adafruit_SPIFlash=symlink://../Adafruit_SPIFlash
+	adafruit/Adafruit SPIFlash
 
 ; MCU: Nordic nRF52840 (32-bit ARM Cortex-M4, 64 MHz)
 ; SRAM: 256 KB
@@ -981,7 +945,6 @@ build_flags =
 	; CBA TEST
 	-DRNS_DEFAULT_ALLOCATOR=RNS_HEAP_POOL_ALLOCATOR
 	-DRNS_HEAP_POOL_BUFFER_SIZE=204800
-    -DUSTORE_USE_INTERNALFS
 	-DURTN_PATH_TABLE_MAX_RECS=25
 	-DRNS_PATH_TABLE_SEGMENT_SIZE=2048 ; 2 KB
 	-DRNS_PATH_TABLE_SEGMENT_COUNT=6
@@ -991,3 +954,4 @@ lib_deps =
 	adafruit/Adafruit NeoPixel@^1.12.0
 	microStore=symlink://../microStore
 	microReticulum=symlink://../microReticulum
+	adafruit/Adafruit SPIFlash