diff --git a/src/lib/db/aws-iam.ts b/src/lib/db/aws-iam.ts
index 143c4d8ac0..03da0e57a9 100644
--- a/src/lib/db/aws-iam.ts
+++ b/src/lib/db/aws-iam.ts
@@ -14,7 +14,7 @@ export const getDBPasswordResolver = (db: IDBOption): PasswordResolver => {
             region: db.awsRegion,
             hostname: db.host,
             port: db.port,
-            username: db.user,
+            username: process.env.DATABASE_USERNAME || db.user,
         });
         return async () => {
             console.log('[AWS RDS SIGNER] Getting token...');
diff --git a/src/lib/db/db-pool.ts b/src/lib/db/db-pool.ts
index 92b7058354..2d799e8350 100644
--- a/src/lib/db/db-pool.ts
+++ b/src/lib/db/db-pool.ts
@@ -19,6 +19,7 @@ export function createDb({
         version: db.version,
         connection: {
             ...db,
+            user: process.env.DATABASE_USERNAME || db.user,
             application_name: db.applicationName,
             password: getDBPasswordResolver(db),
         },