diff --git a/keyboards/zsa/moonlander/config.h b/keyboards/zsa/moonlander/config.h
index b846d89f4573..4e82cec8bb0d 100644
--- a/keyboards/zsa/moonlander/config.h
+++ b/keyboards/zsa/moonlander/config.h
@@ -26,6 +26,7 @@
 
 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
 #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_VCC
+#define IS31FL3731_I2C_TIMEOUT 5
 
 #define MUSIC_MAP
 
diff --git a/keyboards/zsa/moonlander/post_config.h b/keyboards/zsa/moonlander/post_config.h
new file mode 100644
index 000000000000..02b53c15a303
--- /dev/null
+++ b/keyboards/zsa/moonlander/post_config.h
@@ -0,0 +1,26 @@
+/* Copyright 2023 ZSA Technology Labs, Inc <@zsa>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#ifdef AUDIO_ENABLE
+#    ifndef STARTUP_SONG
+#        define STARTUP_SONG SONG(E__NOTE(_DS5), E__NOTE(_D5), E__NOTE(_AS4), Q__NOTE(_F5))
+#    endif
+
+#    ifndef GOODBYE_SONG
+#        define GOODBYE_SONG SONG(E__NOTE(_D5), E__NOTE(_F5), E__NOTE(_C5), Q__NOTE(_AS4))
+#    endif
+#endif
diff --git a/keyboards/zsa/planck_ez/post_config.h b/keyboards/zsa/planck_ez/post_config.h
new file mode 100644
index 000000000000..02b53c15a303
--- /dev/null
+++ b/keyboards/zsa/planck_ez/post_config.h
@@ -0,0 +1,26 @@
+/* Copyright 2023 ZSA Technology Labs, Inc <@zsa>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#ifdef AUDIO_ENABLE
+#    ifndef STARTUP_SONG
+#        define STARTUP_SONG SONG(E__NOTE(_DS5), E__NOTE(_D5), E__NOTE(_AS4), Q__NOTE(_F5))
+#    endif
+
+#    ifndef GOODBYE_SONG
+#        define GOODBYE_SONG SONG(E__NOTE(_D5), E__NOTE(_F5), E__NOTE(_C5), Q__NOTE(_AS4))
+#    endif
+#endif