diff --git a/Makefile b/Makefile
index 0e1c3fb48..15078b582 100644
--- a/Makefile
+++ b/Makefile
@@ -133,6 +133,9 @@ test-e2e: down-locally build-dss start-locally probe-locally collect-local-logs
 tag:
 	scripts/tag.sh $(UPSTREAM_OWNER)/dss/v$(VERSION)
 
+.PHONY: restart-all
+restart-all: build-dss down-locally start-locally
+
 .PHONY: start-locally
 start-locally:
 	build/dev/run_locally.sh up -d
diff --git a/build/dev/docker-compose_dss.yaml b/build/dev/docker-compose_dss.yaml
index b4a221953..e84e4d078 100644
--- a/build/dev/docker-compose_dss.yaml
+++ b/build/dev/docker-compose_dss.yaml
@@ -10,13 +10,12 @@ services:
   local-dss-crdb:
     image: cockroachdb/cockroach:v21.2.7
     command: start-single-node --insecure
-    expose:
-      - 26257
     ports:
+      - "26257:26257"
       - "8080:8080"
     restart: always
     networks:
-      - dss_sandbox_default_network 
+      - dss_sandbox_default_network
 
   local-dss-rid-bootstrapper:
     build:
@@ -30,7 +29,7 @@ services:
     depends_on:
       - local-dss-crdb
     networks:
-      - dss_sandbox_default_network 
+      - dss_sandbox_default_network
 
   local-dss-scd-bootstrapper:
     build:
@@ -44,7 +43,7 @@ services:
     depends_on:
       - local-dss-crdb
     networks:
-      - dss_sandbox_default_network 
+      - dss_sandbox_default_network
 
   local-dss-core-service:
     build:
@@ -63,7 +62,7 @@ services:
       - local-dss-rid-bootstrapper
       - local-dss-scd-bootstrapper
     networks:
-      - dss_sandbox_default_network 
+      - dss_sandbox_default_network
 
   local-dss-dummy-oauth:
     build:
@@ -74,7 +73,7 @@ services:
     ports:
       - "8085:8085"
     networks:
-      - dss_sandbox_default_network 
+      - dss_sandbox_default_network
 
 networks:
   dss_sandbox_default_network: