diff --git a/nautobot-app/{{ cookiecutter.project_slug }}/tasks.py b/nautobot-app/{{ cookiecutter.project_slug }}/tasks.py
index e23c9b8d..e797841b 100644
--- a/nautobot-app/{{ cookiecutter.project_slug }}/tasks.py	
+++ b/nautobot-app/{{ cookiecutter.project_slug }}/tasks.py	
@@ -211,9 +211,9 @@ def restart(context, service=""):
 
 @task(help={"service": "If specified, only affect this service."})
 def stop(context, service=""):
-    """Stop specified or all services, if service is not specified, remove all containers."""
+    """Stop specified or all services, if service is not specified, stop all containers."""
     print("Stopping Nautobot...")
-    docker_compose(context, "stop" if service else "down --remove-orphans", service=service)
+    docker_compose(context, "stop", service=service)
 
 
 @task
diff --git a/tasks.py b/tasks.py
index c631f300..72551c1a 100644
--- a/tasks.py
+++ b/tasks.py
@@ -180,10 +180,10 @@ def restart(context, service=""):
 
 @task(help={"service": "If specified, only affect this service."})
 def stop(context, service=""):
-    """Stop specified or all services, if service is not specified, remove all containers."""
+    """Stop specified or all services, if service is not specified, stop all containers."""
     command = [
         "docker compose",
-        "stop" if service else "down --remove-orphans",
+        "stop",
         "--",
         service,
     ]