diff --git a/src/mainboard/google/fatcat/Kconfig b/src/mainboard/google/fatcat/Kconfig
index f02925916d..01a1c7a767 100644
--- a/src/mainboard/google/fatcat/Kconfig
+++ b/src/mainboard/google/fatcat/Kconfig
@@ -143,7 +143,11 @@ config BOARD_GOOGLE_LAPIS
 	select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD
 
 config BOARD_GOOGLE_MOONSTONE
-	select BOARD_GOOGLE_MODEL_KINMEN
+	select BOARD_GOOGLE_BASEBOARD_FATCAT
+	select DRIVERS_SOUNDWIRE_ALC1320
+	select FSP_UGOP_EARLY_SIGN_OF_LIFE
+	select HAVE_SLP_S0_GATE
+	select MAINBOARD_HAS_GOOGLE_STRAUSS_KEYBOARD
 
 if BOARD_GOOGLE_FATCAT_COMMON
 
diff --git a/src/mainboard/google/fatcat/variants/baseboard/fatcat/include/baseboard/gpio.h b/src/mainboard/google/fatcat/variants/baseboard/fatcat/include/baseboard/gpio.h
index beffed62a1..d3ec2fdb6f 100644
--- a/src/mainboard/google/fatcat/variants/baseboard/fatcat/include/baseboard/gpio.h
+++ b/src/mainboard/google/fatcat/variants/baseboard/fatcat/include/baseboard/gpio.h
@@ -42,6 +42,11 @@
  #define GPIO_PCH_WP	GPP_D02
 /* Used to gate SoC's SLP_S0# signal */
 #define GPIO_SLP_S0_GATE	GPP_V17
+#elif CONFIG(BOARD_GOOGLE_MOONSTONE)
+ #define EC_SYNC_IRQ	GPP_E07_IRQ
+ #define GPIO_PCH_WP	GPP_D02
+/* Used to gate SoC's SLP_S0# signal */
+#define GPIO_SLP_S0_GATE	GPP_V17
 #endif
 
 #endif /* __BASEBOARD_GPIO_H__ */