diff --git a/board/glados/board.c b/board/glados/board.c
index 7cf45cfa6a..9f0ce37f88 100644
--- a/board/glados/board.c
+++ b/board/glados/board.c
@@ -39,12 +39,13 @@ static void pd_mcu_interrupt(enum gpio_signal signal)
 void vbus0_evt(enum gpio_signal signal)
 {
 	CPRINTF("VBUS C0, %d\n", !gpio_get_level(signal));
-	task_wake(TASK_ID_PD);
+	task_wake(TASK_ID_PD_C0);
 }
 
 void vbus1_evt(enum gpio_signal signal)
 {
 	CPRINTF("VBUS C1, %d\n", !gpio_get_level(signal));
+	task_wake(TASK_ID_PD_C1);
 }
 
 void usb0_evt(enum gpio_signal signal)
diff --git a/board/glados/board.h b/board/glados/board.h
index 3b0b0a431a..44db0f5a3c 100644
--- a/board/glados/board.h
+++ b/board/glados/board.h
@@ -37,7 +37,7 @@
 #define CONFIG_USB_PD_ALT_MODE_DFP
 #define CONFIG_USB_PD_CUSTOM_VDM
 #define CONFIG_USB_PD_DUAL_ROLE
-#define CONFIG_USB_PD_PORT_COUNT 1
+#define CONFIG_USB_PD_PORT_COUNT 2
 #define CONFIG_USB_PD_TCPM_TCPCI
 #define CONFIG_SCI_GPIO GPIO_PCH_SCI_L
 
diff --git a/board/glados/ec.tasklist b/board/glados/ec.tasklist
index e10cc103eb..90f974cd29 100644
--- a/board/glados/ec.tasklist
+++ b/board/glados/ec.tasklist
@@ -26,5 +26,6 @@
 	TASK_ALWAYS(CONSOLE, console_task, NULL, LARGER_TASK_STACK_SIZE) \
 	TASK_ALWAYS(POWERBTN, power_button_task, NULL, TASK_STACK_SIZE) \
 	TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
-	TASK_ALWAYS(PD, pd_task, NULL, LARGER_TASK_STACK_SIZE) \
+	TASK_ALWAYS(PD_C0, pd_task, NULL, LARGER_TASK_STACK_SIZE) \
+	TASK_ALWAYS(PD_C1, pd_task, NULL, LARGER_TASK_STACK_SIZE) \
 	TASK_NOTEST(PORT80, port80_task, NULL, TASK_STACK_SIZE)
diff --git a/board/glados_pd/board.c b/board/glados_pd/board.c
index 38853f86db..da6fc82525 100644
--- a/board/glados_pd/board.c
+++ b/board/glados_pd/board.c
@@ -36,14 +36,12 @@ void pd_send_ec_int(void)
 
 void vbus0_evt(enum gpio_signal signal)
 {
-	task_wake(TASK_ID_PD);
+	task_wake(TASK_ID_PD_C0);
 }
 
 void vbus1_evt(enum gpio_signal signal)
 {
-#ifdef HAS_TASK_PD_C1
 	task_wake(TASK_ID_PD_C1);
-#endif
 }
 
 void board_config_pre_init(void)
diff --git a/board/glados_pd/board.h b/board/glados_pd/board.h
index 660610992b..999cf5802d 100644
--- a/board/glados_pd/board.h
+++ b/board/glados_pd/board.h
@@ -32,6 +32,8 @@
 /* Optional features */
 #define CONFIG_ADC
 #define CONFIG_BOARD_PRE_INIT
+#undef  CONFIG_CONSOLE_HISTORY
+#define CONFIG_CONSOLE_HISTORY 2
 #define CONFIG_FORCE_CONSOLE_RESUME
 #undef  CONFIG_HOSTCMD_EVENTS
 #define CONFIG_HW_CRC
@@ -46,7 +48,7 @@
 #define CONFIG_UART_TX_BUF_SIZE 128
 #define CONFIG_USB_PD_DUAL_ROLE
 #define CONFIG_USB_PD_INTERNAL_COMP
-#define CONFIG_USB_PD_PORT_COUNT 1
+#define CONFIG_USB_PD_PORT_COUNT 2
 #define CONFIG_USB_PD_TCPC
 #define CONFIG_USBC_VCONN
 #define CONFIG_VBOOT_HASH
diff --git a/board/glados_pd/ec.tasklist b/board/glados_pd/ec.tasklist
index c001ade46f..676c13e60d 100644
--- a/board/glados_pd/ec.tasklist
+++ b/board/glados_pd/ec.tasklist
@@ -18,6 +18,7 @@
  */
 #define CONFIG_TASK_LIST \
 	TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \
-	TASK_NOTEST(HOSTCMD, host_command_task, NULL, LARGER_TASK_STACK_SIZE) \
-	TASK_ALWAYS(CONSOLE, console_task, NULL, LARGER_TASK_STACK_SIZE) \
-	TASK_ALWAYS(PD, pd_task, NULL, LARGER_TASK_STACK_SIZE)
+	TASK_NOTEST(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
+	TASK_ALWAYS(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
+	TASK_ALWAYS(PD_C0, pd_task, NULL, TASK_STACK_SIZE) \
+	TASK_ALWAYS(PD_C1, pd_task, NULL, TASK_STACK_SIZE)