diff --git a/keyboards/keychron/q6_max/ansi_encoder/config.h b/keyboards/keychron/q6_max/ansi_encoder/config.h
index 7806a09ba0..067f433ba1 100644
--- a/keyboards/keychron/q6_max/ansi_encoder/config.h
+++ b/keyboards/keychron/q6_max/ansi_encoder/config.h
@@ -20,15 +20,8 @@
 /* RGB Matrix driver configuration */
 #    define DRIVER_COUNT 2
 #    define RGB_MATRIX_LED_COUNT 108
-
-#    define SPI_SCK_PIN A5
-#    define SPI_MISO_PIN A6
-#    define SPI_MOSI_PIN A7
-
 #    define DRIVER_CS_PINS \
         { B8, B9 }
-#    define SNLED23751_SPI_DIVISOR 16
-#    define SPI_DRIVER SPID1
 
 /* Set LED driver current */
 #    define SNLED27351_CURRENT_TUNE \
@@ -36,7 +29,6 @@
 
 /* Set to infinit, which is use in USB mode by default */
 #    define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
-
 /* Allow shutdown of led driver to save power */
 #    define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE
 /* Turn off backlight on low brightness to save power */
diff --git a/keyboards/keychron/q6_max/config.h b/keyboards/keychron/q6_max/config.h
index cfe6bff545..16bf57e34d 100644
--- a/keyboards/keychron/q6_max/config.h
+++ b/keyboards/keychron/q6_max/config.h
@@ -20,6 +20,19 @@
 #define ENCODER_DEFAULT_POS 0x3
 #define ENCODER_MAP_KEY_DELAY 2
 
+#if defined(RGB_MATRIX_ENABLE) || defined(LK_WIRELESS_ENABLE)
+/* SPI configuration */
+#    define SPI_DRIVER SPID1
+#    define SPI_SCK_PIN A5
+#    define SPI_MISO_PIN A6
+#    define SPI_MOSI_PIN A7
+#endif
+
+#if defined(RGB_MATRIX_ENABLE)
+#    define LED_DRIVER_SHUTDOWN_PIN B7
+#    define SNLED23751_SPI_DIVISOR 16
+#endif
+
 #ifdef LK_WIRELESS_ENABLE
 /* Hardware configuration */
 #    define P2P4_MODE_SELECT_PIN A10
@@ -42,23 +55,17 @@
 
 #    if defined(RGB_MATRIX_ENABLE) || defined(LED_MATRIX_ENABLE)
 
-#        define LED_DRIVER_SHUTDOWN_PIN B7
-
 #        define BT_HOST_LED_MATRIX_LIST \
             { 20, 21, 22 }
-
 #        define P2P4G_HOST_LED_MATRIX_LIST \
             { 23 }
-
 #        define BAT_LEVEL_LED_LIST \
             { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }
 
 /* Backlit disable timeout when keyboard is disconnected(unit: second) */
 #        define DISCONNECTED_BACKLIGHT_DISABLE_TIMEOUT 40
-
 /* Backlit disable timeout when keyboard is connected(unit: second) */
 #        define CONNECTED_BACKLIGHT_DISABLE_TIMEOUT 600
-
 /* Reinit LED driver on tranport changed */
 #        define REINIT_LED_DRIVER 1
 
diff --git a/keyboards/keychron/q6_max/iso_encoder/config.h b/keyboards/keychron/q6_max/iso_encoder/config.h
index 38db19f4dc..aaf6b02634 100644
--- a/keyboards/keychron/q6_max/iso_encoder/config.h
+++ b/keyboards/keychron/q6_max/iso_encoder/config.h
@@ -20,15 +20,8 @@
 /* RGB Matrix driver configuration */
 #    define DRIVER_COUNT 2
 #    define RGB_MATRIX_LED_COUNT 109
-
-#    define SPI_SCK_PIN A5
-#    define SPI_MISO_PIN A6
-#    define SPI_MOSI_PIN A7
-
 #    define DRIVER_CS_PINS \
         { B8, B9 }
-#    define SNLED23751_SPI_DIVISOR 16
-#    define SPI_DRIVER SPID1
 
 /* Set LED driver current */
 #    define SNLED27351_CURRENT_TUNE \