diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index d10928f7..741468ba 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -10,7 +10,7 @@ Each app should have:
 
 - `ci-[app_name]`: must be created; should run linting and testing
 - `ci-[app_name]-vulnerability-scans`: calls `vulnerability-scans`
-  - Based on [ci-app-vulnerability-scans](https://github.com/navapbc/template-infra/blob/main/.github/workflows/ci-app-vulnerability-scans.yml)
+  - Based on [ci-app-vulnerability-scans.yml.jinja](https://github.com/navapbc/template-infra/blob/main/.github/workflows/ci-%7B%7Bapp_name%7D%7D-vulnerability-scans.yml.jinja)
 
 ### App-agnostic workflows
 
@@ -23,7 +23,7 @@ Each app should have:
 Each app should have:
 
 - `cd-[app_name]`: deploys an application
-  - Based on [`cd-app`](https://github.com/navapbc/template-infra/blob/main/.github/workflows/cd-app.yml)
+  - Based on [`cd-app.yml.jinja`](https://github.com/navapbc/template-infra/blob/main/.github/workflows/cd-%7B%7Bapp_name%7D%7D.yml.jinja)
 
 The CD workflow uses these reusable workflows:
 
diff --git a/.github/workflows/markdownlint-config.json b/.github/workflows/markdownlint-config.json
index fe1ff47c..729d0059 100644
--- a/.github/workflows/markdownlint-config.json
+++ b/.github/workflows/markdownlint-config.json
@@ -18,5 +18,5 @@
             "pattern": "^/",
             "replacement": "{{BASEURL}}/"
         }
-  ]
+    ]
 }
diff --git a/app/gunicorn.conf.py b/app/gunicorn.conf.py
index b3dd623b..faf3edca 100644
--- a/app/gunicorn.conf.py
+++ b/app/gunicorn.conf.py
@@ -15,3 +15,8 @@
 bind = app_config.host + ':' + str(app_config.port)
 workers = 1
 threads = 4
+
+# Increase timeout to handle long-running requests
+timeout = 300  # 5 minutes
+graceful_timeout = 300  # 5 minutes
+keepalive = 5
diff --git a/app/src/batch_process.py b/app/src/batch_process.py
index 1cf0ae86..ee741888 100644
--- a/app/src/batch_process.py
+++ b/app/src/batch_process.py
@@ -1,5 +1,6 @@
 import asyncio
 import csv
+import gc
 import logging
 import tempfile
 from typing import Awaitable, Callable, Optional
@@ -42,7 +43,8 @@ async def batch_process(
 
         processed_data = []
 
-        # Process questions with progress updates
+        # Process in smaller batches to manage memory
+        BATCH_SIZE = 10
         for i, q in enumerate(questions, 1):
             logger.info("Processing question %d/%d", i, total_questions)
 
@@ -51,9 +53,12 @@ async def batch_process(
 
             processed_data.append(_process_question(q, engine))
 
-            # Add small delay to prevent overwhelming the system
-            if i % 10 == 0:  # Every 10 questions
+            # Clear memory after each batch
+            if i % BATCH_SIZE == 0:
+                # Add small delay to prevent overwhelming the system
                 await asyncio.sleep(0.1)
+                # Force garbage collection to free memory
+                gc.collect()
 
         # Update rows with processed data
         for row, data in zip(rows, processed_data, strict=True):
diff --git a/app/src/chat_engine.py b/app/src/chat_engine.py
index 0c37814f..28c9901d 100644
--- a/app/src/chat_engine.py
+++ b/app/src/chat_engine.py
@@ -172,7 +172,7 @@ class CaEddWebEngine(BaseEngine):
 
 
 class ImagineLaEngine(BaseEngine):
-    retrieval_k: int = 50
+    retrieval_k: int = 25
     retrieval_k_min_score: float = -1
 
     # Note: currently not used
diff --git a/docs/infra/set-up-database.md b/docs/infra/set-up-database.md
index 1262cb68..268c8733 100644
--- a/docs/infra/set-up-database.md
+++ b/docs/infra/set-up-database.md
@@ -95,7 +95,7 @@ Before creating migrations that create tables, first create a migration that inc
 ALTER DEFAULT PRIVILEGES GRANT ALL ON TABLES TO app
 ```
 
-This will cause all future tables created by the `migrator` user to automatically be accessible by the `app` user. See the [Postgres docs on ALTER DEFAULT PRIVILEGES](https://www.postgresql.org/docs/current/sql-alterdefaultprivileges.html) for more info. As an example see the example app's migrations file [migrations.sql](https://github.com/navapbc/template-infra/blob/main/app/migrations.sql).
+This will cause all future tables created by the `migrator` user to automatically be accessible by the `app` user. See the [Postgres docs on ALTER DEFAULT PRIVILEGES](https://www.postgresql.org/docs/current/sql-alterdefaultprivileges.html) for more info. As an example see the example app's migrations file [migrations.sql](https://github.com/navapbc/template-infra/blob/main/template-only-app/migrations.sql).
 
 Why is this needed? The reason is that the `migrator` role will be used by the migration task to run database migrations (creating tables, altering tables, etc.), while the `app` role will be used by the web service to access the database. Moreover, in Postgres, new tables won't automatically be accessible by roles other than the creator unless specifically granted, even if those other roles have usage access to the schema that the tables are created in. In other words, if the `migrator` user created a new table `foo` in the `app` schema, the `app` user will not automatically be able to access it by default.
 
diff --git a/infra/app/app-config/dev.tf b/infra/app/app-config/dev.tf
index 193e6d92..a3e82a0e 100644
--- a/infra/app/app-config/dev.tf
+++ b/infra/app/app-config/dev.tf
@@ -11,7 +11,7 @@ module "dev_config" {
   has_database                    = true
   has_incident_management_service = local.has_incident_management_service
   service_cpu                     = 2048
-  service_memory                  = 8192
+  service_memory                  = 16384
 
   # Enables ECS Exec access for debugging or jump access.
   # See https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-exec.html