diff --git a/docker/common/start.sh b/docker/common/start.sh
index b0f81df8..db971cfb 100755
--- a/docker/common/start.sh
+++ b/docker/common/start.sh
@@ -19,9 +19,9 @@ echo "${PARATIME_NAME}-dev ${VERSION} (oasis-core: ${OASIS_CORE_VERSION}, ${PARA
 echo
 
 if [[ ${PARATIME_NAME} == 'sapphire' ]]; then
-export SAPPHIRE_BACKEND=${SAPPHIRE_BACKEND:-mock}
+	export SAPPHIRE_BACKEND=${SAPPHIRE_BACKEND:-mock}
 else
-export SAPPHIRE_BACKEND=default
+	export SAPPHIRE_BACKEND=default
 fi
 
 OASIS_NODE_SOCKET=${OASIS_NODE_DATADIR}/net-runner/network/client-0/internal.sock
@@ -52,23 +52,26 @@ while ! [[ -S ${OASIS_NODE_SOCKET} ]]; do sleep 1; done
 ${OASIS_WEB3_GATEWAY} --config ${OASIS_WEB3_GATEWAY_CONFIG_FILE} 2>1 &>/var/log/oasis-web3-gateway.log &
 OASIS_WEB3_GATEWAY_PID=$!
 
+echo -n " * Bootstrapping network (this might take a minute)"
 if [[ ${SAPPHIRE_BACKEND} == 'mock' ]]; then
-	echo -n " * Bootstrapping network (this might take a minute)"
-
 	echo -n .
 	${OASIS_NODE} debug control wait-nodes -n 2 -a unix:${OASIS_NODE_SOCKET}
 
 	echo -n .
 	${OASIS_NODE} debug control set-epoch --epoch 1 -a unix:${OASIS_NODE_SOCKET}
 
-	echo .
+	echo -n .
 	${OASIS_NODE} debug control set-epoch --epoch 2 -a unix:${OASIS_NODE_SOCKET}
+	
+	echo -n  .
+	${OASIS_NODE} debug control set-epoch --epoch 3 -a unix:${OASIS_NODE_SOCKET}
 else
-	echo " * Bootstrapping network (this might take a minute)"
-	# Wait for compute nodes before initiating deposit.
+	echo
 	${OASIS_NODE} debug control wait-ready -a unix:${OASIS_NODE_SOCKET}
 fi
 
+# Wait for compute nodes before initiating deposit.
+
 echo " * Populating accounts"
 echo ""
 ${OASIS_DEPOSIT} -sock unix:${OASIS_NODE_SOCKET} "$@"
diff --git a/docker/sapphire-dev/Dockerfile b/docker/sapphire-dev/Dockerfile
index d4bf12ff..12f480cc 100644
--- a/docker/sapphire-dev/Dockerfile
+++ b/docker/sapphire-dev/Dockerfile
@@ -5,7 +5,7 @@ COPY . /go/oasis-web3-gateway
 RUN cd oasis-web3-gateway && make build
 
 # Build simple-keymanager
-FROM oasisprotocol/oasis-core-dev:stable-22.2.x AS oasis-core-dev
+FROM ghcr.io/oasisprotocol/oasis-core-dev:stable-23.0.x AS oasis-core-dev
 
 ENV OASIS_UNSAFE_SKIP_KM_POLICY=1