diff --git a/src/mainboard/starlabs/starbook/Kconfig b/src/mainboard/starlabs/starbook/Kconfig
index e5ceb0871f..5ba827c169 100644
--- a/src/mainboard/starlabs/starbook/Kconfig
+++ b/src/mainboard/starlabs/starbook/Kconfig
@@ -217,6 +217,12 @@ config POWER_STATE_DEFAULT_ON_AFTER_FAILURE
 config SOC_INTEL_CSE_SEND_EOP_EARLY
 	default n
 
+config TPM_PIRQ
+	depends on MAINBOARD_HAS_TPM2
+	default 0x56 if BOARD_STARLABS_STARBOOK_TGL
+	default 0x3d if BOARD_STARLABS_STARBOOK_MTL
+	default 0x37
+
 config UART_FOR_CONSOLE
 	default 2 if BOARD_STARLABS_LABTOP_KBL || BOARD_STARLABS_LABTOP_CML || BOARD_STARLABS_STARBOOK_TGL
 	default 0
diff --git a/src/mainboard/starlabs/starbook/variants/adl/gpio.c b/src/mainboard/starlabs/starbook/variants/adl/gpio.c
index f3f26f2858..dae0df2eff 100644
--- a/src/mainboard/starlabs/starbook/variants/adl/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/adl/gpio.c
@@ -261,7 +261,7 @@ const struct pad_config gpio_table[] = {
 	/* E10:		PWD Amplifier Input				*/
 	PAD_NC(GPP_E10, NONE),
 	/* E11:		TPM IRQ						*/
-	PAD_CFG_NF(GPP_E11, NONE, DEEP, NF1),
+	PAD_CFG_GPI_APIC_LOW(GPP_E11, NONE, PLTRST),
 	/* E12:		Touchpad Interrupt				*/
 	PAD_CFG_GPI_APIC_LOW(GPP_E12, NONE, PLTRST),
 	/* E13:		Not connected					*/
diff --git a/src/mainboard/starlabs/starbook/variants/adl_n/gpio.c b/src/mainboard/starlabs/starbook/variants/adl_n/gpio.c
index 71b64bd64f..ed759d4b6d 100644
--- a/src/mainboard/starlabs/starbook/variants/adl_n/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/adl_n/gpio.c
@@ -261,7 +261,7 @@ const struct pad_config gpio_table[] = {
 	/* E10:		PWD Amplifier Input				*/
 	PAD_NC(GPP_E10, NONE),
 	/* E11:		TPM IRQ						*/
-	PAD_CFG_NF(GPP_E11, NONE, DEEP, NF1),
+	PAD_CFG_GPI_APIC_LOW(GPP_E11, NONE, PLTRST),
 	/* E12:		Touchpad Interrupt				*/
 	PAD_CFG_GPI_APIC_LOW(GPP_E12, NONE, PLTRST),
 	/* E13:		Not connected					*/
diff --git a/src/mainboard/starlabs/starbook/variants/mtl/gpio.c b/src/mainboard/starlabs/starbook/variants/mtl/gpio.c
index 4ae9d69a94..943998ccec 100644
--- a/src/mainboard/starlabs/starbook/variants/mtl/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/mtl/gpio.c
@@ -331,7 +331,7 @@ const struct pad_config gpio_table[] = {
 	/* F12:					*/
 	PAD_NC(GPP_F12, NONE),
 	/* F13:	TPM_IRQ				*/
-	PAD_CFG_NF(GPP_F13, NONE, DEEP, NF1),
+	PAD_CFG_GPI_APIC_LOW(GPP_F13, NONE, PLTRST),
 	/* F14:					*/
 	PAD_NC(GPP_F14, NONE),
 	/* F15:					*/
diff --git a/src/mainboard/starlabs/starbook/variants/rpl/gpio.c b/src/mainboard/starlabs/starbook/variants/rpl/gpio.c
index 020f0af44b..4ef11d43eb 100644
--- a/src/mainboard/starlabs/starbook/variants/rpl/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/rpl/gpio.c
@@ -261,7 +261,7 @@ const struct pad_config gpio_table[] = {
 	/* E10:		PWD Amplifier Input				*/
 	PAD_NC(GPP_E10, NONE),
 	/* E11:		TPM IRQ						*/
-	PAD_CFG_NF(GPP_E11, NONE, DEEP, NF1),
+	PAD_CFG_GPI_APIC_LOW(GPP_E11, NONE, PLTRST),
 	/* E12:		Touchpad Interrupt				*/
 	PAD_CFG_GPI_APIC_LOW(GPP_E12, NONE, PLTRST),
 	/* E13:		Not connected					*/
diff --git a/src/mainboard/starlabs/starfighter/Kconfig b/src/mainboard/starlabs/starfighter/Kconfig
index e9c3b63cdc..fbddb45c0a 100644
--- a/src/mainboard/starlabs/starfighter/Kconfig
+++ b/src/mainboard/starlabs/starfighter/Kconfig
@@ -117,6 +117,10 @@ config POWER_STATE_DEFAULT_ON_AFTER_FAILURE
 config SOC_INTEL_CSE_SEND_EOP_EARLY
 	default n
 
+config TPM_PIRQ
+	depends on MAINBOARD_HAS_TPM2
+	default 0x37
+
 config UART_FOR_CONSOLE
 	default 0
 
diff --git a/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c b/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c
index 479f984fd5..b0fb7cdc4b 100644
--- a/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c
+++ b/src/mainboard/starlabs/starfighter/variants/rpl/gpio.c
@@ -221,7 +221,7 @@ const struct pad_config gpio_table[] = {
 	/* D9:		PWD_AMP_IN					*/
 	PAD_NC(GPP_D9, NONE),
 	/* D10:		TPM_IRQ						*/
-	PAD_NC(GPP_D10, NONE),
+	PAD_CFG_GPI_APIC_LOW(GPP_D10, NONE, PLTRST),
 	/* D11:		TCHPAD_INT_N					*/
 	PAD_CFG_GPI_APIC_LOW(GPP_D11, NONE, PLTRST),
 	/* D12:		ES8336_INT_N					*/