diff --git a/docker/gateway-compose.yml b/docker/gateway-compose.yml
index 2121ae663..c728ae219 100644
--- a/docker/gateway-compose.yml
+++ b/docker/gateway-compose.yml
@@ -2,7 +2,6 @@ version: "3.4"
 services:
   gateway:
     image: ${TRINO_GATEWAY_IMAGE:-trinodb/trino-gateway:latest}
-    restart: always
     depends_on:
       postgres:
         condition: service_healthy
diff --git a/docker/postgres-backend-compose.yml b/docker/postgres-backend-compose.yml
index 4238f0efe..399af8e82 100644
--- a/docker/postgres-backend-compose.yml
+++ b/docker/postgres-backend-compose.yml
@@ -2,7 +2,6 @@ version: "3.4"
 services:
   postgres:
     image: ${TRINO_GATEWAY_POSTGRES_IMAGE:-postgres}
-    restart: always
     environment:
       - PGPORT=5432
       - POSTGRES_PASSWORD=P0stG&es