diff --git a/build/dev/docker-compose.yaml b/build/dev/docker-compose.yaml
index 42a4887992..1cbf860e17 100644
--- a/build/dev/docker-compose.yaml
+++ b/build/dev/docker-compose.yaml
@@ -176,6 +176,8 @@ services:
     ports:
       - "40${PADDED_NODE_IDX:?}:4000"
       - "80${PADDED_NODE_IDX:?}:80"
+      - "95${PADDED_NODE_IDX:?}:95${PADDED_NODE_IDX:?}"
+      - "96${PADDED_NODE_IDX:?}:96${PADDED_NODE_IDX:?}"
       - "97${PADDED_NODE_IDX:?}:97${PADDED_NODE_IDX:?}"
     environment:
       COMPOSE_PROFILES: ${COMPOSE_PROFILES}
@@ -186,7 +188,9 @@ services:
       INTRA_USS_NETEM_CONF: ${INTRA_USS_NETEM_CONF-}
       INTER_USS_NETEM_CONF: ${INTER_USS_NETEM_CONF-}
       RAFT_ID: ${RAFT_ID:-1}
-      RAFT_NODES: ${RAFT_NODES-}
+      AUX_RAFT_NODES: ${AUX_RAFT_NODES-}
+      RID_RAFT_NODES: ${RID_RAFT_NODES-}
+      SCD_RAFT_NODES: ${SCD_RAFT_NODES-}
     healthcheck:
       test: wget -O - 'http://localhost/healthy' || exit 1
       start_period: 120s # yugabyte may be slow to be ready, and the dss service needs the ybdb service live in order to be healthy
diff --git a/build/dev/run_locally.sh b/build/dev/run_locally.sh
index 84b7af11d7..ba83a1694f 100755
--- a/build/dev/run_locally.sh
+++ b/build/dev/run_locally.sh
@@ -52,15 +52,22 @@ if [[ "$DC_COMMAND" == up* ]]; then
 fi
 
 if [[ "$DB_TYPE" == "raft" ]]; then
-  RAFT_NODES=""
+  RID_RAFT_NODES=""
+  SCD_RAFT_NODES=""
+  AUX_RAFT_NODES=""
   for ((i=1; i<=NUM_USS; i++)); do
     for ((j=1; j<=NUM_NODES; j++)); do
       NODE_IDX=$(( (i-1) * NUM_NODES + j ))
       PADDED_NODE_IDX=$(printf "%02d" "$NODE_IDX")
-      RAFT_NODES="${RAFT_NODES},${NODE_IDX}=http://dss${j}.uss${i}.localutm:97${PADDED_NODE_IDX}"
+      HOST="dss${j}.uss${i}.localutm"
+      RID_RAFT_NODES="${RID_RAFT_NODES},${NODE_IDX}=http://${HOST}:95${PADDED_NODE_IDX}"
+      SCD_RAFT_NODES="${SCD_RAFT_NODES},${NODE_IDX}=http://${HOST}:96${PADDED_NODE_IDX}"
+      AUX_RAFT_NODES="${AUX_RAFT_NODES},${NODE_IDX}=http://${HOST}:97${PADDED_NODE_IDX}"
     done
   done
-  export RAFT_NODES=${RAFT_NODES#,}
+  export RID_RAFT_NODES=${RID_RAFT_NODES#,}
+  export SCD_RAFT_NODES=${SCD_RAFT_NODES#,}
+  export AUX_RAFT_NODES=${AUX_RAFT_NODES#,}
 fi
 
 for ((i=1; i<=NUM_USS; i++)); do
diff --git a/build/dev/startup/core_service.sh b/build/dev/startup/core_service.sh
index 75d2b44b3f..d7b2ba5f56 100755
--- a/build/dev/startup/core_service.sh
+++ b/build/dev/startup/core_service.sh
@@ -34,7 +34,7 @@ if [ "${COMPOSE_PROFILES#*"ybdb"}" != "${COMPOSE_PROFILES}" ]; then
   DB_PORT=5433
 elif [ "${COMPOSE_PROFILES#*"raft"}" != "${COMPOSE_PROFILES}" ]; then
   echo "Using raft"
-  DATASTORE_CONNECTION="-store_type raft -raft_node_id=${RAFT_ID} -raft_peers=${RAFT_NODES} -raft_datadir /raftdata"
+  DATASTORE_CONNECTION="-store_type raft -raft_node_id=${RAFT_ID} -rid_raft_peers=${RID_RAFT_NODES} -scd_raft_peers=${SCD_RAFT_NODES} -aux_raft_peers=${AUX_RAFT_NODES} -raft_datadir /raftdata"
   DB_PORT=
 else
   echo "Using CockroachDB"