diff --git a/lib/baseline-stacks/baseline-bindingdb.ts b/lib/baseline-stacks/baseline-bindingdb.ts
index fec7461..74782bd 100644
--- a/lib/baseline-stacks/baseline-bindingdb.ts
+++ b/lib/baseline-stacks/baseline-bindingdb.ts
@@ -91,7 +91,7 @@ export class BindingDBBaseline extends cdk.Construct {
         
         const bindingDb = new rds.DatabaseInstance(this, 'bindingDb', {
             engine: rds.DatabaseInstanceEngine.oracleSe2({ version: rds.OracleEngineVersion.VER_19_0_0_0_2020_04_R1 }),
-            masterUsername: 'master',
+            credentials: rds.Credentials.fromPassword('master', this.DbSecret.secretValueFromJson('password')),
             licenseModel: rds.LicenseModel.BRING_YOUR_OWN_LICENSE,
             vpc: props.TargetVPC,
             vpcPlacement: appSubnetSelection, 
@@ -99,7 +99,6 @@ export class BindingDBBaseline extends cdk.Construct {
             optionGroup: bindingDbOptionGroup,
             instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE3, ec2.InstanceSize.SMALL),
             instanceIdentifier: 'binding-db',
-            masterUserPassword: this.DbSecret.secretValueFromJson('password'),
             securityGroups: [this.DbAccessSg, DbSG],
             deletionProtection: false,
         });
diff --git a/lib/baseline-stacks/baseline-chembl.ts b/lib/baseline-stacks/baseline-chembl.ts
index d7ed0c4..07a8f50 100644
--- a/lib/baseline-stacks/baseline-chembl.ts
+++ b/lib/baseline-stacks/baseline-chembl.ts
@@ -64,12 +64,11 @@ export class ChemblBaseline extends cdk.Construct {
         
         this.Chembl25DatabaseInstance = new rds.DatabaseInstance(this, 'chembl25', {
             engine: rds.DatabaseInstanceEngine.POSTGRES,
-            masterUsername: 'master',
+            credentials: rds.Credentials.fromPassword('master', this.DbSecret.secretValueFromJson('password')),
             vpc: props.TargetVPC,
             vpcPlacement: appSubnetSelection, 
             instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE2, ec2.InstanceSize.SMALL),
             instanceIdentifier: 'chembl-25',
-            masterUserPassword: chemblDBSecret.secretValueFromJson('password'),
             securityGroups: [chemblDbSG],
             deletionProtection: false
         });
@@ -77,12 +76,11 @@ export class ChemblBaseline extends cdk.Construct {
         
         this.Chembl27DatabaseInstance = new rds.DatabaseInstance(this, 'chembl27', {
             engine: rds.DatabaseInstanceEngine.POSTGRES,
-            masterUsername: 'master',
+            credentials: rds.Credentials.fromPassword('master', this.DbSecret.secretValueFromJson('password')),
             vpc: props.TargetVPC,
             vpcPlacement: appSubnetSelection, 
             instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE2, ec2.InstanceSize.SMALL),
             instanceIdentifier: 'chembl-27',
-            masterUserPassword: chemblDBSecret.secretValueFromJson('password'),
             securityGroups: [chemblDbSG],
             deletionProtection: false
         });