diff --git a/.github/workflows/build_parallel.yml b/.github/workflows/build_parallel.yml
index 77c2369..a0582d1 100644
--- a/.github/workflows/build_parallel.yml
+++ b/.github/workflows/build_parallel.yml
@@ -18,7 +18,7 @@ jobs:
       matrix:
         board:
           - { name: "Flipper Zero WiFi Dev Board",   flag: "MARAUDER_FLIPPER",         fbqn: "esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=4M,PSRAM=enabled",                     file_name: "flipper",                 tft: false, tft_file: "",                                   build_dir: "esp32s2",                    addr: "0x1000" }
-          - { name: "Flipper Zero Multi Board",      flag: "MARAUDER_FLIPPER",         fbqn: "esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=8M,PSRAM=enabled",                     file_name: "multiboardS3",            tft: false, tft_file: "",                                   build_dir: "esp32s3",                    addr: "0x0" }
+          - { name: "Flipper Zero Multi Board S3",   flag: "MARAUDER_MULTIBOARD_S3",   fbqn: "esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=4M",                                   file_name: "multiboardS3",            tft: false, tft_file: "",                                   build_dir: "esp32s3",                    addr: "0x0" }
           - { name: "OG Marauder",                   flag: "MARAUDER_V4",              fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "og",                      tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000" }
           - { name: "Marauder v6",                   flag: "MARAUDER_V6",              fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "v6",                      tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000" }
           - { name: "Marauder v6.1",                 flag: "MARAUDER_V6_1",            fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs",                                                    file_name: "v6_1",                    tft: true,  tft_file: "User_Setup_og_marauder.h",           build_dir: "d32",                        addr: "0x1000" }
@@ -129,7 +129,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: h2zero/NimBLE-Arduino
-          ref: 1.3.5
+          ref: 1.3.8
           path: CustomNimBLE-Arduino
 
       - name: Install Adafruit_NeoPixel
diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp
index bd7b9e5..d16d8ef 100644
--- a/esp32_marauder/WiFiScan.cpp
+++ b/esp32_marauder/WiFiScan.cpp
@@ -3434,7 +3434,7 @@ void WiFiScan::RunSourApple(uint8_t scan_mode, uint16_t color) {
       display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK);
     #endif
 
-    this->ble_initialized;
+    this->ble_initialized = true;
 
     #ifdef HAS_FLIPPER_LED
       flipper_led.sniffLED();
@@ -3480,7 +3480,7 @@ void WiFiScan::RunSwiftpairSpam(uint8_t scan_mode, uint16_t color) {
       display_obj.tft.setTextColor(TFT_GREEN, TFT_BLACK);
     #endif
 
-    this->ble_initialized;
+    this->ble_initialized = true;
 
     #ifdef HAS_FLIPPER_LED
       flipper_led.attackLED();
diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h
index 40d1878..c45f5fa 100644
--- a/esp32_marauder/configs.h
+++ b/esp32_marauder/configs.h
@@ -18,6 +18,7 @@
   //#define MARAUDER_KIT
   //#define GENERIC_ESP32
   //#define MARAUDER_FLIPPER
+  //#define MARAUDER_MULTIBOARD_S3
   //#define ESP32_LDDB
   //#define MARAUDER_DEV_BOARD_PRO
   //#define XIAO_ESP32_S3
@@ -60,6 +61,8 @@
     #define HARDWARE_NAME "Marauder Kit"
   #elif defined(MARAUDER_FLIPPER)
     #define HARDWARE_NAME "Flipper Zero Dev Board"
+  #elif defined(MARAUDER_MULTIBOARD_S3)
+    #define HARDWARE_NAME "Flipper Zero Multi Board S3"
   #elif defined(ESP32_LDDB)
     #define HARDWARE_NAME "ESP32 LDDB"
   #elif defined(MARAUDER_DEV_BOARD_PRO)
@@ -292,6 +295,22 @@
     //#define HAS_TEMP_SENSOR
   #endif
 
+  #ifdef MARAUDER_MULTIBOARD_S3
+    #define HAS_FLIPPER_LED
+    //#define FLIPPER_ZERO_HAT
+    //#define HAS_BATTERY
+    #define HAS_BT
+    //#define HAS_BUTTONS
+    //#define HAS_NEOPIXEL_LED
+    //#define HAS_PWR_MGMT
+    //#define HAS_SCREEN
+    #define HAS_GPS
+    #define HAS_SD
+    #define USE_SD
+    //#define HAS_PSRAM
+    //#define HAS_TEMP_SENSOR
+  #endif
+
   #ifdef ESP32_LDDB
     //#define FLIPPER_ZERO_HAT
     //#define HAS_BATTERY
@@ -1666,6 +1685,10 @@
       #define SD_CS 10
     #endif
 
+    #ifdef MARAUDER_MULTIBOARD_S3
+      #define SD_CS 10
+    #endif
+
     #ifdef ESP32_LDDB
       #define SD_CS 4
     #endif
@@ -1761,6 +1784,8 @@
     #define MEM_LOWER_LIM 10000
   #elif defined(MARAUDER_FLIPPER)
     #define MEM_LOWER_LIM 10000
+  #elif defined(MARAUDER_MULTIBOARD_S3)
+    #define MEM_LOWER_LIM 10000
   #elif defined(ESP32_LDDB)
     #define MEM_LOWER_LIM 10000
   #elif defined(MARAUDER_DEV_BOARD_PRO)
@@ -1852,6 +1877,10 @@
       #define GPS_SERIAL_INDEX 1
       #define GPS_TX 9
       #define GPS_RX 21
+    #elif defined(MARAUDER_MULTIBOARD_S3)
+      #define GPS_SERIAL_INDEX 1
+      #define GPS_TX 9
+      #define GPS_RX 21
     #elif defined(MARAUDER_M5STICKC)
       #define GPS_SERIAL_INDEX 1
       #define GPS_TX 33
@@ -1999,6 +2028,12 @@
       #define R_PIN 6
     #endif
 
+    #ifdef MARAUDER_MULTIBOARD_S3
+      #define B_PIN 4
+      #define G_PIN 5
+      #define R_PIN 6
+    #endif
+
     #ifdef MARAUDER_CYD_MICRO
       #define B_PIN 17
       #define G_PIN 16