diff --git a/hosts/AZ-CLD-1/services/containers/baserow.nix b/hosts/AZ-CLD-1/services/containers/baserow.nix
index b173773..cf5b6ad 100644
--- a/hosts/AZ-CLD-1/services/containers/baserow.nix
+++ b/hosts/AZ-CLD-1/services/containers/baserow.nix
@@ -8,7 +8,12 @@
   servicePort = portUtils.getPort serviceName "AZ-CLD-1";
 in {
   virtualisation.oci-containers.containers.${serviceName} = {
-    image = "docker.io/baserow/baserow:1.34.5";
+    image = "docker.io/baserow/baserow:1.35.2";
+    environment = {
+      BASEROW_AMOUNT_OF_GUNICORN_WORKERS = "4";
+      BASEROW_AMOUNT_OF_WORKERS = "2";
+      DATABASE_CONN_MAX_AGE = "60";
+    };
     environmentFiles = [config.age.secrets.baserow-env.path];
     ports = ["127.0.0.1:${toString servicePort}:80"];
     volumes = ["baserow_data:/baserow/data"];
diff --git a/hosts/AZ-CLD-1/services/containers/librechat.nix b/hosts/AZ-CLD-1/services/containers/librechat.nix
index c32c79a..627859f 100644
--- a/hosts/AZ-CLD-1/services/containers/librechat.nix
+++ b/hosts/AZ-CLD-1/services/containers/librechat.nix
@@ -8,7 +8,8 @@
   portUtils = import ../../../../lib/port-utils.nix {inherit lib;};
   servicePort = portUtils.getPort serviceName "AZ-CLD-1";
   ragApiPort = portUtils.getPort "rag-api" "AZ-CLD-1";
-  envFile = config.age.secrets.librechat-env.path;
+  envFileProd = config.age.secrets.librechat-env-prod.path;
+  envFileCommon = config.age.secrets.librechat.path;
 in {
   virtualisation.oci-containers = {
     containers.meilisearch = {
@@ -19,7 +20,7 @@ in {
         MEILI_HTTP_ADDR = "0.0.0.0:7700";
         MEILI_NO_ANALYTICS = "true";
       };
-      environmentFiles = [envFile];
+      environmentFiles = [envFileCommon envFileProd];
       extraOptions = ["--ip=10.89.0.20" "--network=web"];
     };
 
@@ -31,7 +32,7 @@ in {
         DB_HOST = "10.89.0.1";
         DB_PORT = "5432";
       };
-      environmentFiles = [envFile];
+      environmentFiles = [envFileCommon envFileProd];
       dependsOn = ["meilisearch"];
       extraOptions = ["--add-host=postgres:10.89.0.1" "--ip=10.89.0.21" "--network=web"];
       ports = ["127.0.0.1:${toString ragApiPort}:8000"];
@@ -63,7 +64,7 @@ in {
         RAG_PORT = "8000";
         RAG_API_URL = "http://rag_api:8000";
       };
-      environmentFiles = [envFile];
+      environmentFiles = [envFileCommon envFileProd];
       volumes = [
         # Config file still needs to be a bind mount for host management
         "/var/lib/librechat/librechat.yaml:/app/librechat.yaml:ro"
diff --git a/secrets/baserow-env.age b/secrets/baserow-env.age
index febbd22..5e17881 100644
--- a/secrets/baserow-env.age
+++ b/secrets/baserow-env.age
@@ -1,17 +1,17 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpoVnNlZyBSWG5p
-dEhXK01Qd3A0ZVBCalVPK3VUY3R4YVlGYWxyUmtFbzVNUGt3Z1ZZCndpZklCNUNL
-ZHhhSXArSi9EdEpUaGhldTd5OG5TUERsRGdMK1k2cHpyNVkKLT4gc3NoLWVkMjU1
-MTkgQ1NNeWhnIFBoOG9Xcmo1R0VGYWxwNUNYY2hWOHRHelZqT2FNUnFpVklKbnFy
-S2RMejgKbUkwQVVXZVR0MVduV2JJMW5kdnZHeUdzVkdJZngwVDZJOEE4VFd5RlNP
-bwotPiA9YS1ncmVhc2UgYWlhIGcrRQpHUmM4c3MrWnQxSU9pK1lLaGpPS1NCY0Q5
-U1kzUUxaRU9oNHJvb0dICi0tLSBTUXpwQjBacXB6K0Z2c1ZwOHhaU0Q2aWxLa0lU
-VVlvNzg5WGZRVGZNSDdNCtVAachesDai95KPTEVFv4RjaBkVB6VqhXHDtKtD2vuu
-pJhsQRNRHOrBg7p/5+rjULyioH2aH3oYsGLyFwxHtPruXyutQaYUZ3DMeob135+x
-4ED8Fb1JVy5LYPg3K2ZhBBr93zyOwRSlPcDIGbvYvo+WDRUk/sL/zxm6ERG51nQu
-obKY46uckC7bhmbBr2MSoP6u19C8VBR+Etgp/YPRL7PVq7mVgF+U+S/bU+fqnYyV
-gl+RYhHc2Jv2AItAkTPVEu6/3CG9w3OCla4+q7yLH2CUVrymXniUAXneP+5JWIkh
-TsRoEEHcjm4y5De0eyzenoRFa+M8vHbEFTd8XhMY+tzq/uP59GOabaMsHG8Kwa5V
-ADQZ9pMelFp5+WKEafSNYw/W+p1oJ6CUH9+/niJZRTPGwfPQpF4Hojwpk1XQAMyV
-93Kx6JImqLOT4jyeTc0QTCL2FHqnMN3cC0bKKRoSyPD9
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpoVnNlZyBxT291
+dDgwMkNqeWZiN0pVNzFiY1dNcWNEcFh1eGlEdXBTd0pQOG9HeGdvClhMUHUycnpR
+OXhKRmVqTFBkVm85R1hhcXJ2ZDgxSTdGMEFOMnZ5cERFTkkKLT4gc3NoLWVkMjU1
+MTkgQ1NNeWhnIFRjRjdIemNyTzZrK0NHYlB6M3RCd2E4YkFsVksxbW5PekhyaVF5
+OTVxMUUKVlBkb1RZZmQyK0ZNcVVRdzkzR0Z0SVozMHptWkx4Y1JNbzZkV2V3Z2VB
+dwotPiBkYC1ncmVhc2UgNmVTa2pGJHUgPisybUdIIEoyLFpuNwplWFdZOFZnCi0t
+LSBCallXaXB0cEUvQjI1eU1iQVVpMWNRYTF6V1h0NXpKSGlmWnE4TVEyeHA0CmmU
+AU5KRsn+YezU4GJCK5lBuVdUFEYPzz0HKkQYEN6oLkRDQ+U7/h17Fm5BsGXS5P7V
++E0k1tIfDPxnWVkQvEFvK6RDu9VnmLQeHBaS2BFw2LSA8dKWnsO1eCjYKpgxyM2W
+1my2mKHpuJs/V5RrYdiaLAZSK7+ZIfqghgdRDm+uJUEOdxqFBFllBAVS9+G4dtIR
+9/JrNm6ZEulGNX+orJJx6wvKJEg3HnvaQO6UGA3CuNV5+EV0LFqQUBI08HzpwrAR
+nUryciib6nPc9FwS2hdmkZHN9JMFXfysxT/fn3r4L7cZDXB1qfNpxoyXa3LQ7ec6
+3jGElF1/DmXXB8dGB0xRtIz1CY43kPRgiuRYWxVdme6UdoXXwx/5SAKed3AK79/y
++4L6fejdMeXuka6ok1KzvPzoKyM3gGCUpWmRTqrSNRi/SiFJfZertQoc24fVOibj
+8gfvIQoj3Qzotl425ZH3
 -----END AGE ENCRYPTED FILE-----
diff --git a/secrets/librechat-env-prod.age b/secrets/librechat-env-prod.age
index d9ae6cc..83e700f 100644
Binary files a/secrets/librechat-env-prod.age and b/secrets/librechat-env-prod.age differ