diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml
index e53c35bd20..9f1de95c5c 100644
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -125,6 +125,7 @@ jobs:
           - board: pico
           - board: picow
           - board: rak11310
+          - board: senselora_rp2040
     uses: ./.github/workflows/build_rpi2040.yml
     with:
       board: ${{ matrix.board }}
diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index 645d3863a5..da8face9a8 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -15,7 +15,6 @@ lint:
     - trufflehog@3.63.2-rc0
     - taplo@0.8.1
     - ruff@0.1.6
-    - yamllint@1.33.0
     - isort@5.12.0
     - markdownlint@0.37.0
     - oxipng@9.0.0
diff --git a/src/platform/esp32/architecture.h b/src/platform/esp32/architecture.h
index 0686aa59f7..451d7ffbe5 100644
--- a/src/platform/esp32/architecture.h
+++ b/src/platform/esp32/architecture.h
@@ -121,6 +121,10 @@
 #define HW_VENDOR meshtastic_HardwareModel_PICOMPUTER_S3
 #elif defined(HELTEC_HT62)
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_HT62
+#elif defined(SENSELORA_S3)
+#define HW_VENDOR meshtastic_HardwareModel_SENSELORA_S3
+#elif defined(HELTEC_HT62)
+#define HW_VENDOR meshtastic_HardwareModel_HELTEC_HT62
 #endif
 
 // -----------------------------------------------------------------------------
diff --git a/src/platform/rp2040/architecture.h b/src/platform/rp2040/architecture.h
index 762a2dc832..61eb1bbe89 100644
--- a/src/platform/rp2040/architecture.h
+++ b/src/platform/rp2040/architecture.h
@@ -25,4 +25,6 @@
 #define HW_VENDOR meshtastic_HardwareModel_RPI_PICO
 #elif defined(RAK11310)
 #define HW_VENDOR meshtastic_HardwareModel_RAK11310
+#elif defined(SENSELORA_RP2040)
+#define HW_VENDOR meshtastic_HardwareModel_SENSELORA_RP2040
 #endif
\ No newline at end of file
diff --git a/variants/senselora_rp2040/platformio.ini b/variants/senselora_rp2040/platformio.ini
new file mode 100644
index 0000000000..abf28559e5
--- /dev/null
+++ b/variants/senselora_rp2040/platformio.ini
@@ -0,0 +1,14 @@
+[env:senselora_rp2040]
+extends = rp2040_base
+board = rpipico
+upload_protocol = picotool
+
+# add our variants files to the include and src paths
+build_flags = ${rp2040_base.build_flags} 
+  -DSENSELORA_RP2040
+  -Ivariants/rpipico
+  -DDEBUG_RP2040_PORT=Serial
+  -DHW_SPI1_DEVICE
+  -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m0plus"
+lib_deps =
+  ${rp2040_base.lib_deps}
\ No newline at end of file
diff --git a/variants/senselora_rp2040/variant.h b/variants/senselora_rp2040/variant.h
new file mode 100644
index 0000000000..78f3e8f14e
--- /dev/null
+++ b/variants/senselora_rp2040/variant.h
@@ -0,0 +1,38 @@
+// #define RADIOLIB_CUSTOM_ARDUINO 1
+// #define RADIOLIB_TONE_UNSUPPORTED 1
+// #define RADIOLIB_SOFTWARE_SERIAL_UNSUPPORTED 1
+
+#define ARDUINO_ARCH_AVR
+
+#define USE_SSD1306 1
+
+#define BUTTON_PIN 2
+
+#define I2C_SDA1 6
+#define I2C_SCL1 7
+
+#define PIN_SPI_MISO (16u)
+#define PIN_SPI_MOSI (19u)
+#define PIN_SPI_SCK (18u)
+#define PIN_SPI_SS (17u)
+
+#define LED_PIN PIN_LED
+
+#undef BATTERY_PIN
+
+#undef LORA_SCK
+#undef LORA_MISO
+#undef LORA_MOSI
+#undef LORA_CS
+
+#define USE_RF95
+#define LORA_SCK PIN_SPI_SCK
+#define LORA_MISO PIN_SPI_MISO
+#define LORA_MOSI PIN_SPI_MOSI
+#define LORA_CS PIN_SPI_SS
+
+#define LORA_DIO0 21
+#define LORA_DIO1 22
+#define LORA_DIO2 23
+#define LORA_DIO5 24
+#define LORA_RST 20