diff --git a/modules/mysql/main.tf b/modules/mysql/main.tf
index 38b87a8b..8465ef04 100644
--- a/modules/mysql/main.tf
+++ b/modules/mysql/main.tf
@@ -188,9 +188,13 @@ resource "random_password" "user-password" {
     name = google_sql_database_instance.default.name
   }
 
-  length     = 32
-  special    = var.enable_random_password_special
-  depends_on = [null_resource.module_depends_on, google_sql_database_instance.default]
+  min_lower   = 1
+  min_numeric = 1
+  min_upper   = 1
+  length      = var.password_validation_policy_config != null ? (var.password_validation_policy_config.min_length != null ? var.password_validation_policy_config.min_length + 4 : 32) : 32
+  special     = var.enable_random_password_special ? true : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity != "COMPLEXITY_UNSPECIFIED" ? true : false) : false)
+  min_special = var.enable_random_password_special ? 1 : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity != "COMPLEXITY_UNSPECIFIED" ? 1 : 0) : 0)
+  depends_on  = [null_resource.module_depends_on, google_sql_database_instance.default]
 }
 
 resource "random_password" "additional_passwords" {
@@ -198,9 +202,13 @@ resource "random_password" "additional_passwords" {
   keepers = {
     name = google_sql_database_instance.default.name
   }
-  length     = 32
-  special    = var.enable_random_password_special
-  depends_on = [null_resource.module_depends_on, google_sql_database_instance.default]
+  min_lower   = 1
+  min_numeric = 1
+  min_upper   = 1
+  length      = var.password_validation_policy_config != null ? (var.password_validation_policy_config.min_length != null ? var.password_validation_policy_config.min_length + 4 : 32) : 32
+  special     = var.enable_random_password_special ? true : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity != "COMPLEXITY_UNSPECIFIED" ? true : false) : false)
+  min_special = var.enable_random_password_special ? 1 : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity != "COMPLEXITY_UNSPECIFIED" ? 1 : 0) : 0)
+  depends_on  = [null_resource.module_depends_on, google_sql_database_instance.default]
 }
 
 resource "google_sql_user" "default" {
diff --git a/modules/postgresql/main.tf b/modules/postgresql/main.tf
index eab759eb..99afed47 100644
--- a/modules/postgresql/main.tf
+++ b/modules/postgresql/main.tf
@@ -197,10 +197,13 @@ resource "random_password" "user-password" {
   keepers = {
     name = google_sql_database_instance.default.name
   }
-
-  length     = 32
-  special    = var.enable_random_password_special
-  depends_on = [null_resource.module_depends_on, google_sql_database_instance.default]
+  min_lower   = 1
+  min_numeric = 1
+  min_upper   = 1
+  length      = var.password_validation_policy_config != null ? (var.password_validation_policy_config.min_length != null ? var.password_validation_policy_config.min_length + 4 : 32) : 32
+  special     = var.enable_random_password_special ? true : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity != "COMPLEXITY_UNSPECIFIED" ? true : false) : false)
+  min_special = var.enable_random_password_special ? 1 : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity != "COMPLEXITY_UNSPECIFIED" ? 1 : 0) : 0)
+  depends_on  = [null_resource.module_depends_on, google_sql_database_instance.default]
 }
 
 resource "random_password" "additional_passwords" {
@@ -208,9 +211,13 @@ resource "random_password" "additional_passwords" {
   keepers = {
     name = google_sql_database_instance.default.name
   }
-  length     = 32
-  special    = var.enable_random_password_special
-  depends_on = [null_resource.module_depends_on, google_sql_database_instance.default]
+  min_lower   = 1
+  min_numeric = 1
+  min_upper   = 1
+  length      = var.password_validation_policy_config != null ? (var.password_validation_policy_config.min_length != null ? var.password_validation_policy_config.min_length + 4 : 32) : 32
+  special     = var.enable_random_password_special ? true : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity != "COMPLEXITY_UNSPECIFIED" ? true : false) : false)
+  min_special = var.enable_random_password_special ? 1 : (var.password_validation_policy_config != null ? (var.password_validation_policy_config.complexity != "COMPLEXITY_UNSPECIFIED" ? 1 : 0) : 0)
+  depends_on  = [null_resource.module_depends_on, google_sql_database_instance.default]
 }
 
 resource "google_sql_user" "default" {