diff --git a/app.yaml b/app.yaml
index 47d68ce621..0c2077d199 100644
--- a/app.yaml
+++ b/app.yaml
@@ -1,6 +1,10 @@
 runtime: nodejs
 env: flex
 
+runtime_config:
+  operating_system: "ubuntu22"
+  runtime_version: "18"
+
 env_variables:
   # --REQUIRED--
   DATABASE_URI: mongodb://localhost:27017/dev
diff --git a/index.js b/index.js
index 2baf852c93..c4c973f5f3 100644
--- a/index.js
+++ b/index.js
@@ -24,6 +24,8 @@ export const config = {
 
 export const app = express();
 
+app.set('trust proxy', true);
+
 // Serve static assets from the /public folder
 app.use('/public', express.static(path.join(__dirname, '/public')));