diff --git a/builddefs/build_keyboard.mk b/builddefs/build_keyboard.mk
index 588c070a08..f8bd538674 100644
--- a/builddefs/build_keyboard.mk
+++ b/builddefs/build_keyboard.mk
@@ -277,7 +277,8 @@ ifdef MCU_FAMILY
         $(info "PLATFORM RP2040")
         PLATFORM=PICO_SDK
         PLATFORM_KEY=pico
-        FIRMWARE_FORMAT=elf
+        FIRMWARE_FORMAT=uf2
+        UF2_FAMILY=RP2040
     endif
 else ifdef ARM_ATSAM
     PLATFORM=ARM_ATSAM
diff --git a/platforms/pico/platform.mk b/platforms/pico/platform.mk
index 75d81828a5..f5e0c83b58 100644
--- a/platforms/pico/platform.mk
+++ b/platforms/pico/platform.mk
@@ -402,6 +402,3 @@ flash: $(BUILD_DIR)/$(TRAGET).elf cpfirmware sizeafter
 		sleep 5 ;\
 	done
 	$(PICOTOOL) load $(BUILD_DIR)/$(TARGET).elf && $(PICOTOOL) reboot
-
-uf2: $(BUILD_DIR)/$(TARGET).bin
-	./util/uf2conv.py -f 0xe48bff56 -b 0x10000000 -o $(TARGET).uf2 $^