diff --git a/src/mainboard/google/brya/variants/joxer/gpio.c b/src/mainboard/google/brya/variants/joxer/gpio.c
index b1dcd4a..f105861 100644
--- a/src/mainboard/google/brya/variants/joxer/gpio.c
+++ b/src/mainboard/google/brya/variants/joxer/gpio.c
@@ -22,6 +22,8 @@
 
 	/* D3  : WCAM_RST_L ==> NC */
 	PAD_NC_LOCK(GPP_D3, NONE, LOCK_CONFIG),
+	/* D8  : SRCCLKREQ3# ==> NC */
+	PAD_NC(GPP_D8, NONE),
 	/* D15 : EN_PP2800_WCAM_X ==> NC */
 	PAD_NC_LOCK(GPP_D15, NONE, LOCK_CONFIG),
 	/* D16 : EN_PP1800_PP1200_WCAM_X ==> NC */
@@ -43,6 +45,10 @@
 	PAD_NC(GPP_H8, NONE),
 	/* H9  : CNV_MFUART2_TXD ==> NC */
 	PAD_NC(GPP_H9, NONE),
+	/* H12 : UART0_RTS# ==> NC */
+	PAD_NC_LOCK(GPP_H12, NONE, LOCK_CONFIG),
+	/* H13 : UART0_CTS# ==> NC */
+	PAD_NC_LOCK(GPP_H13, NONE, LOCK_CONFIG),
 	/* H19 : SRCCLKREQ4# ==> NC */
 	PAD_NC(GPP_H19, NONE),
 	/* H23 : GPP_H23 ==> NC */
@@ -56,8 +62,6 @@
 
 /* Early pad configuration in bootblock */
 static const struct pad_config early_gpio_table[] = {
-	/* H12 : UART0_RTS# ==> SD_PERST_L */
-	PAD_CFG_GPO(GPP_H12, 0, DEEP),
 	/* H20 : IMGCLKOUT1 ==> WLAN_PERST_L */
 	PAD_CFG_GPO(GPP_H20, 0, DEEP),
 	/* A13 : GPP_A13 ==> GSC_SOC_INT_ODL */
@@ -76,8 +80,6 @@
 	PAD_CFG_NF(GPP_H11, NONE, DEEP, NF2),
 	/* B11 : PMCALERT# ==> EN_PP3300_WLAN_X */
 	PAD_CFG_GPO(GPP_B11, 1, DEEP),
-	/* H13 : UART0_CTS# ==> EN_PP3300_SD_X */
-	PAD_CFG_GPO(GPP_H13, 1, DEEP),
 };
 
 static const struct pad_config romstage_gpio_table[] = {
@@ -86,8 +88,6 @@
 	PAD_CFG_GPO(GPP_C0, 1, DEEP),
 	/* C1  : SMBDATA ==> TCHSCR_RST_L */
 	PAD_CFG_GPO(GPP_C1, 0, DEEP),
-	/* H12 : UART0_RTS# ==> SD_PERST_L */
-	PAD_CFG_GPO(GPP_H12, 1, DEEP),
 	/* H20 : IMGCLKOUT1 ==> WLAN_PERST_L */
 	PAD_CFG_GPO(GPP_H20, 1, DEEP),
 };