diff --git a/packages/cli/src/databases/migrations/postgresdb/1660062385367-CreateCredentialsUserRole.ts b/packages/cli/src/databases/migrations/postgresdb/1660062385367-CreateCredentialsUserRole.ts
index 57c8e01d6e..564a4562da 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1660062385367-CreateCredentialsUserRole.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1660062385367-CreateCredentialsUserRole.ts
@@ -5,7 +5,11 @@ export class CreateCredentialsUserRole1660062385367 implements MigrationInterfac
 	name = 'CreateCredentialsUserRole1660062385367';
 
 	async up(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+		let tablePrefix = config.getEnv('database.tablePrefix');
+		const schema = config.getEnv('database.postgresdb.schema');
+		if (schema) {
+			tablePrefix = schema + '.' + tablePrefix;
+		}
 
 		await queryRunner.query(`
 			INSERT INTO ${tablePrefix}role (name, scope)
@@ -15,7 +19,11 @@ export class CreateCredentialsUserRole1660062385367 implements MigrationInterfac
 	}
 
 	async down(queryRunner: QueryRunner): Promise<void> {
-		const tablePrefix = config.getEnv('database.tablePrefix');
+		let tablePrefix = config.getEnv('database.tablePrefix');
+		const schema = config.getEnv('database.postgresdb.schema');
+		if (schema) {
+			tablePrefix = schema + '.' + tablePrefix;
+		}
 
 		await queryRunner.query(`
 			DELETE FROM ${tablePrefix}role WHERE name='user' AND scope='credential';