diff --git a/arch/tools/cli/docker_cli.py b/arch/tools/cli/docker_cli.py
index ddc1111c..d6b34af5 100644
--- a/arch/tools/cli/docker_cli.py
+++ b/arch/tools/cli/docker_cli.py
@@ -82,8 +82,6 @@ def docker_start_archgw_detached(
         ARCHGW_DOCKER_IMAGE,
     ]
 
-    log.info("options: " + str(options))
-
     result = subprocess.run(options, capture_output=True, text=True, check=False)
     return result.returncode, result.stdout, result.stderr
 
diff --git a/arch/tools/cli/main.py b/arch/tools/cli/main.py
index b86e1d03..2ac5cd20 100644
--- a/arch/tools/cli/main.py
+++ b/arch/tools/cli/main.py
@@ -294,17 +294,18 @@ def up(file, path, service, foreground):
 def down(service):
     """Stops Arch."""
 
-    if service not in [SERVICE_NAME_ARCHGW, SERVICE_NAME_MODEL_SERVER, SERVICE_ALL]:
-        log.info(f"Error: Invalid service {service}. Exiting")
-        sys.exit(1)
+    verify_service_name(service)
 
     if service == SERVICE_NAME_MODEL_SERVER:
         stop_arch_modelserver()
     elif service == SERVICE_NAME_ARCHGW:
         stop_docker_container()
+    elif service == SERVICE_NAME_BRIGHTSTAFF:
+        stop_docker_container(SERVICE_NAME_BRIGHTSTAFF)
     else:
         stop_arch_modelserver()
-        stop_docker_container()
+        stop_docker_container(SERVICE_NAME_ARCHGW)
+        stop_docker_container(SERVICE_NAME_BRIGHTSTAFF)
 
 
 @click.command()