diff --git a/server/env.ts b/server/env.ts
index 76eb2bf1f..a5f98fac9 100644
--- a/server/env.ts
+++ b/server/env.ts
@@ -80,6 +80,12 @@ export class Environment {
   })
   public DATABASE_URL = environment.DATABASE_URL ?? "";
 
+  /**
+   * An optional database schema.
+   */
+  @IsOptional()
+  public DATABASE_SCHEMA = this.toOptionalString(environment.DATABASE_SCHEMA);
+
   /**
    * The url of the database pool.
    */
diff --git a/server/storage/database.ts b/server/storage/database.ts
index e1cced297..c948d641f 100644
--- a/server/storage/database.ts
+++ b/server/storage/database.ts
@@ -11,6 +11,7 @@ const isSSLDisabled = env.PGSSLMODE === "disable";
 const poolMax = env.DATABASE_CONNECTION_POOL_MAX ?? 5;
 const poolMin = env.DATABASE_CONNECTION_POOL_MIN ?? 0;
 const url = env.DATABASE_CONNECTION_POOL_URL || env.DATABASE_URL;
+const schema = env.DATABASE_SCHEMA;
 
 export function createDatabaseInstance(
   url: string,
@@ -42,6 +43,7 @@ export function createDatabaseInstance(
       acquire: 30000,
       idle: 10000,
     },
+    schema,
   });
 }