diff --git a/keyboards/keychron/q7/config.h b/keyboards/keychron/q7/config.h
index 6e2dd466ac..ca156d39ad 100644
--- a/keyboards/keychron/q7/config.h
+++ b/keyboards/keychron/q7/config.h
@@ -43,7 +43,7 @@
 /* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in CKLED2001.h) */
 #define SCAN_PHASE_CHANNEL MSKPHASE_9CHANNEL
 #define CONSTANT_CURRENT_STEP \
-    { 0xCA, 0xCA, 0x60, 0xCA, 0xCA, 0x60, 0xCA, 0xCA, 0x60, 0xCA, 0xCA, 0x60 }
+    { 0xF8, 0xF8, 0x80, 0xF8, 0xF8, 0x80, 0xF8, 0xF8, 0x80, 0xF8, 0xF8, 0x80 }
 
 /* DIP switch */
 #define DIP_SWITCH_MATRIX_GRID  { {4,4} }
diff --git a/keyboards/keychron/q7/q7.c b/keyboards/keychron/q7/q7.c
index fb21da6583..760510c85e 100644
--- a/keyboards/keychron/q7/q7.c
+++ b/keyboards/keychron/q7/q7.c
@@ -34,7 +34,7 @@ bool dip_switch_update_kb(uint8_t index, bool active) {
     return true;
 }
 
-#endif
+#endif // DIP_SWITCH_ENABLE
 
 #if defined(RGB_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX)
 
@@ -107,4 +107,4 @@ bool led_update_kb(led_t led_state) {
     return res;
 }
 
-#endif
+#endif // CAPS_LOCK_LED_INDEX
diff --git a/keyboards/keychron/q7/q7.h b/keyboards/keychron/q7/q7.h
index 8e0a08d0d1..91cc8449ce 100644
--- a/keyboards/keychron/q7/q7.h
+++ b/keyboards/keychron/q7/q7.h
@@ -18,7 +18,7 @@
 
 #include "quantum.h"
 
-#if defined(KEYBOARD_keychron_q7_q7_ansi_stm32l432)
+#if   defined(KEYBOARD_keychron_q7_q7_ansi_stm32l432)
 #    include "q7_ansi_stm32l432.h"
 #elif defined(KEYBOARD_keychron_q7_q7_iso_stm32l432)
 #    include "q7_iso_stm32l432.h"
diff --git a/keyboards/keychron/q7/q7_ansi_stm32l432/q7_ansi_stm32l432.c b/keyboards/keychron/q7/q7_ansi_stm32l432/q7_ansi_stm32l432.c
index 1caf95f1c6..c57b1f1519 100644
--- a/keyboards/keychron/q7/q7_ansi_stm32l432/q7_ansi_stm32l432.c
+++ b/keyboards/keychron/q7/q7_ansi_stm32l432/q7_ansi_stm32l432.c
@@ -132,4 +132,4 @@ led_config_t g_led_config = {
     }
 };
 
-#endif
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q7/q7_iso_stm32l432/q7_iso_stm32l432.c b/keyboards/keychron/q7/q7_iso_stm32l432/q7_iso_stm32l432.c
index 5876b7e7fb..d251c05a5e 100644
--- a/keyboards/keychron/q7/q7_iso_stm32l432/q7_iso_stm32l432.c
+++ b/keyboards/keychron/q7/q7_iso_stm32l432/q7_iso_stm32l432.c
@@ -133,4 +133,4 @@ led_config_t g_led_config = {
     }
 };
 
-#endif
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/v8/config.h b/keyboards/keychron/v8/config.h
index 4ec7b485c1..a2d05e3e22 100644
--- a/keyboards/keychron/v8/config.h
+++ b/keyboards/keychron/v8/config.h
@@ -115,3 +115,6 @@
 #define ENABLE_RGB_MATRIX_SOLID_SPLASH
 #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
 // #define RGB_MATRIX_KEYPRESSES
+
+/* Enable receive custom command from host */
+#define RAW_HID_CMD 0xAB
diff --git a/keyboards/keychron/v8/v8.c b/keyboards/keychron/v8/v8.c
index d47fb7dc45..97910a5020 100644
--- a/keyboards/keychron/v8/v8.c
+++ b/keyboards/keychron/v8/v8.c
@@ -34,7 +34,7 @@ bool dip_switch_update_kb(uint8_t index, bool active) {
     return true;
 }
 
-#endif
+#endif // DIP_SWITCH_ENABLE
 
 #if defined(RGB_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX)
 
diff --git a/keyboards/keychron/v8/v8_ansi_stm32l432/rules.mk b/keyboards/keychron/v8/v8_ansi_stm32l432/rules.mk
index 1c46df805a..f417778766 100644
--- a/keyboards/keychron/v8/v8_ansi_stm32l432/rules.mk
+++ b/keyboards/keychron/v8/v8_ansi_stm32l432/rules.mk
@@ -23,6 +23,8 @@ RAW_ENABLE = yes
 LTO_ENABLE = yes
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
 # OLED_ENABLE = yes
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
diff --git a/keyboards/keychron/v8/v8_ansi_stm32l432_ec11/rules.mk b/keyboards/keychron/v8/v8_ansi_stm32l432_ec11/rules.mk
index 81afd89466..85c56a9e33 100644
--- a/keyboards/keychron/v8/v8_ansi_stm32l432_ec11/rules.mk
+++ b/keyboards/keychron/v8/v8_ansi_stm32l432_ec11/rules.mk
@@ -23,6 +23,8 @@ RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = CKLED2001
 RAW_ENABLE = yes
 LTO_ENABLE = yes
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/keychron/v8/v8_iso_stm32l432/config.h b/keyboards/keychron/v8/v8_iso_stm32l432/config.h
index 7282b2c309..32510ad1d6 100644
--- a/keyboards/keychron/v8/v8_iso_stm32l432/config.h
+++ b/keyboards/keychron/v8/v8_iso_stm32l432/config.h
@@ -18,7 +18,7 @@
 
 /* USB Device descriptor parameter */
 #define PRODUCT_ID 0x0382
-#define DEVICE_VER 0x0101
+#define DEVICE_VER 0x0100
 
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 35
diff --git a/keyboards/keychron/v8/v8_iso_stm32l432/rules.mk b/keyboards/keychron/v8/v8_iso_stm32l432/rules.mk
index bb87093ece..a2b12e9751 100644
--- a/keyboards/keychron/v8/v8_iso_stm32l432/rules.mk
+++ b/keyboards/keychron/v8/v8_iso_stm32l432/rules.mk
@@ -16,13 +16,13 @@ NKRO_ENABLE = yes           # Enable USB N-key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = no         # Enable Encoder
-ENCODER_MAP_ENABLE = no
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = CKLED2001
 RAW_ENABLE = yes
 LTO_ENABLE = yes
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/keychron/v8/v8_iso_stm32l432_ec11/config.h b/keyboards/keychron/v8/v8_iso_stm32l432_ec11/config.h
index b3fd955765..fd9cd46889 100644
--- a/keyboards/keychron/v8/v8_iso_stm32l432_ec11/config.h
+++ b/keyboards/keychron/v8/v8_iso_stm32l432_ec11/config.h
@@ -18,7 +18,7 @@
 
 /* USB Device descriptor parameter */
 #define PRODUCT_ID 0x0383
-#define DEVICE_VER 0x0101
+#define DEVICE_VER 0x0100
 
 /* RGB Matrix Configuration */
 #define DRIVER_1_LED_TOTAL 35
diff --git a/keyboards/keychron/v8/v8_iso_stm32l432_ec11/rules.mk b/keyboards/keychron/v8/v8_iso_stm32l432_ec11/rules.mk
index 81afd89466..85c56a9e33 100644
--- a/keyboards/keychron/v8/v8_iso_stm32l432_ec11/rules.mk
+++ b/keyboards/keychron/v8/v8_iso_stm32l432_ec11/rules.mk
@@ -23,6 +23,8 @@ RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = CKLED2001
 RAW_ENABLE = yes
 LTO_ENABLE = yes
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/keychron/v8/v8_iso_stm32l432_ec11/v8_iso_stm32l432_ec11.c b/keyboards/keychron/v8/v8_iso_stm32l432_ec11/v8_iso_stm32l432_ec11.c
index 7e751c5f8f..e3feb1a018 100644
--- a/keyboards/keychron/v8/v8_iso_stm32l432_ec11/v8_iso_stm32l432_ec11.c
+++ b/keyboards/keychron/v8/v8_iso_stm32l432_ec11/v8_iso_stm32l432_ec11.c
@@ -130,7 +130,7 @@ led_config_t g_led_config = {
     }
 };
 
-#endif
+#endif // RGB_MATRIX_ENABLE
 
 #ifdef ENCODER_ENABLE
 
@@ -146,6 +146,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     return true;
 }
 #    if defined(PAL_USE_CALLBACKS)
+
 void encoder0_pad_cb(void *param) {
     (void)param;
 
@@ -160,6 +161,5 @@ void keyboard_post_init_kb(void) {
     palSetLineCallback(encoders_pad_a[0], encoder0_pad_cb, NULL);
     palSetLineCallback(encoders_pad_b[0], encoder0_pad_cb, NULL);
 }
-    #endif
-#endif
-
+#    endif // PAL_USE_CALLBACKS
+#endif     // ENCODER_ENABLE