diff --git a/docker/compose/withPostgres/docker-compose.yml b/docker/compose/withPostgres/docker-compose.yml
index 9ee06874b0..57f83f328a 100644
--- a/docker/compose/withPostgres/docker-compose.yml
+++ b/docker/compose/withPostgres/docker-compose.yml
@@ -39,7 +39,6 @@ services:
       - postgres
     volumes:
       - n8n_storage:/home/node/.n8n
-    command: /bin/sh -c "n8n start --tunnel"
     depends_on:
       postgres:
         condition: service_healthy
diff --git a/docker/compose/withPostgresAndWorker/docker-compose.yml b/docker/compose/withPostgresAndWorker/docker-compose.yml
index 263c479d71..038490e941 100644
--- a/docker/compose/withPostgresAndWorker/docker-compose.yml
+++ b/docker/compose/withPostgresAndWorker/docker-compose.yml
@@ -7,6 +7,7 @@ volumes:
 
 x-shared: &shared
   restart: always
+  image: docker.n8n.io/n8nio/n8n
   environment:
     - DB_TYPE=postgresdb
     - DB_POSTGRESDB_HOST=postgres
@@ -60,14 +61,11 @@ services:
 
   n8n:
     <<: *shared
-    image: docker.n8n.io/n8nio/n8n
-    command: /bin/sh -c "n8n start --tunnel"
     ports:
       - 5678:5678
 
   n8n-worker:
     <<: *shared
-    image: docker.n8n.io/n8nio/n8n
-    command: /bin/sh -c "sleep 5; n8n worker"
+    command: worker
     depends_on:
       - n8n
diff --git a/docker/images/n8n/docker-entrypoint.sh b/docker/images/n8n/docker-entrypoint.sh
index 42419b3924..508655ea33 100755
--- a/docker/images/n8n/docker-entrypoint.sh
+++ b/docker/images/n8n/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 if [ "$#" -gt 0 ]; then
   # Got started with arguments
-  node "$@"
+  n8n "$@"
 else
   # Got started without arguments
   n8n