diff --git a/CHANGES.md b/CHANGES.md
index e37b867951..7ecc1d34c7 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -30,10 +30,12 @@
         ```
       to create regular users via command-line
 - Add `proxy_hide_header X-Frame-Options;` to `server-ce/nginx/sharelatex.conf` for locations `/` and `/socket.io` to allow iframe embedding
-- Add the following setting to `server-ce/config/settings.js`:
-    ```
-    cookieSessionLength: false,
-    ```
+- Make the following modifcations in `server-ce/config/settings.js`:
+  - Add the following setting:
+        ```
+        cookieSessionLength: false,
+        ```
+  - Modify the compile timeout `defaultFeatures.compileTimeout` as needed
 - Redirect `GET` requests to the reverse proxy service through `server-ce/nginx/sharelatex.conf` by adding the following to the `/` location:
     ```
     if ($request_method = GET) {
diff --git a/server-ce/config/settings.js b/server-ce/config/settings.js
index d38c0768e0..6b13037cd6 100644
--- a/server-ce/config/settings.js
+++ b/server-ce/config/settings.js
@@ -285,7 +285,7 @@ const settings = {
     collaborators: -1,
     dropbox: true,
     versioning: true,
-    compileTimeout: parseIntOrFail(process.env.COMPILE_TIMEOUT || 180),
+    compileTimeout: 900,
     compileGroup: 'standard',
     trackChanges: true,
     templates: true,