diff --git a/docker-compose-auth.yml b/docker-compose-auth.yml
index cb27dee..56a45a5 100644
--- a/docker-compose-auth.yml
+++ b/docker-compose-auth.yml
@@ -1,10 +1,11 @@
 version: "3.6"
 
+name: cms
+
 services:
 
   auth-db:
     image: postgres:14
-    container_name: cms_auth-db
     restart: always
     networks:
       - cogstack-model-serve_cms
diff --git a/docker-compose-celery.yml b/docker-compose-celery.yml
index bce8ef8..6d94954 100644
--- a/docker-compose-celery.yml
+++ b/docker-compose-celery.yml
@@ -1,5 +1,7 @@
 version: "3.6"
 
+name: cms
+
 services:
   worker:
     build:
@@ -12,7 +14,6 @@ services:
         - HTTP_PROXY=$HTTP_PROXY
         - HTTPS_PROXY=$HTTPS_PROXY
         - NO_PROXY=$NO_PROXY
-    container_name: cms_worker
     networks:
       - cms
     volumes:
@@ -32,7 +33,6 @@ services:
     build:
       context: ./
       dockerfile: ./docker/celery/Dockerfile-Dashboard
-    container_name: cms_worker_dashboard
     networks:
       - cms
     ports:
@@ -45,7 +45,6 @@ services:
 
   redis:
     image: redis:7
-    container_name: cms_redis
     networks:
       - cms
     ports:
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 699e5ac..11746ab 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -1,6 +1,8 @@
 # This is for spinning up core services as single hosts in the DEV environment
 version: "3.6"
 
+name: dev-cms
+
 services:
 
   medcat-snomed:
@@ -8,7 +10,6 @@ services:
       file: ./docker-compose.yml
       service: medcat-snomed
     image: cogstack-model-serve_medcat-snomed:dev
-    container_name: dev-cms_medcat-snomed
     volumes:
       - ${MODEL_PACKAGE_FULL_PATH}:/app/model/model.zip:ro
     environment:
@@ -37,7 +38,6 @@ services:
       file: ./docker-compose.yml
       service: medcat-icd10
     image: cogstack-model-serve_medcat-icd10:dev
-    container_name: dev-cms_medcat-icd10
     environment:
       - BASE_MODEL_FULL_PATH=$MODEL_PACKAGE_FULL_PATH
       - AWS_ACCESS_KEY_ID=
@@ -64,7 +64,6 @@ services:
       file: ./docker-compose.yml
       service: de-identification
     image: cogstack-model-serve_de-identification:dev
-    container_name: dev-cms_trf-deid
     environment:
       - BASE_MODEL_FULL_PATH=$MODEL_PACKAGE_FULL_PATH
       - AWS_ACCESS_KEY_ID=
@@ -91,7 +90,6 @@ services:
       file: ./docker-compose.yml
       service: medcat-deid
     image: cogstack-model-serve_medcat-deid:dev
-    container_name: dev-cms_medcat-deid
     environment:
       - BASE_MODEL_FULL_PATH=$MODEL_PACKAGE_FULL_PATH
       - AWS_ACCESS_KEY_ID=
@@ -118,7 +116,6 @@ services:
       file: ./docker-compose.yml
       service: medcat-umls
     image: cogstack-model-serve_medcat-umls:dev
-    container_name: dev-cms_medcat-umls
     environment:
       - BASE_MODEL_FULL_PATH=$MODEL_PACKAGE_FULL_PATH
       - AWS_ACCESS_KEY_ID=
diff --git a/docker-compose-log.yml b/docker-compose-log.yml
index a12c198..19dfa76 100644
--- a/docker-compose-log.yml
+++ b/docker-compose-log.yml
@@ -1,10 +1,11 @@
 version: "3.6"
 
+name: cms
+
 services:
 
   mongodb:
     image: mongo:5.0
-    container_name: cms_mongodb
     volumes:
       - mongodb_data:/data/db
     restart: always
@@ -20,7 +21,6 @@ services:
 
   opensearch:
     image: opensearchproject/opensearch:2.4.0
-    container_name: cms_opensearch
     environment:
       - OPENSEARCH_JAVA_OPTS=-Xms1g -Xmx1g
       - bootstrap.memory_lock=true
@@ -47,7 +47,6 @@ services:
 
   graylog:
     image: graylog/graylog:5.0
-    container_name: cms_graylog
     depends_on:
       opensearch:
         condition: "service_healthy"
diff --git a/docker-compose-mlflow.yml b/docker-compose-mlflow.yml
index af1121c..7c5f3ae 100644
--- a/docker-compose-mlflow.yml
+++ b/docker-compose-mlflow.yml
@@ -1,10 +1,11 @@
 version: "3.6"
 
+name: cms
+
 services:
 
   mlflow-db:
     image: postgres:14
-    container_name: cms_mlflow-db
     restart: always
     networks:
       - cogstack-model-serve_cms
@@ -24,7 +25,6 @@ services:
 
   minio:
     image: minio/minio:RELEASE.2022-06-30T20-58-09Z
-    container_name: cms_minio
     restart: always
     networks:
       - cogstack-model-serve_cms
@@ -71,7 +71,6 @@ services:
         - HTTP_PROXY=$HTTP_PROXY
         - HTTPS_PROXY=$HTTPS_PROXY
         - NO_PROXY=$NO_PROXY
-    container_name: cms_mlflow-ui
     restart: always
     networks:
       - cogstack-model-serve_cms
@@ -80,7 +79,7 @@ services:
     environment:
       - MLFLOW_DB_USERNAME=$MLFLOW_DB_USERNAME
       - MLFLOW_DB_PASSWORD=$MLFLOW_DB_PASSWORD
-      - MLFLOW_BACKEND_STORE_URI=postgresql://$MLFLOW_DB_USERNAME:$MLFLOW_DB_PASSWORD@cms_mlflow-db:5432/mlflow-backend-store
+      - MLFLOW_BACKEND_STORE_URI=postgresql://$MLFLOW_DB_USERNAME:$MLFLOW_DB_PASSWORD@mlflow-db:5432/mlflow-backend-store
       - MLFLOW_TRACKING_URI=http://localhost:5000
       - ARTIFACTS_DESTINATION=s3://cms-model-bucket
       - MLFLOW_S3_ENDPOINT_URL=http://minio:9000
@@ -121,7 +120,6 @@ services:
         - NO_PROXY=$NO_PROXY
     profiles:
       - wip
-    container_name: cms_mlflow-deployments
     restart: always
     networks:
       - cogstack-model-serve_cms
@@ -153,7 +151,8 @@ services:
         - NO_PROXY=$NO_PROXY
     profiles:
       - wip
-    container_name: cms_mlflow-${MODEL_NAME:-model}
+    labels:
+      - org.cogstack.model-serve.model-name=${MODEL_NAME:-model}
     restart: always
     networks:
       - cogstack-model-serve_cms
diff --git a/docker-compose-mon.yml b/docker-compose-mon.yml
index 86dc8fd..c76d0e5 100644
--- a/docker-compose-mon.yml
+++ b/docker-compose-mon.yml
@@ -1,10 +1,11 @@
 version: "3.6"
 
+name: cms
+
 services:
 
   prometheus:
     image: prom/prometheus:v2.41.0
-    container_name: cms_prometheus
     restart: always
     networks:
       - cogstack-model-serve_cms
@@ -29,7 +30,6 @@ services:
 
   grafana:
     image: grafana/grafana:9.3.2-ubuntu
-    container_name: cms_grafana
     restart: always
     networks:
       - cogstack-model-serve_cms
@@ -51,7 +51,6 @@ services:
 
   alertmanager:
     image: prom/alertmanager:v0.25.0
-    container_name: cms_alertmanager
     restart: always
     networks:
       - cogstack-model-serve_cms
@@ -73,7 +72,6 @@ services:
 
   cadvisor:
     image: gcr.io/cadvisor/cadvisor:v0.46.0
-    container_name: cms_cadvisor
     restart: always
     networks:
       - cogstack-model-serve_cms
diff --git a/docker-compose-proxy.yml b/docker-compose-proxy.yml
index 4a9bf56..4a6becd 100644
--- a/docker-compose-proxy.yml
+++ b/docker-compose-proxy.yml
@@ -1,5 +1,7 @@
 version: "3.6"
 
+name: cms
+
 services:
 
   proxy:
@@ -10,7 +12,6 @@ services:
         - HTTP_PROXY=$HTTP_PROXY
         - HTTPS_PROXY=$HTTPS_PROXY
         - NO_PROXY=$NO_PROXY
-    container_name: cms_proxy
     restart: always
     networks:
       - cogstack-model-serve_cms
diff --git a/docker-compose.yml b/docker-compose.yml
index 4d17877..39435ab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,7 @@
 version: "3.6"
 
+name: cms
+
 services:
 
   medcat-snomed:
@@ -13,7 +15,6 @@ services:
           - HTTP_PROXY=$HTTP_PROXY
           - HTTPS_PROXY=$HTTPS_PROXY
           - NO_PROXY=$NO_PROXY
-    container_name: cms_medcat-snomed
     restart: always
     networks:
       - cms
@@ -63,7 +64,6 @@ services:
           - HTTP_PROXY=$HTTP_PROXY
           - HTTPS_PROXY=$HTTPS_PROXY
           - NO_PROXY=$NO_PROXY
-    container_name: cms_medcat-icd10
     restart: always
     networks:
       - cms
@@ -113,7 +113,6 @@ services:
           - HTTP_PROXY=$HTTP_PROXY
           - HTTPS_PROXY=$HTTPS_PROXY
           - NO_PROXY=$NO_PROXY
-    container_name: cms_trf-deid
     restart: always
     networks:
       - cms
@@ -162,7 +161,6 @@ services:
         - HTTP_PROXY=$HTTP_PROXY
         - HTTPS_PROXY=$HTTPS_PROXY
         - NO_PROXY=$NO_PROXY
-    container_name: cms_medcat-deid
     restart: always
     networks:
       - cms
@@ -212,7 +210,6 @@ services:
         - HTTP_PROXY=$HTTP_PROXY
         - HTTPS_PROXY=$HTTPS_PROXY
         - NO_PROXY=$NO_PROXY
-    container_name: cms_medcat-umls
     restart: always
     networks:
       - cms
@@ -262,7 +259,6 @@ services:
         - HTTP_PROXY=$HTTP_PROXY
         - HTTPS_PROXY=$HTTPS_PROXY
         - NO_PROXY=$NO_PROXY
-    container_name: cms_huggingface-ner
     restart: always
     networks:
       - cms
diff --git a/tests/load/docker-compose.yml b/tests/load/docker-compose.yml
index 9198471..0b31d02 100644
--- a/tests/load/docker-compose.yml
+++ b/tests/load/docker-compose.yml
@@ -1,9 +1,12 @@
 version: "3"
 
+name: cms-load
+
 services:
   master:
     image: locustio/locust:2.26.0
-    container_name: cms_load_master
+    labels:
+      - org.cogstack.model-serve.locust=master
     networks:
       - cogstack-model-serve_cms
     ports:
@@ -25,7 +28,8 @@ services:
 
   worker:
     image: locustio/locust:2.26.0
-    container_name: cms_load_worker
+    labels:
+      - org.cogstack.model-serve.locust=worker
     networks:
       - cogstack-model-serve_cms
     environment: