diff --git a/.github/workflows/ci_build.sh b/.github/workflows/ci_build.sh
index c37c170b..374cbadd 100755
--- a/.github/workflows/ci_build.sh
+++ b/.github/workflows/ci_build.sh
@@ -10,6 +10,8 @@ mkdir build
 cd build
 cmake ..
 make VERBOSE=1
-
+avr-objcopy -j .text -j .data -O ihex ogx360_32u4_master.elf ogx360_32u4_master.hex
+avr-objcopy -j .text -j .data -O ihex ogx360_32u4_master_steelbattalion.elf ogx360_32u4_master_steelbattalion.hex
+avr-objcopy -j .text -j .data -O ihex ogx360_32u4_slave.elf ogx360_32u4_slave.hex
 # List files to confirm it worked
 ls -la *
diff --git a/Firmware/ogx360_32u4/CMakeLists.txt b/Firmware/ogx360_32u4/CMakeLists.txt
index f8ffccec..9279a3a0 100644
--- a/Firmware/ogx360_32u4/CMakeLists.txt
+++ b/Firmware/ogx360_32u4/CMakeLists.txt
@@ -73,31 +73,31 @@ file(GLOB FIRMWARE_FILES
 )
 
 # Build the master firmware (without Steel Battalion controller support)
-add_executable(ogx360_32u4_master.hex "${FIRMWARE_FILES}")
-target_compile_definitions(ogx360_32u4_master.hex PRIVATE "-DDISABLE_BATTALION ")
-add_dependencies(ogx360_32u4_master.hex Arduino)
-add_dependencies(ogx360_32u4_master.hex LUFA)
-add_dependencies(ogx360_32u4_master.hex USB_Host_Shield)
-target_link_libraries(ogx360_32u4_master.hex Arduino)
-target_link_libraries(ogx360_32u4_master.hex LUFA)
-target_link_libraries(ogx360_32u4_master.hex USB_Host_Shield)
+add_executable(ogx360_32u4_master.elf "${FIRMWARE_FILES}")
+target_compile_definitions(ogx360_32u4_master.elf PRIVATE "-DDISABLE_BATTALION ")
+add_dependencies(ogx360_32u4_master.elf Arduino)
+add_dependencies(ogx360_32u4_master.elf LUFA)
+add_dependencies(ogx360_32u4_master.elf USB_Host_Shield)
+target_link_libraries(ogx360_32u4_master.elf Arduino)
+target_link_libraries(ogx360_32u4_master.elf LUFA)
+target_link_libraries(ogx360_32u4_master.elf USB_Host_Shield)
 
 # Build the Steel Battalion master firmware (without Xbox One controller support)
-add_executable(ogx360_32u4_master_steelbattalion.hex "${FIRMWARE_FILES}")
-target_compile_definitions(ogx360_32u4_master_steelbattalion.hex PRIVATE "-DDISABLE_WIREDXBOXONE")
-add_dependencies(ogx360_32u4_master_steelbattalion.hex Arduino)
-add_dependencies(ogx360_32u4_master_steelbattalion.hex LUFA)
-add_dependencies(ogx360_32u4_master_steelbattalion.hex USB_Host_Shield)
-target_link_libraries(ogx360_32u4_master_steelbattalion.hex Arduino)
-target_link_libraries(ogx360_32u4_master_steelbattalion.hex LUFA)
-target_link_libraries(ogx360_32u4_master_steelbattalion.hex USB_Host_Shield)
+add_executable(ogx360_32u4_master_steelbattalion.elf "${FIRMWARE_FILES}")
+target_compile_definitions(ogx360_32u4_master_steelbattalion.elf PRIVATE "-DDISABLE_WIREDXBOXONE")
+add_dependencies(ogx360_32u4_master_steelbattalion.elf Arduino)
+add_dependencies(ogx360_32u4_master_steelbattalion.elf LUFA)
+add_dependencies(ogx360_32u4_master_steelbattalion.elf USB_Host_Shield)
+target_link_libraries(ogx360_32u4_master_steelbattalion.elf Arduino)
+target_link_libraries(ogx360_32u4_master_steelbattalion.elf LUFA)
+target_link_libraries(ogx360_32u4_master_steelbattalion.elf USB_Host_Shield)
 
 # Build the slave firmware
-add_executable(ogx360_32u4_slave.hex "${FIRMWARE_FILES}")
-target_compile_definitions(ogx360_32u4_slave.hex PRIVATE "-DCOMPILE_SLAVE")
-add_dependencies(ogx360_32u4_slave.hex Arduino)
-add_dependencies(ogx360_32u4_slave.hex LUFA)
-add_dependencies(ogx360_32u4_slave.hex USB_Host_Shield)
-target_link_libraries(ogx360_32u4_slave.hex Arduino)
-target_link_libraries(ogx360_32u4_slave.hex LUFA)
-target_link_libraries(ogx360_32u4_slave.hex USB_Host_Shield)
+add_executable(ogx360_32u4_slave.elf "${FIRMWARE_FILES}")
+target_compile_definitions(ogx360_32u4_slave.elf PRIVATE "-DCOMPILE_SLAVE")
+add_dependencies(ogx360_32u4_slave.elf Arduino)
+add_dependencies(ogx360_32u4_slave.elf LUFA)
+add_dependencies(ogx360_32u4_slave.elf USB_Host_Shield)
+target_link_libraries(ogx360_32u4_slave.elf Arduino)
+target_link_libraries(ogx360_32u4_slave.elf LUFA)
+target_link_libraries(ogx360_32u4_slave.elf USB_Host_Shield)