diff --git a/src/drivers/net/mlx_ipoib/ib_driver.h b/src/drivers/net/mlx_ipoib/ib_driver.h
index 305bb5d4..57c02820 100644
--- a/src/drivers/net/mlx_ipoib/ib_driver.h
+++ b/src/drivers/net/mlx_ipoib/ib_driver.h
@@ -51,7 +51,7 @@
 enum {
 	MADS_QPN_SN,
 	IPOIB_QPN_SN,
-	MAX_APP_QPS
+	MAX_APP_QPS = 8
 };
 
 enum {
@@ -59,7 +59,7 @@ enum {
 	MADS_RCV_CQN_SN,
 	IPOIB_SND_CQN_SN,
 	IPOIB_RCV_CQN_SN,
-	MAX_APP_CQS
+	MAX_APP_CQS = 8
 };
 
 enum {
diff --git a/src/drivers/net/mlx_ipoib/mt25218.h b/src/drivers/net/mlx_ipoib/mt25218.h
index 85c60a0e..702b5caf 100644
--- a/src/drivers/net/mlx_ipoib/mt25218.h
+++ b/src/drivers/net/mlx_ipoib/mt25218.h
@@ -146,24 +146,24 @@
 
 /* uar context indexes */
 enum {
-	MADS_SND_CQ_ARM_DB_IDX,
-	MADS_RCV_CQ_ARM_DB_IDX,
-	IPOIB_SND_CQ_ARM_DB_IDX,
-	IPOIB_RCV_CQ_ARM_DB_IDX,
-	MADS_SND_QP_DB_IDX,
-	IPOIB_SND_QP_DB_IDX,
-	GROUP_SEP_IDX,
-	START_UNMAPPED_DB_IDX,
+	MADS_SND_CQ_ARM_DB_IDX = MADS_SND_CQN_SN,
+	MADS_RCV_CQ_ARM_DB_IDX = MADS_RCV_CQN_SN,
+	IPOIB_SND_CQ_ARM_DB_IDX = IPOIB_SND_CQN_SN,
+	IPOIB_RCV_CQ_ARM_DB_IDX = IPOIB_RCV_CQN_SN,
+	MADS_SND_QP_DB_IDX = ( MAX_APP_CQS + MADS_QPN_SN ),
+	IPOIB_SND_QP_DB_IDX = ( MAX_APP_CQS + IPOIB_QPN_SN ),
+	GROUP_SEP_IDX = ( MAX_APP_CQS + MAX_APP_QPS ),
+	//	START_UNMAPPED_DB_IDX,
 	/* --------------------------
 	   unmapped doorbell records
 	   -------------------------- */
-	END_UNMAPPED_DB_IDX = 505,
-	IPOIB_RCV_QP_DB_IDX = 506,
-	MADS_RCV_QP_DB_IDX = 507,
-	IPOIB_RCV_CQ_CI_DB_IDX = 508,
-	IPOIB_SND_CQ_CI_DB_IDX = 509,
-	MADS_RCV_CQ_CI_DB_IDX = 510,
-	MADS_SND_CQ_CI_DB_IDX = 511,
+	//	END_UNMAPPED_DB_IDX,
+	IPOIB_RCV_QP_DB_IDX = ( 512 - MAX_APP_CQS - IPOIB_QPN_SN - 1 ),
+	MADS_RCV_QP_DB_IDX = ( 512 - MAX_APP_CQS - MADS_QPN_SN - 1 ),
+	IPOIB_RCV_CQ_CI_DB_IDX = ( 512 - IPOIB_RCV_CQN_SN - 1 ),
+	IPOIB_SND_CQ_CI_DB_IDX = ( 512 - IPOIB_SND_CQN_SN - 1 ),
+	MADS_RCV_CQ_CI_DB_IDX = ( 512 - MADS_RCV_CQN_SN - 1 ),
+	MADS_SND_CQ_CI_DB_IDX = ( 512 - MADS_SND_CQN_SN - 1 ),
 };
 
 /* uar resources types */