diff --git a/bin/docker/boot_dev b/bin/docker/boot_dev
index 0a80ac638a7..781f0567a3d 100755
--- a/bin/docker/boot_dev
+++ b/bin/docker/boot_dev
@@ -38,7 +38,7 @@ echo "Using data in:   ${DATA_DIR}"
 
 mkdir -p "${DATA_DIR}"
 
-docker run -d -p 1080:1080 -p 3000:3000 -v "$DATA_DIR:/shared/postgres_data" -v "$SOURCE_DIR:/src" --hostname=discourse --name=discourse_dev --restart=always discourse/discourse_dev:release /sbin/boot
+docker run -d -p 1080:1080 -p 3000:3000 -v "$DATA_DIR:/shared/postgres_data:delegated" -v "$SOURCE_DIR:/src:delegated" --hostname=discourse --name=discourse_dev --restart=always discourse/discourse_dev:release /sbin/boot
 
 if [ "${initialize}" = "initialize" ]; then
     echo "Installing gems..."
diff --git a/bin/docker/shutdown_dev b/bin/docker/shutdown_dev
index 557ccfe9dff..672299efb00 100755
--- a/bin/docker/shutdown_dev
+++ b/bin/docker/shutdown_dev
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker rm -f discourse_dev
+docker stop discourse_dev && docker rm discourse_dev