diff --git a/docker/cleanall b/docker/cleanall
index efe6f9f67e2..91eac1764bf 100755
--- a/docker/cleanall
+++ b/docker/cleanall
@@ -1,9 +1,12 @@
 #!/bin/bash
 
-cd ..
-echo "Shutting down any instance still running and purge images..."
-docker compose down -v --rmi all
-echo "Purging dangling images..."
-docker image prune
-cd docker
-echo "Done!"
+read -p "Stop and remove all containers, volumes and images for this project? [y/N] " -n 1 -r
+echo 
+if [[ $REPLY =~ ^[Yy]$ ]]
+then
+    cd ..
+    echo "Shutting down any instance still running and purge images..."
+    docker compose down -v --rmi all
+    cd docker
+    echo "Done!"
+fi
diff --git a/docker/cleandb b/docker/cleandb
index 4329a860142..f772ebce396 100755
--- a/docker/cleandb
+++ b/docker/cleandb
@@ -1,8 +1,11 @@
 #!/bin/bash
 
-echo "Shutting down any instance still running..."
 cd ..
-docker compose down -v
+echo "Shutting down any instance still running..."
+docker compose down
+echo "Removing DB volume..."
+PROJNAME=$(basename $PWD)
+docker volume rm -f "${PROJNAME}_mariadb-data"
 echo "Rebuilding the DB image..."
 docker compose pull db
 docker compose build --no-cache db