diff --git a/keyboards/moonlander/matrix.c b/keyboards/moonlander/matrix.c
index 9b37c31e14..d4cfca0484 100644
--- a/keyboards/moonlander/matrix.c
+++ b/keyboards/moonlander/matrix.c
@@ -115,9 +115,9 @@ void matrix_init(void) {
     palSetPadMode(GPIOA, 1, PAL_MODE_INPUT_PULLDOWN);
     palSetPadMode(GPIOA, 2, PAL_MODE_INPUT_PULLDOWN);
     palSetPadMode(GPIOA, 3, PAL_MODE_INPUT_PULLDOWN);
-    palSetPadMode(GPIOA, 4, PAL_MODE_INPUT_PULLDOWN);
-    palSetPadMode(GPIOA, 5, PAL_MODE_INPUT_PULLDOWN);
     palSetPadMode(GPIOA, 6, PAL_MODE_INPUT_PULLDOWN);
+    palSetPadMode(GPIOA, 7, PAL_MODE_INPUT_PULLDOWN);
+    palSetPadMode(GPIOB, 0, PAL_MODE_INPUT_PULLDOWN);
 
     memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
     memset(matrix_debouncing, 0, MATRIX_ROWS * sizeof(matrix_row_t));
@@ -152,9 +152,9 @@ uint8_t matrix_scan(void) {
             (palReadPad(GPIOA, 1) << 1 ) |
             (palReadPad(GPIOA, 2) << 2 ) |
             (palReadPad(GPIOA, 3) << 3 ) |
-            (palReadPad(GPIOA, 4) << 4 ) |
-            (palReadPad(GPIOA, 5) << 5 ) |
-            (palReadPad(GPIOA, 6) << 6 )
+            (palReadPad(GPIOA, 6) << 4 ) |
+            (palReadPad(GPIOA, 7) << 5 ) |
+            (palReadPad(GPIOB, 0) << 6 )
         );
 
         // unstrobe  row
diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c
index cca55e0c5b..17bafb860d 100644
--- a/keyboards/moonlander/moonlander.c
+++ b/keyboards/moonlander/moonlander.c
@@ -20,13 +20,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 bool mcp23018_leds[3] = {0, 0, 0};
 
 void matrix_init_kb(void) {
-  setPinOutput(B0);
-  setPinOutput(B1);
-  setPinOutput(B2);
+  setPinOutput(B5);
+  setPinOutput(B4);
+  setPinOutput(B3);
 
-  writePinLow(B0);
-  writePinLow(B1);
-  writePinLow(B2);
+  writePinLow(B5);
+  writePinLow(B4);
+  writePinLow(B3);
 
   mcp23018_leds[0] = 0; // blue
   mcp23018_leds[1] = 0; // green
diff --git a/keyboards/moonlander/moonlander.h b/keyboards/moonlander/moonlander.h
index cbf3d9463d..94743be6af 100644
--- a/keyboards/moonlander/moonlander.h
+++ b/keyboards/moonlander/moonlander.h
@@ -19,9 +19,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define MCP23018_DEFAULT_ADDRESS 0b0100000
 
-#define ML_LED_1(status) (status ? writePinHigh(B0) : writePinLow(B0))
-#define ML_LED_2(status) (status ? writePinHigh(B1) : writePinLow(B1))
-#define ML_LED_3(status) (status ? writePinHigh(B2) : writePinLow(B2))
+#define ML_LED_1(status) (status ? writePinHigh(B5) : writePinLow(B5))
+#define ML_LED_2(status) (status ? writePinHigh(B4) : writePinLow(B4))
+#define ML_LED_3(status) (status ? writePinHigh(B3) : writePinLow(B3))
 
 #define ML_LED_4(status) mcp23018_leds[0] = status
 #define ML_LED_5(status) mcp23018_leds[1] = status
diff --git a/keyboards/moonlander/rules.mk b/keyboards/moonlander/rules.mk
index 16514208ea..468a60ecef 100644
--- a/keyboards/moonlander/rules.mk
+++ b/keyboards/moonlander/rules.mk
@@ -18,6 +18,6 @@ COMMAND_ENABLE = yes    # Commands for debug and configuration
 #SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes	    # USB Nkey Rollover
 CUSTOM_MATRIX = yes # Custom matrix file
-AUDIO_ENABLE = no
+AUDIO_ENABLE = yes
 RGB_MATRIX_ENABLE = IS31FL3731
 # SERIAL_LINK_ENABLE = yes