diff --git a/src/FSCommon.cpp b/src/FSCommon.cpp
index 3b659b67e..64490405f 100644
--- a/src/FSCommon.cpp
+++ b/src/FSCommon.cpp
@@ -16,25 +16,20 @@
 #include "SPILock.h"
 #include <SD.h>
 #include <SPI.h>
-#ifndef SDCARD_USE_HSPI // old ESP32
-#ifdef SDCARD_USE_SPI1
-#ifdef ARCH_ESP32
-SPIClass SPI1(HSPI);
-#endif // ARCH_ESP32
-#ifdef ARCH_NRF52
-#define SDCARD_SPI SPI1
-#endif                 // NRF52
-#define SDHandler SPI1 // only used for esp32
-#else
-#ifdef ARCH_NRF52
-#define SDCARD_SPI SPI
-#endif                // NRF52
-#define SDHandler SPI // only used for esp32
-#endif                // SDCARD_USE_SPI1
-#else
+#if defined(ARCH_ESP32)
+#if defined(SDCARD_USE_HSPI)
 SPIClass SDHandler = SPIClass(HSPI);
+#elif defined(SDCARD_USE_VSPI)
+SPIClass SDHandler = SPIClass(VSPI);
 #endif
-#endif // HAS_SDCARD
+#elif defined(ARCH_NRF52)
+#if defined(SDCARD_USE_SPI1)
+#define SDHandler SPI1  // only used for esp32, SPI selection for NRF52 happens in variant.h (for now)
+#elif defined(SDCARD_USE_SPI)
+#define SDHandler SPI   // only used for esp32
+#endif                  //NRF52 SPI or SPI1
+#endif                // ESP32/NRF52
+#endif                // HAS_SDCARD
 
 #if defined(ARCH_STM32WL)
 
@@ -404,3 +399,4 @@ void setupSDCard()
 #endif
 #endif
 
+}
\ No newline at end of file
diff --git a/variants/CDEBYTE_EoRa-S3/variant.h b/variants/CDEBYTE_EoRa-S3/variant.h
index 5da99667b..854996332 100644
--- a/variants/CDEBYTE_EoRa-S3/variant.h
+++ b/variants/CDEBYTE_EoRa-S3/variant.h
@@ -6,7 +6,7 @@
 
 // SD card - TODO: test, currently untested, copied from T3S3 variant
 #define HAS_SDCARD
-#define SDCARD_USE_SPI1
+#define SDCARD_USE_HSPI
 // TODO: rename this to make this SD-card specific
 #define SPI_CS 13
 #define SPI_SCK 14
diff --git a/variants/bpi_picow_esp32_s3/variant.h b/variants/bpi_picow_esp32_s3/variant.h
index d8d9413d7..fc9064436 100644
--- a/variants/bpi_picow_esp32_s3/variant.h
+++ b/variants/bpi_picow_esp32_s3/variant.h
@@ -5,7 +5,7 @@
 // #define HAS_SCREEN 0
 
 // #define HAS_SDCARD
-// #define SDCARD_USE_SPI1
+// #define SDCARD_USE_HSPI
 
 #define USE_SSD1306
 #define I2C_SDA 12
diff --git a/variants/dreamcatcher/variant.h b/variants/dreamcatcher/variant.h
index 7835979e1..1e04a2b26 100644
--- a/variants/dreamcatcher/variant.h
+++ b/variants/dreamcatcher/variant.h
@@ -70,7 +70,7 @@
 #endif
 
 #define HAS_SDCARD // Have SPI interface SD card slot
-#define SDCARD_USE_SPI1
+#define SDCARD_USE_HSPI
 
 #define LORA_RESET 3
 #define LORA_SCK 12
diff --git a/variants/my_esp32s3_diy_eink/variant.h b/variants/my_esp32s3_diy_eink/variant.h
index 024f912dd..c60e2b0ce 100644
--- a/variants/my_esp32s3_diy_eink/variant.h
+++ b/variants/my_esp32s3_diy_eink/variant.h
@@ -4,7 +4,7 @@
 
 // #define HAS_SCREEN 0
 // #define HAS_SDCARD
-// #define SDCARD_USE_SPI1
+// #define SDCARD_USE_HSPI
 
 // #define USE_SSD1306
 
diff --git a/variants/tbeam-s3-core/variant.h b/variants/tbeam-s3-core/variant.h
index cc706459f..fd7649265 100644
--- a/variants/tbeam-s3-core/variant.h
+++ b/variants/tbeam-s3-core/variant.h
@@ -58,7 +58,7 @@
 #define GPS_1PPS_PIN 6
 
 #define HAS_SDCARD // Have SPI interface SD card slot
-#define SDCARD_USE_SPI1
+#define SDCARD_USE_HSPI
 
 // PCF8563 RTC Module
 // #define PCF8563_RTC 0x51         //Putting definitions in variant. h does not compile correctly
diff --git a/variants/tlora_t3s3_epaper/variant.h b/variants/tlora_t3s3_epaper/variant.h
index 732869b20..1dad897cf 100644
--- a/variants/tlora_t3s3_epaper/variant.h
+++ b/variants/tlora_t3s3_epaper/variant.h
@@ -1,5 +1,5 @@
 #define HAS_SDCARD
-#define SDCARD_USE_SPI1
+#define SDCARD_USE_HSPI
 
 // Display (E-Ink)
 #define USE_EINK
diff --git a/variants/tlora_t3s3_v1/variant.h b/variants/tlora_t3s3_v1/variant.h
index babe44a58..63caaaf12 100644
--- a/variants/tlora_t3s3_v1/variant.h
+++ b/variants/tlora_t3s3_v1/variant.h
@@ -1,5 +1,5 @@
 #define HAS_SDCARD
-#define SDCARD_USE_SPI1
+#define SDCARD_USE_HSPI
 
 #define USE_SSD1306
 
@@ -76,4 +76,4 @@
 #endif
 
 #define HAS_SDCARD // Have SPI interface SD card slot
-#define SDCARD_USE_SPI1
\ No newline at end of file
+#define SDCARD_USE_HSPI
\ No newline at end of file