diff --git a/Makefile b/Makefile
index 1e0d0db..58fd4e3 100644
--- a/Makefile
+++ b/Makefile
@@ -14,10 +14,10 @@ django:
 	docker build . -t mumui:local
 
 pushpin-local:
-	cd pushpin && docker build . -t pushpin:local
+	cd pushpin && docker build . -t pushpin:mumui
 
 nginx-local:
-	cd nginx && docker build . -t nginx:local
+	cd nginx && docker build . -t nginx:mumui
 
 build:
 	$(MAKE) pushpin-local
diff --git a/docker-compose.yml b/docker-compose.yml
index f13d77c..65cf352 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,15 +2,15 @@ version: '3'
 services:
   redis:
     image: redis/redis-stack-server:latest
-    container_name: redis
+    container_name: redis-mumui
     networks:
       - mumui_network
     volumes:
       - redis_data:/data
 
   pushpin:
-    image: pushpin:local
-    container_name: pushpin
+    image: pushpin:mumui
+    container_name: pushpin-mumui
     networks:
       - mumui_network
     depends_on:
@@ -18,7 +18,7 @@ services:
 
   postgres:
     image: postgres:latest
-    container_name: postgres
+    container_name: postgres-mumui
     env_file:
       - .env
     networks:
@@ -39,8 +39,8 @@ services:
       - postgres
 
   nginx:
-    image: nginx:local
-    container_name: nginx
+    image: nginx:mumui
+    container_name: nginx-mumui
     networks:
       - mumui_network
     volumes: