diff --git a/.gitmodules b/.gitmodules
index 0e35381..18ce398 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "avr/libraries/Kaleidoscope-Hardware-Virtual"]
 	path = avr/libraries/Kaleidoscope-Hardware-Virtual
 	url = https://github.com/keyboardio/Kaleidoscope-Hardware-Virtual
+[submodule "avr/bootloaders/Atreus2"]
+	path = avr/bootloaders/Atreus2
+	url = https://github.com/keyboardio/Atreus2-Bootloader
diff --git a/avr/boards.txt b/avr/boards.txt
index 462349c..1d6173b 100644
--- a/avr/boards.txt
+++ b/avr/boards.txt
@@ -154,9 +154,9 @@ ergodox.build.extra_flags={build.usb_flags} '-DKALEIDOSCOPE_HARDWARE_H="Kaleidos
 
 ##############################################################
 
-atreus2.name=Atreus 2 Prototype
+atreus2.name=Atreus 2
 atreus2.vid.0=0x1209
-atreus2.pid.0=0xa1e5
+atreus2.pid.0=0x2303
 
 atreus2.upload.maximum_data_size=2560
 
@@ -165,16 +165,23 @@ atreus2.build.extra_flags={build.usb_flags} '-DKALEIDOSCOPE_HARDWARE_H="Kaleidos
 atreus2.build.mcu=atmega32u4
 atreus2.build.f_cpu=16000000L
 atreus2.build.vid=0x1209
-atreus2.build.pid=0xa1e5
+atreus2.build.pid=0x2303
 atreus2.build.usb_product="Atreus2"
-atreus2.build.usb_manufacturer="Technomancy"
+atreus2.build.usb_manufacturer="Keyboardio"
 atreus2.build.board=AVR_ATREUS2
 atreus2.build.core=arduino:arduino
 atreus2.build.variant=atreus2
 
 
-model01.bootloader.pid=0x0036
-model01.bootloader.vid=0x2341
+atreus2.bootloader.tool=avrdude
+atreus2.bootloader.low_fuses=0xff
+atreus2.bootloader.high_fuses=0xd8
+atreus2.bootloader.extended_fuses=0xcb
+atreus2.bootloader.file=Atreus2/Caterina.hex
+atreus2.bootloader.unlock_bits=0x3F
+atreus2.bootloader.lock_bits=0x2F
+atreus2.bootloader.pid=0x2302
+
 
 atreus2.upload.tool=avrdude
 atreus2.upload.protocol=avr109
diff --git a/avr/bootloaders/Atreus2 b/avr/bootloaders/Atreus2
new file mode 160000
index 0000000..428ab3e
--- /dev/null
+++ b/avr/bootloaders/Atreus2
@@ -0,0 +1 @@
+Subproject commit 428ab3eafcf1810dcc37e8ff2029ca80f8b214f4