diff --git a/Containerfile b/Containerfile
index 79955ba..7203e1b 100644
--- a/Containerfile
+++ b/Containerfile
@@ -33,4 +33,4 @@ COPY --from=builder /app/service .
 EXPOSE 8081
 
 # Command to run the application
-CMD ["./service"]
+ENTRYPOINT ["./service"]
diff --git a/compose.yaml b/compose.yaml
index fa14dbb..a19e853 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -24,7 +24,21 @@ services:
       context: .
       dockerfile: Containerfile
     container_name: maps-service
-    command: ["--debug","serve","--pg-host","10.0.0.29","--pg-port","5432","--pg-db","maps","--pg-user","quat","--pg-password","happypostgresuser","--port","8081","--auth-rpc-host","localhost:8090","--nats-host","0.0.0.0:4222"]
+    command: [
+      # debug
+      "--debug","serve",
+      # http service port
+      "--port","8081",
+      # postgres
+      "--pg-host","10.0.0.29",
+      "--pg-port","5432",
+      "--pg-db","maps",
+      "--pg-user","quat",
+      "--pg-password","happypostgresuser",
+      # other hosts
+      "--nats-host","nats:4222",
+      "--auth-rpc-host","localhost:8090"
+    ]
     depends_on:
       - nats
     networks: