diff --git a/meta-facebook/minerva-ag/src/platform/plat_event.c b/meta-facebook/minerva-ag/src/platform/plat_event.c
index 6e9fc96b7d..b61d252dfa 100644
--- a/meta-facebook/minerva-ag/src/platform/plat_event.c
+++ b/meta-facebook/minerva-ag/src/platform/plat_event.c
@@ -181,9 +181,12 @@ void poll_cpld_registers()
 
 void init_cpld_polling(void)
 {
-	cpld_polling_tid = k_thread_create(
-		&cpld_polling_thread, cpld_polling_stack, K_THREAD_STACK_SIZEOF(cpld_polling_stack),
-		poll_cpld_registers, NULL, NULL, NULL, CONFIG_MAIN_THREAD_PRIORITY, 0,
-		K_MSEC(3000)); //sleep for 3 seconds to prevent dc status changing when reboot BIC
+	cpld_polling_tid =
+		k_thread_create(&cpld_polling_thread, cpld_polling_stack,
+				K_THREAD_STACK_SIZEOF(cpld_polling_stack), poll_cpld_registers,
+				NULL, NULL, NULL, CONFIG_MAIN_THREAD_PRIORITY, 0,
+				K_MSEC(2000)); /* Start accessing CPLD 3 seconds after BIC reboot 
+                   (2-second thread start delay + 1-second CPLD_POLLING_INTERVAL_MS) 
+                   to prevent DC status changes during BIC reboot */
 	k_thread_name_set(&cpld_polling_thread, "cpld_polling_thread");
 }
diff --git a/meta-facebook/minerva-ag/src/platform/plat_mctp.c b/meta-facebook/minerva-ag/src/platform/plat_mctp.c
index 75236771c0..ba75b18248 100644
--- a/meta-facebook/minerva-ag/src/platform/plat_mctp.c
+++ b/meta-facebook/minerva-ag/src/platform/plat_mctp.c
@@ -176,7 +176,6 @@ void plat_mctp_init(void)
 		mctp_reg_msg_rx_func(p->mctp_inst, mctp_msg_recv);
 
 		mctp_start(p->mctp_inst);
-		k_msleep(5000);
 	}
 }