diff --git a/docker/hub/Dockerfile.component b/docker/hub/Dockerfile.component
index aa7c0e486..13634391a 100644
--- a/docker/hub/Dockerfile.component
+++ b/docker/hub/Dockerfile.component
@@ -10,4 +10,4 @@ COPY --from=base /build/bin/${component} /usr/bin
 VOLUME /etc/dendrite
 WORKDIR /etc/dendrite
 
-ENTRYPOINT /usr/bin/$entrypoint
\ No newline at end of file
+ENTRYPOINT /usr/bin/${entrypoint} $@
\ No newline at end of file
diff --git a/docker/hub/docker-compose.deps.yml b/docker/hub/docker-compose.deps.yml
index 75567fd10..ada625aa3 100644
--- a/docker/hub/docker-compose.deps.yml
+++ b/docker/hub/docker-compose.deps.yml
@@ -1,7 +1,6 @@
 version: "3.4"
 services:
   postgres:
-    container_name: dendrite_postgres
     hostname: postgres
     image: postgres:9.5
     restart: always
@@ -14,7 +13,6 @@ services:
       - internal
 
   zookeeper:
-    container_name: dendrite_zookeeper
     hostname: zookeeper
     image: zookeeper
     networks:
diff --git a/docker/hub/docker-compose.monolith.yml b/docker/hub/docker-compose.monolith.yml
index 3f6c3e307..b28583963 100644
--- a/docker/hub/docker-compose.monolith.yml
+++ b/docker/hub/docker-compose.monolith.yml
@@ -1,17 +1,17 @@
 version: "3.4"
 services:
-  postgres:
-    container_name: dendrite_postgres
-    hostname: postgres
-    image: postgres:9.5
-    restart: always
-    volumes:
-        - ./postgres/create_db.sh:/docker-entrypoint-initdb.d/20-create_db.sh
-    environment:
-        POSTGRES_PASSWORD: itsasecret
-        POSTGRES_USER: dendrite
-    networks:
-        - internal
+    monolith:
+        hostname: monolith
+        image: matrixdotorg/dendrite:monolith
+        command: [
+            "--config=dendrite.yaml",
+            "--tls-cert=server.crt",
+            "--tls-key=server.key"
+        ]
+        volumes:
+            - ./config:/etc/dendrite
+        networks:
+            - internal
 
 networks:
   internal:
diff --git a/docker/hub/docker-compose.polylith.yml b/docker/hub/docker-compose.polylith.yml
index 2edef9928..159dba954 100644
--- a/docker/hub/docker-compose.polylith.yml
+++ b/docker/hub/docker-compose.polylith.yml
@@ -1,9 +1,15 @@
 version: "3.4"
 services:
   client_api_proxy:
-    container_name: dendrite_client_api_proxy
     hostname: client_api_proxy
     image: matrixdotorg/dendrite:clientproxy
+    command: [
+        "--bind-address=:8008",
+        "--client-api-server-url=http://client_api:7771",
+        "--sync-api-server-url=http://sync_api:7773",
+        "--media-api-server-url=http://media_api:7774",
+        "--public-rooms-api-server-url=http://public_rooms_api:7775"
+    ]
     volumes:
       - ./config:/etc/dendrite
     networks:
@@ -17,9 +23,11 @@ services:
       - "8008:8008"
 
   client_api:
-    container_name: dendrite_client_api
     hostname: client_api
     image: matrixdotorg/dendrite:clientapi
+    command: [
+        "--config=dendrite.yaml"
+    ]
     volumes:
       - ./config:/etc/dendrite
       - room_server
@@ -27,54 +35,68 @@ services:
       - internal
 
   media_api:
-    container_name: dendrite_media_api
     hostname: media_api
     image: matrixdotorg/dendrite:mediaapi
+    command: [
+        "--config=dendrite.yaml"
+    ]
     volumes:
       - ./config:/etc/dendrite
     networks:
       - internal
 
   public_rooms_api:
-    container_name: dendrite_public_rooms_api
     hostname: public_rooms_api
     image: matrixdotorg/dendrite:publicroomsapi
+    command: [
+        "--config=dendrite.yaml"
+    ]
     volumes:
       - ./config:/etc/dendrite
     networks:
       - internal
 
   sync_api:
-    container_name: dendrite_sync_api
     hostname: sync_api
     image: matrixdotorg/dendrite:syncapi
+    command: [
+        "--config=dendrite.yaml"
+    ]
     volumes:
       - ./config:/etc/dendrite
     networks:
       - internal
 
   room_server:
-    container_name: dendrite_room_server
     hostname: room_server
     image: matrixdotorg/dendrite:roomserver
+    command: [
+        "--config=dendrite.yaml"
+    ]
     volumes:
       - ./config:/etc/dendrite
     networks:
       - internal
 
   edu_server:
-    container_name: dendrite_edu_server
     hostname: edu_server
     image: matrixdotorg/dendrite:eduserver
+    command: [
+        "--config=dendrite.yaml"
+    ]
     volumes:
       - ./config:/etc/dendrite
     networks:
       - internal
 
   federation_api_proxy:
-    container_name: dendrite_federation_api_proxy
     hostname: federation_api_proxy
     image: matrixdotorg/dendrite:federationproxy
+    command: [
+        "--bind-address=:8448",
+        "--federation-api-url=http://federation_api_server:7772",
+        "--media-api-server-url=http://media_api:7774"
+    ]
     volumes:
       - ./config:/etc/dendrite
     depends_on:
@@ -87,27 +109,33 @@ services:
       - "8448:8448"
 
   federation_api:
-    container_name: dendrite_federation_api
     hostname: federation_api
     image: matrixdotorg/dendrite:federationapi
+    command: [
+        "--config=dendrite.yaml"
+    ]
     volumes:
       - ./config:/etc/dendrite
     networks:
       - internal
 
   federation_sender:
-    container_name: dendrite_federation_sender
     hostname: federation_sender
     image: matrixdotorg/dendrite:federationsender
+    command: [
+        "--config=dendrite.yaml"
+    ]
     volumes:
       - ./config:/etc/dendrite
     networks:
       - internal
       
   key_server:
-    container_name: dendrite_key_server
-    hostname: key_server
+    hostname: key_serverde
     image: matrixdotorg/dendrite:keyserver
+    command: [
+        "--config=dendrite.yaml"
+    ]
     volumes:
       - ./config:/etc/dendrite
     networks: