diff --git a/docker-compose.yml b/docker-compose.yml
index 413587b..cb94fdd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,26 +3,22 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
-    container_name: guestlist-app
     restart: unless-stopped
     ports:
-      - "8080:8080"
+      - "${APP_PORT:-8080}:8080"
     environment:
       ASPNETCORE_ENVIRONMENT: Production
       ASPNETCORE_URLS: http://+:8080
       Mongo__ConnectionString: mongodb://mongo:27017
-      Mongo__DatabaseName: guestlist
+      Mongo__DatabaseName: ${MONGO_DATABASE:-guestlist}
     depends_on:
       - mongo
 
   mongo:
     image: mongo:7
-    container_name: guestlist-mongo
     restart: unless-stopped
     volumes:
       - mongo_data:/data/db
-    ports:
-      - "27017:27017"
 
 volumes:
   mongo_data: