diff --git a/arch/rp2040/rp2040.ini b/arch/rp2040/rp2040.ini
index 6660cccd2..20c99dc5e 100644
--- a/arch/rp2040/rp2040.ini
+++ b/arch/rp2040/rp2040.ini
@@ -2,7 +2,6 @@
 [rp2040_base]
 platform = https://github.com/maxgerhardt/platform-raspberrypi.git
 extends = arduino_base
-board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
 build_flags = 
   ${arduino_base.build_flags} -Wno-unused-variable 
diff --git a/platformio.ini b/platformio.ini
index 44572632c..bc46f3f23 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -65,7 +65,7 @@ lib_deps =
   ${env.lib_deps}
   ; Portduino is using meshtastic fork for now
   jgromes/RadioLib@5.4.1
-  https://github.com/caveman99/SparkFun_ATECCX08a_Arduino_Library.git#bf41031838d3e9b9fd9df846e6b26c1e6b22051c
+  https://github.com/caveman99/SparkFun_ATECCX08a_Arduino_Library.git#008e7f9d40bad66b2f7a0074aaac05b7c424339d
 
 build_flags = ${env.build_flags} -Os 
   -DRADIOLIB_SPI_PARANOID=0
diff --git a/variants/pico/platformio.ini b/variants/rpipico/platformio.ini
similarity index 90%
rename from variants/pico/platformio.ini
rename to variants/rpipico/platformio.ini
index 4f238fa14..122fbd42f 100644
--- a/variants/pico/platformio.ini
+++ b/variants/rpipico/platformio.ini
@@ -1,12 +1,12 @@
 [env:pico]
 extends = rp2040_base
-board = pico
+board = rpipico
 upload_protocol = picotool
 
 # add our variants files to the include and src paths
 build_flags = ${rp2040_base.build_flags} 
   -DPRIVATE_HW
-  -Ivariants/pico
+  -Ivariants/rpipico
   -DARDUINO_AVR_NANO_EVERY
   -DDEBUG_RP2040_WIRE
   -DDEBUG_RP2040_SPI
diff --git a/variants/pico/variant.h b/variants/rpipico/variant.h
similarity index 100%
rename from variants/pico/variant.h
rename to variants/rpipico/variant.h
diff --git a/variants/rpipicow/platformio.ini b/variants/rpipicow/platformio.ini
new file mode 100644
index 000000000..697ec1caa
--- /dev/null
+++ b/variants/rpipicow/platformio.ini
@@ -0,0 +1,17 @@
+[env:picow]
+extends = rp2040_base
+board = rpipicow
+upload_protocol = picotool
+
+# add our variants files to the include and src paths
+build_flags = ${rp2040_base.build_flags} 
+  -DPRIVATE_HW
+  -Ivariants/rpipicow
+  -DARDUINO_AVR_NANO_EVERY
+  -DDEBUG_RP2040_WIRE
+  -DDEBUG_RP2040_SPI
+  -DDEBUG_RP2040_CORE
+  -DDEBUG_RP2040_PORT=Serial
+  -DUSE_TINYUSB
+lib_deps =
+  ${rp2040_base.lib_deps}
\ No newline at end of file
diff --git a/variants/rpipicow/variant.h b/variants/rpipicow/variant.h
new file mode 100644
index 000000000..d620a356b
--- /dev/null
+++ b/variants/rpipicow/variant.h
@@ -0,0 +1,52 @@
+// #define RADIOLIB_CUSTOM_ARDUINO 1
+// #define RADIOLIB_TONE_UNSUPPORTED 1
+// #define RADIOLIB_SOFTWARE_SERIAL_UNSUPPORTED 1
+
+#define ARDUINO_ARCH_AVR
+
+#define CBC 0
+#define CTR 1
+#define ECB 0
+
+#define NO_GPS 1
+#define USE_SH1106 1
+#undef GPS_SERIAL_NUM
+
+// #define I2C_SDA 6
+// #define I2C_SCL 7
+
+#define BUTTON_PIN 17
+#define EXT_NOTIFY_OUT 4
+
+#define BATTERY_PIN 26
+// ratio of voltage divider = 3.0 (R17=200k, R18=100k)
+#define ADC_MULTIPLIER 3.1 // 3.0 + a bit for being optimistic
+
+#define USE_RF95
+#define USE_SX1262
+
+#undef RF95_SCK
+#undef RF95_MISO
+#undef RF95_MOSI
+#undef RF95_NSS
+
+#define RF95_SCK 10
+#define RF95_MISO 12
+#define RF95_MOSI 11
+#define RF95_NSS 3
+
+#define LORA_DIO0 RADIOLIB_NC
+#define LORA_RESET 15
+#define LORA_DIO1 20
+#define LORA_DIO2 2
+#define LORA_DIO3 RADIOLIB_NC
+
+#ifdef USE_SX1262
+#define SX126X_CS RF95_NSS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_DIO2
+#define SX126X_RESET LORA_RESET
+#define SX126X_E22
+#endif
+
+#include <Adafruit_TinyUSB.h>
\ No newline at end of file