diff --git a/app/deploy_system.py b/app/deploy_system.py
index f79595ff..7a5a417e 100644
--- a/app/deploy_system.py
+++ b/app/deploy_system.py
@@ -15,7 +15,9 @@
 
 # Deploys the system components using docker-compose
 
+import hashlib
 import os
+import sys
 from python_on_whales import DockerClient
 import click
 from .util import include_exclude_check
@@ -36,28 +38,37 @@ def command(ctx, include, exclude, cluster, command):
     verbose = ctx.obj.verbose
     dry_run = ctx.obj.dry_run
 
+    if cluster is None:
+        # Create default unique, stable cluster name from confile file path
+        # TODO: change this to the config file path
+        path = os.path.realpath(sys.argv[0])
+        hash = hashlib.md5(path.encode()).hexdigest()
+        cluster = f"laconic-{hash}"
+        if verbose:
+            print(f"Using cluster name: {cluster}")
+
     with open("pod-list.txt") as pod_list_file:
         pods = pod_list_file.read().splitlines()
 
     if verbose:
-        print(f'Cluster components: {pods}')
+        print(f'Pods: {pods}')
 
     # Construct a docker compose command suitable for our purpose
 
     compose_files = []
     for pod in pods:
-        if include_exclude_check(cluster, include, exclude):
-            compose_file_name = os.path.join("compose", f"docker-compose-{cluster}.yml")
+        if include_exclude_check(pod, include, exclude):
+            compose_file_name = os.path.join("compose", f"docker-compose-{pod}.yml")
             compose_files.append(compose_file_name)
         else:
             if not quiet:
-                print(f"Excluding: {cluster}")
+                print(f"Excluding: {pod}")
 
     if verbose:
         print(f"files: {compose_files}")
 
     # See: https://gabrieldemarmiesse.github.io/python-on-whales/sub-commands/compose/
-    docker = DockerClient(compose_files=compose_files)
+    docker = DockerClient(compose_files=compose_files, compose_project_name=cluster)
 
     if not dry_run:
         if command == "up":