diff --git a/www/go.sh b/www/go.sh
index a7e7b9b..1177de6 100755
--- a/www/go.sh
+++ b/www/go.sh
@@ -76,7 +76,7 @@ done
 # TODO check if there are any other stacks that are left running (other than reverse proxy)
 # if so, this may mean the user has disabled one or more domains and that existing sites/services
 # are still running. We should prompt the user of this and quit. They have to go manually docker stack remove these.
-if [[ $(docker stack ls | wc -l) -gt 2 ]]; then
+if [[ $(docker stack list | wc -l) -gt 2 ]]; then
     echo "WARNING! You still have stacks running. If you have modified the SITES list, you may need to go remove the docker stacks runnong the remote machine."
     echo "exiting."
     exit 1
@@ -90,7 +90,7 @@ if [ "$RESTART_FRONT_END" = true ]; then
     if docker stack list --format "{{.Name}}" | grep -q reverse-proxy; then
         sleep 2
 
-        docker stack rm reverse-proxy
+        docker stack down reverse-proxy
 
         # wait for all docker containers to stop.
         # TODO see if there's a way to check for this.
diff --git a/www/stop_docker_stacks.sh b/www/stop_docker_stacks.sh
index 95b8817..eaceecb 100755
--- a/www/stop_docker_stacks.sh
+++ b/www/stop_docker_stacks.sh
@@ -20,7 +20,7 @@ for DOMAIN_NAME in ${DOMAIN_LIST//,/ }; do
             STACK_NAME="$DOMAIN_IDENTIFIER-$APP-$LANGUAGE_CODE"
 
             if docker stack list --format "{{.Name}}" | grep -q "$STACK_NAME"; then
-                docker stack rm "$STACK_NAME"
+                docker stack down "$STACK_NAME"
                 sleep 2
             fi