diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index dec8411fe..21862b096 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -891,6 +891,15 @@ void NodeDB::installDefaultModuleConfig()
     moduleConfig.ambient_lighting.green = (myNodeInfo.my_node_num & 0x00FF00) >> 8;
     moduleConfig.ambient_lighting.blue = myNodeInfo.my_node_num & 0x0000FF;
 
+#if defined(HAS_SERIAL) && HAS_SERIAL
+    moduleConfig.serial.enabled = true;
+    moduleConfig.serial.baud = meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_38400;
+    moduleConfig.serial.rxd = SERIAL_RX_PIN;
+    moduleConfig.serial.txd = SERIAL_TX_PIN;
+    moduleConfig.serial.timeout = SERIAL_TIMEOUT;
+    moduleConfig.serial.mode = meshtastic_ModuleConfig_SerialConfig_Serial_Mode_PROTO;
+#endif
+
     initModuleConfigIntervals();
 }
 
diff --git a/variants/esp32c6/tanmatsu/platformio.ini b/variants/esp32c6/tanmatsu/platformio.ini
new file mode 100644
index 000000000..f4f5c48f6
--- /dev/null
+++ b/variants/esp32c6/tanmatsu/platformio.ini
@@ -0,0 +1,29 @@
+[env:tanmatsu]
+extends = esp32c6_base
+board = esp32-c6-devkitm-1
+board_level = extra
+build_unflags =
+  -D HAS_BLUETOOTH
+  -D MESHTASTIC_EXCLUDE_BLUETOOTH
+  -D HAS_WIFI
+lib_deps =
+  ${esp32c6_base.lib_deps}
+  h2zero/NimBLE-Arduino@^2.3.6
+build_flags = 
+  ${esp32c6_base.build_flags}
+  -D PRIVATE_HW
+  -I variants/esp32c6/tanmatsu
+  -D MESHTASTIC_EXCLUDE_PAXCOUNTER=1
+  -D ARDUINO_USB_CDC_ON_BOOT=1
+  -D ARDUINO_USB_MODE=1
+  -D HAS_BLUETOOTH=1
+  -D MESHTASTIC_EXCLUDE_WEBSERVER
+  -D MESHTASTIC_EXCLUDE_MQTT
+  -D CONFIG_BT_NIMBLE_EXT_ADV=1
+  -D CONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES=2
+  -D NIMBLE_TWO
+lib_ignore =
+  NonBlockingRTTTL
+  libpax
+build_src_filter =
+ ${esp32c6_base.build_src_filter} +<../variants/esp32c6/tanmatsu>
diff --git a/variants/esp32c6/tanmatsu/variant.h b/variants/esp32c6/tanmatsu/variant.h
new file mode 100644
index 000000000..262788518
--- /dev/null
+++ b/variants/esp32c6/tanmatsu/variant.h
@@ -0,0 +1,39 @@
+#define HAS_WIRE 0
+#undef SDA
+#undef SCL
+#undef I2C_SDA
+#undef I2C_SCL
+
+#define LORA_SCK 0
+#define LORA_MISO 3
+#define LORA_MOSI 2
+#define LORA_CS 1
+
+#define LORA_DIO0 RADIOLIB_NC
+#define LORA_DIO1 4
+#define LORA_DIO4 5
+#define LORA_RESET 10
+
+#define USE_SX1262
+#define USE_SX1268
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY 5
+#define SX126X_RESET LORA_RESET
+
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8
+
+#define TCXO_OPTIONAL     // make it so that the firmware can try both TCXO and XTAL
+extern float tcxoVoltage; // make this available everywhere
+
+#define HAS_GPS 0
+#undef GPS_RX_PIN
+#undef GPS_TX_PIN
+
+#define HAS_SCREEN 0
+
+#define HAS_SERIAL 1
+#define SERIAL_RX_PIN 18
+#define SERIAL_TX_PIN 20
+#define SERIAL_TIMEOUT 1000