diff --git a/Kbuild b/Kbuild
index d78327bc0b50..d4cf895ecf15 100644
--- a/Kbuild
+++ b/Kbuild
@@ -2037,6 +2037,10 @@ ifdef CONFIG_CFG_NUM_RX_IND_RECORD
 ccflags-y += -DOL_RX_INDICATION_MAX_RECORDS=$(CONFIG_CFG_NUM_RX_IND_RECORD)
 endif
 
+ifdef CONFIG_CFG_NUM_ROAM_DEBUG_RECORD
+ccflags-y += -DWLAN_ROAM_DEBUG_MAX_REC=$(CONFIG_CFG_NUM_ROAM_DEBUG_RECORD)
+endif
+
 ifdef CONFIG_CFG_PMO_WOW_FILTERS_MAX
 ccflags-y += -DPMO_WOW_FILTERS_MAX=$(CONFIG_CFG_PMO_WOW_FILTERS_MAX)
 endif
diff --git a/configs/genoa.pci.perf_defconfig b/configs/genoa.pci.perf_defconfig
index 1a5a1b16c2eb..0e6ee882ee8e 100644
--- a/configs/genoa.pci.perf_defconfig
+++ b/configs/genoa.pci.perf_defconfig
@@ -107,4 +107,8 @@ CONFIG_CFG_NUM_WMI_EVENT_HISTORY := 16
 CONFIG_CFG_NUM_WMI_MGMT_EVENT_HISTORY := 16
 CONFIG_CFG_NUM_TX_RX_HISTOGRAM := 16
 CONFIG_CFG_NUM_RX_IND_RECORD := 1024
+
+ifeq ($(CONFIG_FEATURE_ROAM_DEBUG), y)
+CONFIG_CFG_NUM_ROAM_DEBUG_RECORD := 64
+endif
 ###################################
diff --git a/configs/genoa.sdio.perf_defconfig b/configs/genoa.sdio.perf_defconfig
index e7a0e37454f6..fb6eebe224b3 100644
--- a/configs/genoa.sdio.perf_defconfig
+++ b/configs/genoa.sdio.perf_defconfig
@@ -42,4 +42,8 @@ CONFIG_CFG_NUM_WMI_EVENT_HISTORY := 16
 CONFIG_CFG_NUM_WMI_MGMT_EVENT_HISTORY := 16
 CONFIG_CFG_NUM_TX_RX_HISTOGRAM := 16
 CONFIG_CFG_NUM_RX_IND_RECORD := 1024
+
+ifeq ($(CONFIG_FEATURE_ROAM_DEBUG), y)
+CONFIG_CFG_NUM_ROAM_DEBUG_RECORD := 64
+endif
 ###################################
diff --git a/configs/genoa.snoc.perf_defconfig b/configs/genoa.snoc.perf_defconfig
index fada60afd451..a01da0a583a6 100644
--- a/configs/genoa.snoc.perf_defconfig
+++ b/configs/genoa.snoc.perf_defconfig
@@ -81,4 +81,8 @@ CONFIG_CFG_NUM_WMI_EVENT_HISTORY := 16
 CONFIG_CFG_NUM_WMI_MGMT_EVENT_HISTORY := 16
 CONFIG_CFG_NUM_TX_RX_HISTOGRAM := 16
 CONFIG_CFG_NUM_RX_IND_RECORD := 1024
+
+ifeq ($(CONFIG_FEATURE_ROAM_DEBUG), y)
+CONFIG_CFG_NUM_ROAM_DEBUG_RECORD := 64
+endif
 ###################################
diff --git a/configs/genoa.usb.perf_defconfig b/configs/genoa.usb.perf_defconfig
index 19f1f829538e..8ab7e3977b13 100644
--- a/configs/genoa.usb.perf_defconfig
+++ b/configs/genoa.usb.perf_defconfig
@@ -40,4 +40,8 @@ CONFIG_CFG_NUM_WMI_EVENT_HISTORY := 16
 CONFIG_CFG_NUM_WMI_MGMT_EVENT_HISTORY := 16
 CONFIG_CFG_NUM_TX_RX_HISTOGRAM := 16
 CONFIG_CFG_NUM_RX_IND_RECORD := 1024
+
+ifeq ($(CONFIG_FEATURE_ROAM_DEBUG), y)
+CONFIG_CFG_NUM_ROAM_DEBUG_RECORD := 64
+endif
 ###################################
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 970da4e007e8..bfd3af29e69d 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -37,6 +37,7 @@
 #include <wlan_ptt_sock_svc.h>
 #include <dbglog_host.h>
 #include <wlan_logging_sock_svc.h>
+#include <wlan_roam_debug.h>
 #include <wlan_hdd_wowl.h>
 #include <wlan_hdd_misc.h>
 #include <wlan_hdd_wext.h>
@@ -12164,6 +12165,7 @@ int hdd_init(void)
 	hdd_qdf_print_init();
 
 	hdd_register_debug_callback();
+	wlan_roam_debug_init();
 
 err_out:
 	return ret;
@@ -12178,15 +12180,16 @@ err_out:
  */
 void hdd_deinit(void)
 {
+	wlan_roam_debug_deinit();
+	hdd_qdf_print_deinit();
 	qdf_timer_free(&hdd_drv_ops_inactivity_timer);
 
-	wlan_destroy_bug_report_lock();
-	cds_deinit();
-
-	hdd_qdf_print_deinit();
 #ifdef WLAN_LOGGING_SOCK_SVC_ENABLE
 	wlan_logging_sock_deinit_svc();
 #endif
+
+	wlan_destroy_bug_report_lock();
+	cds_deinit();
 }
 
 #ifdef QCA_WIFI_NAPIER_EMULATION