diff --git a/src/mainboard/google/guybrush/variants/baseboard/gpio.c b/src/mainboard/google/guybrush/variants/baseboard/gpio.c
index c89ded2345..eb42ab505f 100644
--- a/src/mainboard/google/guybrush/variants/baseboard/gpio.c
+++ b/src/mainboard/google/guybrush/variants/baseboard/gpio.c
@@ -64,8 +64,8 @@ static const struct soc_amd_gpio base_gpio_table[] = {
 	PAD_GPO(GPIO_29, LOW),
 	/* ESPI_CS_L */
 	PAD_NF(GPIO_30, ESPI_CS_L, PULL_NONE),
-	/* SPI_CS3_L */
-	PAD_NF(GPIO_31, SPI_CS3_L, PULL_NONE),
+	/* EN_SPKR */
+	PAD_GPO(GPIO_31, HIGH),
 	/* EN_PWR_FP */
 	PAD_GPO(GPIO_32, HIGH),
 	/* GPIO_33 - GPIO_39: Not available */
@@ -79,13 +79,13 @@ static const struct soc_amd_gpio base_gpio_table[] = {
 	PAD_GPI(GPIO_67, PULL_NONE),
 	/* EN_PP3300_TCHSCR */
 	PAD_GPO(GPIO_68, LOW),
-	/* EN_SPKR */
-	PAD_GPO(GPIO_69, HIGH),
 	/* SD_AUX_RESET_L */
-	PAD_GPO(GPIO_70, HIGH),
+	PAD_GPO(GPIO_69, HIGH),
+	/* Unused TP27  */
+	PAD_NC(GPIO_70),
 	/* GPIO_71 - GPIO_73: Not available */
-	/* RAM_ID_CHAN_SEL */
-	PAD_GPI(GPIO_74, PULL_NONE),
+	/* Unused TP49 */
+	PAD_NC(GPIO_74),
 	/* RAM_ID_2 / DEV_BEEP_LRCLK */
 	PAD_GPI(GPIO_75, PULL_NONE),
 	/* EN_PP3300_CAM */
diff --git a/src/mainboard/google/guybrush/variants/guybrush/gpio.c b/src/mainboard/google/guybrush/variants/guybrush/gpio.c
index 64afa60fae..05c1542124 100644
--- a/src/mainboard/google/guybrush/variants/guybrush/gpio.c
+++ b/src/mainboard/google/guybrush/variants/guybrush/gpio.c
@@ -8,8 +8,14 @@
 
 /* This table is used by guybrush variant with board version < 2. */
 static const struct soc_amd_gpio bid1_gpio_table[] = {
+	/* Unused TP183 */
+	PAD_NC(GPIO_31),
 	/* EN_SPKR */
-	PAD_GPO(GPIO_69, LOW),
+	PAD_GPO(GPIO_69, HIGH),
+	/* SD_AUX_RESET_L */
+	PAD_GPO(GPIO_70, HIGH),
+	/* RAM_ID_CHAN_SEL */
+	PAD_GPI(GPIO_74, PULL_NONE),
 };
 
 const struct soc_amd_gpio *variant_override_gpio_table(size_t *size)