diff --git a/.env b/.env
index e406de9..f1889cb 100644
--- a/.env
+++ b/.env
@@ -82,6 +82,7 @@ HIU_MAX_IN_MEMORY_SIZE=500MB
 HIU_DATA_FLOW_CONSENT_REQUEST_WAIT_TIME=1
 HIU_DATA_FLOW_CONSENT_ARTEFACT_WAIT_TIME=1
 HIU_DATA_FLOW_PART_WAIT_TIME=1440
+HIU_CONSENT_MANAGEMENT_SUFFIX="@sbx"
 
 HIP_URL=
 HIP_ID=
@@ -98,12 +99,12 @@ HIP_DB_USER=postgres
 HIP_DB_HOST=db
 HIP_DB_PORT=5432
 HIP_DB_PASSWORD=welcome
+HIP_CONSENT_MANAGEMENT_SUFFIX="sbx"
 
 
 ABDM_GATEWAY_JWK_URL="https://dev.abdm.gov.in/gateway/v0.5/certs"
 ABDM_GATEWAY_BASE_URL="https://dev.abdm.gov.in/gateway/v0.5"
 ABDM_CONSENT_MANAGEMENT_URL="https://dev.ndhm.gov.in/cm"
-ABDM_CONSENT_MANAGEMENT_SUFFIX="@sbx"
 ABDM_CONSENT_NOTIFICATION_URL="http://localhost:8003/consent/notification"
 ABDM_HFR_AFFINITY_DOMAINS=facilitysbx.ndhm.gov.in
 ABDM_IDENTITY_JWK_URL= https://dev.ndhm.gov.in/auth/realms/consent-manager/protocol/openid-connect/certs
diff --git a/docker-compose.yml b/docker-compose.yml
index b1bb151..ec86e31 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -108,7 +108,7 @@ services:
       Gateway:url: ${ABDM_GATEWAY_URL:?}
       OpenMrs:url: ${OPENMRS_URL:?}
       OpenMrs:password: ${OPENMRS_PASSWORD:?}
-      Gateway:cmSuffix: ${ABDM_CONSENT_MANAGEMENT_SUFFIX:?}
+      Gateway:cmSuffix: ${HIP_CONSENT_MANAGEMENT_SUFFIX:?}
       OtpService:BaseUrl: ${HIP_OTP_SERVICE_URL:?}
       hip:url: ${HIP_URL:?}
       HEALTH_CHECK_DURATION: ${HIP_OPENMRS_HEALTH_CHECK_DURATION:?}
@@ -128,7 +128,7 @@ services:
       IDENTITY_JWK_URL: ${ABDM_IDENTITY_JWK_URL:?}
       DATA_PUSH_URL: ${HIU_DATA_PUSH_URL:?}
       CONSENT_NOTIFICATION_URL: ${ABDM_CONSENT_NOTIFICATION_URL:?}
-      CONSENT_MANAGEMENT_SUFFIX:  ${ABDM_CONSENT_MANAGEMENT_SUFFIX:?}
+      CONSENT_MANAGEMENT_SUFFIX:  ${HIU_CONSENT_MANAGEMENT_SUFFIX:?}
       CONSENT_MANAGEMENT_URL: ${ABDM_CONSENT_MANAGEMENT_URL:?}
       DEFAULT_PAGE_SIZE: ${HIU_DEFAULT_PAGE_SIZE:?}
       MAX_PAGE_SIZE: ${HIU_MAX_PAGE_SIZE:?}