diff --git a/hal/wifi3.0/hal_api.h b/hal/wifi3.0/hal_api.h
index df1397d69c..6eec126aa6 100644
--- a/hal/wifi3.0/hal_api.h
+++ b/hal/wifi3.0/hal_api.h
@@ -24,7 +24,8 @@
 #include "qdf_atomic.h"
 #include "hal_internal.h"
 #define MAX_UNWINDOWED_ADDRESS 0x80000
-#if defined(QCA_WIFI_QCA6390) || defined(QCA_WIFI_QCA6490)
+#if defined(QCA_WIFI_QCA6390) || defined(QCA_WIFI_QCA6490) || \
+	defined(QCA_WIFI_QCN9000)
 #define WINDOW_ENABLE_BIT 0x40000000
 #else
 #define WINDOW_ENABLE_BIT 0x80000000
diff --git a/hif/src/ce/ce_assignment.h b/hif/src/ce/ce_assignment.h
index ccf98dee7b..690e0f044e 100644
--- a/hif/src/ce/ce_assignment.h
+++ b/hif/src/ce/ce_assignment.h
@@ -923,27 +923,27 @@ static struct CE_pipe_config target_ce_config_wlan_adrastea[] = {
 /* QCN9000 enable polling mode */
 static struct CE_attr host_ce_config_wlan_qcn9000[] = {
 	/* host->target HTC control and raw streams */
-	{ /* CE0 */ CE_ATTR_FLAGS, 0, 16, 2048, 0, NULL,},
+	{/*CE0*/ (CE_ATTR_FLAGS | EPPING_CE_FLAGS_POLL), 0, 16, 2048, 0, NULL,},
 	/* target->host HTT + HTC control */
-	{ /* CE1 */ (CE_ATTR_FLAGS | CE_ATTR_ENABLE_POLL), 0, 0,  2048,
+	{/*CE1*/ (CE_ATTR_FLAGS | EPPING_CE_FLAGS_POLL), 0, 0,  2048,
 		512, NULL,},
 	/* target->host WMI */
-	{ /* CE2 */ (CE_ATTR_FLAGS | CE_ATTR_ENABLE_POLL), 0, 0,  2048,
+	{/*CE2*/ (CE_ATTR_FLAGS | EPPING_CE_FLAGS_POLL), 0, 0,  2048,
 		32, NULL,},
 	/* host->target WMI */
-	{ /* CE3 */ CE_ATTR_FLAGS, 0, 32, 2048, 0, NULL,},
+	{/*CE3*/ (CE_ATTR_FLAGS | EPPING_CE_FLAGS_POLL), 0, 32, 2048, 0, NULL,},
 	/* host->target HTT */
-	{ /* CE4 */ (CE_ATTR_FLAGS | CE_ATTR_DISABLE_INTR), 0,
+	{/*CE4*/ (CE_ATTR_FLAGS | EPPING_CE_FLAGS_POLL), 0,
 		CE_HTT_H2T_MSG_SRC_NENTRIES, 256, 0, NULL,},
 	/* target -> host PKTLOG */
-	{ /* CE5 */ (CE_ATTR_FLAGS | CE_ATTR_ENABLE_POLL), 0, 0, 2048,
+	{/*CE5*/ (CE_ATTR_FLAGS | EPPING_CE_FLAGS_POLL), 0, 0, 2048,
 		512, NULL,},
 	/* Target autonomous HIF_memcpy */
-	{ /* CE6 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,},
+	{/*CE6*/ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,},
 	/* host->target WMI (mac1) */
-	{ /* CE7 */ CE_ATTR_FLAGS, 0, 32, 2048, 0, NULL,},
+	{/*CE7*/ CE_ATTR_FLAGS, 0, 32, 2048, 0, NULL,},
 	/* Reserved for target */
-	{ /* CE8 */ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,},
+	{/*CE8*/ CE_ATTR_FLAGS, 0, 0, 0, 0, NULL,},
 	/* CE 9, 10, 11 belong to CoreBsp & MHI driver */
 };
 
diff --git a/hif/src/qcn9000def.c b/hif/src/qcn9000def.c
index d09c8a695e..8a9527c494 100644
--- a/hif/src/qcn9000def.c
+++ b/hif/src/qcn9000def.c
@@ -154,23 +154,20 @@
 #define CE_WRAPPER_INTERRUPT_SUMMARY_ADDRESS MISSING
 #define CE_DDR_ADDRESS_FOR_RRI_LOW MISSING
 #define CE_DDR_ADDRESS_FOR_RRI_HIGH MISSING
-#if defined(WCSS_VERSION) && (WCSS_VERSION > 68)
+
 #define HOST_IE_ADDRESS \
 	HWIO_WFSS_CE_COMMON_R0_CE_HOST_IE_0_ADDR(\
-		SEQ_WCSS_UMAC_WFSS_CE_0_REG_WFSS_CE_COMMON_REG_OFFSET)
+		WFSS_CE_COMMON_REG_REG_BASE)
 #define HOST_IE_REG1_CE_LSB HWIO_WFSS_CE_COMMON_R0_CE_HOST_IE_0_SRC_RING_IE_SHFT
 #define HOST_IE_ADDRESS_2 \
 	HWIO_WFSS_CE_COMMON_R0_CE_HOST_IE_1_ADDR(\
-		SEQ_WCSS_UMAC_WFSS_CE_0_REG_WFSS_CE_COMMON_REG_OFFSET)
+		WFSS_CE_COMMON_REG_REG_BASE)
 #define HOST_IE_REG2_CE_LSB HWIO_WFSS_CE_COMMON_R0_CE_HOST_IE_1_STS_RING_IE_SHFT
 #define HOST_IE_ADDRESS_3 \
 	HWIO_WFSS_CE_COMMON_R0_CE_HOST_IE_0_ADDR(\
-		SEQ_WCSS_UMAC_WFSS_CE_0_REG_WFSS_CE_COMMON_REG_OFFSET)
+		WFSS_CE_COMMON_REG_REG_BASE)
 #define HOST_IE_REG3_CE_LSB HWIO_WFSS_CE_COMMON_R0_CE_HOST_IE_0_DST_RING_IE_SHFT
-#else
-#define HOST_IE_ADDRESS UMAC_CE_COMMON_CE_HOST_IE_0
-#define HOST_IE_ADDRESS_2 UMAC_CE_COMMON_CE_HOST_IE_1
-#endif
+
 #define HOST_IE_COPY_COMPLETE_MASK MISSING
 #define SR_BA_ADDRESS MISSING
 #define SR_BA_ADDRESS_HIGH MISSING