diff --git a/builddefs/common_rules.mk b/builddefs/common_rules.mk
index 5d100fec598..e993cc350ea 100644
--- a/builddefs/common_rules.mk
+++ b/builddefs/common_rules.mk
@@ -218,8 +218,8 @@ gccversion :
 	@$(SILENT) || printf "$(MSG_FLASH) $@" | $(AWK_CMD)
 	@$(BUILD_CMD)
 
-%.uf2: %.hex
-	$(eval CMD=$(UF2CONV) $(BUILD_DIR)/$(TARGET).hex --output $(BUILD_DIR)/$(TARGET).uf2 --convert --family $(UF2_FAMILY) >/dev/null 2>&1)
+%.uf2: %.elf
+	$(eval CMD=$(HEX) $< $(BUILD_DIR)/$(TARGET).tmp && $(UF2CONV) $(BUILD_DIR)/$(TARGET).tmp --output $@ --convert --family $(UF2_FAMILY) >/dev/null 2>&1)
 	#@$(SILENT) || printf "$(MSG_EXECUTING) '$(CMD)':\n"
 	@$(SILENT) || printf "$(MSG_UF2) $@" | $(AWK_CMD)
 	@$(BUILD_CMD)
diff --git a/keyboards/keebio/kbo5000/keymaps/default/keymap.c b/keyboards/keebio/kbo5000/keymaps/default/keymap.c
index f72681e19fb..5e4c9fb2220 100644
--- a/keyboards/keebio/kbo5000/keymaps/default/keymap.c
+++ b/keyboards/keebio/kbo5000/keymaps/default/keymap.c
@@ -1,8 +1,8 @@
 #include QMK_KEYBOARD_H
 
 enum encoder_names {
-  LEFT_HALF_ENC = 0,
-  RIGHT_HALF_ENC1 = 2,
+  LEFT_HALF_ENC,
+  RIGHT_HALF_ENC1,
   RIGHT_HALF_ENC2,
 };
 
diff --git a/keyboards/keebio/kbo5000/keymaps/iso/keymap.c b/keyboards/keebio/kbo5000/keymaps/iso/keymap.c
index 4aaa9ebe525..7ba2fc5972b 100644
--- a/keyboards/keebio/kbo5000/keymaps/iso/keymap.c
+++ b/keyboards/keebio/kbo5000/keymaps/iso/keymap.c
@@ -1,8 +1,8 @@
 #include QMK_KEYBOARD_H
 
 enum encoder_names {
-  LEFT_HALF_ENC = 0,
-  RIGHT_HALF_ENC1 = 2,
+  LEFT_HALF_ENC,
+  RIGHT_HALF_ENC1,
   RIGHT_HALF_ENC2,
 };
 
diff --git a/keyboards/keebio/kbo5000/keymaps/via/keymap.c b/keyboards/keebio/kbo5000/keymaps/via/keymap.c
index fe491cfea8b..2a0bbe6cd31 100644
--- a/keyboards/keebio/kbo5000/keymaps/via/keymap.c
+++ b/keyboards/keebio/kbo5000/keymaps/via/keymap.c
@@ -1,8 +1,8 @@
 #include QMK_KEYBOARD_H
 
 enum encoder_names {
-  LEFT_HALF_ENC = 0,
-  RIGHT_HALF_ENC1 = 2,
+  LEFT_HALF_ENC,
+  RIGHT_HALF_ENC1,
   RIGHT_HALF_ENC2,
 };
 
diff --git a/keyboards/keebio/kbo5000/rev1/info.json b/keyboards/keebio/kbo5000/rev1/info.json
index d65c9b38e2b..9d3445f880d 100644
--- a/keyboards/keebio/kbo5000/rev1/info.json
+++ b/keyboards/keebio/kbo5000/rev1/info.json
@@ -10,8 +10,7 @@
     },
     "encoder": {
         "rotary": [
-            {"pin_a": "F5", "pin_b": "F6"},
-            {"pin_a": "NO_PIN", "pin_b": "NO_PIN"}
+            {"pin_a": "F5", "pin_b": "F6"}
         ]
     },
     "backlight": {