diff --git a/apps/tooljet/docker-compose.yml b/apps/tooljet/docker-compose.yml
index 55799d61..b497c239 100644
--- a/apps/tooljet/docker-compose.yml
+++ b/apps/tooljet/docker-compose.yml
@@ -2,15 +2,16 @@ version: "3.7"
 
 services:
 
-  client:
+  tooljet-client:
     tty: true
     stdin_open: true
     image: tooljet/tooljet-client-ce:v2.4.2
+    container_name: tooljet-client
     restart: always
     ports:
       - ${APP_PORT}:80
     depends_on:
-      - server
+      - tooljet-server
     networks:
       - tipi_main_network
     labels:
@@ -40,8 +41,9 @@ services:
       traefik.http.routers.tooljet-local.tls: true
     command: openresty -g "daemon off;"
 
-  server:
+  tooljet-server:
     image: tooljet/tooljet-server-ce:v2.14.0
+    container_name: tooljet-server
     tty: true
     stdin_open: true
     restart: always
@@ -76,7 +78,7 @@ services:
       - SSO_GIT_OAUTH2_CLIENT_SECRET
     command: npm run start:prod
 
-  db-n8n:
+  db-tooljet:
     container_name: postgres_tooljet
     image: postgres:11
     restart: on-failure