diff --git a/apps/tooljet/config.json b/apps/tooljet/config.json
index d696bd84..a6c5d046 100644
--- a/apps/tooljet/config.json
+++ b/apps/tooljet/config.json
@@ -22,6 +22,20 @@
       "min": 30,
       "max": 30,
       "env_variable": "DB_PASSWORD"
+    },
+    {
+      "type": "random",
+      "label": "Secret key base",
+      "min": 32,
+      "max": 32,
+      "env_variable": "SECRET_KEY_BASE"
+    },
+    {
+      "type": "random",
+      "label": "Lock master key",
+      "min": 64,
+      "max": 64,
+      "env_variable": "LOCKBOX_MASTER_KEY"
     }
   ]
 }
diff --git a/apps/tooljet/docker-compose.yml b/apps/tooljet/docker-compose.yml
index 48175c39..bc330a7a 100644
--- a/apps/tooljet/docker-compose.yml
+++ b/apps/tooljet/docker-compose.yml
@@ -55,8 +55,8 @@ services:
       - SERVE_CLIENT=false
       - SERVER_HOST=tooljet-server
       - TOOLJET_HOST=https://${APP_DOMAIN}
-      - LOCKBOX_MASTER_KEY=70726290922441785304399601987729268981756953900892
-      - SECRET_KEY_BASE=mqrBZqJvzUJ2GsHQaktZjKdb2cvdM8
+      - LOCKBOX_MASTER_KEY=${LOCKBOX_MASTER_KEY}
+      - SECRET_KEY_BASE=${SECRET_KEY_BASE}
       - ORM_LOGGING
       - PG_DB=tooljet
       - PG_USER=tooljet