diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5febcba..fd01a2b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this
 project adheres to [Semantic Versioning](http://semver.org/).
 
+## [21.0.0](https://github.com/terraform-google-modules/terraform-google-sql-db/compare/v20.2.0...v21.0.0) (2024-07-25)
+
+
+### ⚠ BREAKING CHANGES
+
+* **TPG>5.38:** added deletion_policy to private service access sub-module and promoted to GA provider ([#620](https://github.com/terraform-google-modules/terraform-google-sql-db/issues/620))
+* Cleanup of old instance backups. Change role roles/cloudsql.editor to roles/cloudsql.admin ([#618](https://github.com/terraform-google-modules/terraform-google-sql-db/issues/618))
+* Add enable_google_ml_integration setting for database instance and configurable project roles for default database service account ([#615](https://github.com/terraform-google-modules/terraform-google-sql-db/issues/615))
+
+### Features
+
+* Add enable_google_ml_integration setting for database instance and configurable project roles for default database service account ([#615](https://github.com/terraform-google-modules/terraform-google-sql-db/issues/615)) ([83bbaa3](https://github.com/terraform-google-modules/terraform-google-sql-db/commit/83bbaa3df5165fa07338c485fda3bcbb2db6a012))
+* Add new output called env_vars for postgresql ([#612](https://github.com/terraform-google-modules/terraform-google-sql-db/issues/612)) ([f02e3fd](https://github.com/terraform-google-modules/terraform-google-sql-db/commit/f02e3fdf69d0d0b238ff201ac45ff7d192935050))
+* enable data_cache_config for postgresql read replicas ([#619](https://github.com/terraform-google-modules/terraform-google-sql-db/issues/619)) ([d7280da](https://github.com/terraform-google-modules/terraform-google-sql-db/commit/d7280da309bb338a8058a3073c992592bd9162d6))
+* **TPG>5.38:** added deletion_policy to private service access sub-module and promoted to GA provider ([#620](https://github.com/terraform-google-modules/terraform-google-sql-db/issues/620)) ([cf5f184](https://github.com/terraform-google-modules/terraform-google-sql-db/commit/cf5f184df0be46d37d9eabfab53c81bb621f1881))
+
+
+### Bug Fixes
+
+* Backup - set IAM conditions conditionally ([#616](https://github.com/terraform-google-modules/terraform-google-sql-db/issues/616)) ([8780714](https://github.com/terraform-google-modules/terraform-google-sql-db/commit/87807148a282136fbd8b8f74652e9cc89bf8f7d4))
+* Cleanup of old instance backups. Change role roles/cloudsql.editor to roles/cloudsql.admin ([#618](https://github.com/terraform-google-modules/terraform-google-sql-db/issues/618)) ([7310051](https://github.com/terraform-google-modules/terraform-google-sql-db/commit/731005118667ae86fba7b7f978c3175fbf0a8d6d))
+
 ## [20.2.0](https://github.com/terraform-google-modules/terraform-google-sql-db/compare/v20.1.0...v20.2.0) (2024-06-06)
 
 
diff --git a/README.md b/README.md
index df01bc0d..8c3ba146 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ For MySQL :
 ```
 module "sql-db" {
   source  = "GoogleCloudPlatform/sql-db/google//modules/mysql"
-  version = "~> 20.2"
+  version = "~> 21.0"
 }
 ```
 
diff --git a/examples/mssql-failover-replica/README.md b/examples/mssql-failover-replica/README.md
index 7274d663..d6eced28 100644
--- a/examples/mssql-failover-replica/README.md
+++ b/examples/mssql-failover-replica/README.md
@@ -23,7 +23,7 @@ Promote instance 2 as primary and change instance 1 as failover replica
 ```diff
 module "mssql2" {
   source  = "terraform-google-modules/sql-db/google//modules/mssql"
-  version = "~> 20.2"
+  version = "~> 21.0"
 
 -  master_instance_name = module.mssql1.instance_name
 
diff --git a/examples/postgresql-with-cross-region-failover/README.md b/examples/postgresql-with-cross-region-failover/README.md
index 135560aa..b6a2c52a 100644
--- a/examples/postgresql-with-cross-region-failover/README.md
+++ b/examples/postgresql-with-cross-region-failover/README.md
@@ -26,7 +26,7 @@ Promote instance 2 as primary and change instance 1 as failover replica
 ```diff
 module "pg2" {
   source  = "terraform-google-modules/sql-db/google//modules/postgresql"
-  version = "~> 20.2"
+  version = "~> 21.0"
 
 -  master_instance_name = module.pg1.instance_name
 
diff --git a/modules/mssql/README.md b/modules/mssql/README.md
index 34edd562..1fd180ba 100644
--- a/modules/mssql/README.md
+++ b/modules/mssql/README.md
@@ -12,7 +12,7 @@ Basic usage of this module is as follows:
 ```hcl
 module "mssql" {
   source  = "terraform-google-modules/sql-db/google//modules/mssql"
-  version = "~> 20.2"
+  version = "~> 21.0"
 
   name                 = var.name
   random_instance_name = true
diff --git a/modules/mssql/metadata.yaml b/modules/mssql/metadata.yaml
index 9a6df77c..bfcb8f2d 100644
--- a/modules/mssql/metadata.yaml
+++ b/modules/mssql/metadata.yaml
@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/terraform-google-modules/terraform-google-sql-db.git
       sourceType: git
       dir: /modules/mssql
-    version: 20.2.0
+    version: 21.0.0
     actuationTool:
       flavor: Terraform
       version: ">= 1.3"
diff --git a/modules/mssql/versions.tf b/modules/mssql/versions.tf
index 6731de49..c37bee89 100644
--- a/modules/mssql/versions.tf
+++ b/modules/mssql/versions.tf
@@ -36,7 +36,7 @@ terraform {
   }
 
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-sql-db:mssql/v20.2.0"
+    module_name = "blueprints/terraform/terraform-google-sql-db:mssql/v21.0.0"
   }
 
 }
diff --git a/modules/mysql/metadata.yaml b/modules/mysql/metadata.yaml
index 34609cdb..2725b7d0 100644
--- a/modules/mysql/metadata.yaml
+++ b/modules/mysql/metadata.yaml
@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/terraform-google-modules/terraform-google-sql-db.git
       sourceType: git
       dir: /modules/mysql
-    version: 20.2.0
+    version: 21.0.0
     actuationTool:
       flavor: Terraform
       version: ">= 1.3"
diff --git a/modules/mysql/versions.tf b/modules/mysql/versions.tf
index 6bba47b3..bf06ba39 100644
--- a/modules/mysql/versions.tf
+++ b/modules/mysql/versions.tf
@@ -36,10 +36,10 @@ terraform {
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-sql-db:mysql/v20.2.0"
+    module_name = "blueprints/terraform/terraform-google-sql-db:mysql/v21.0.0"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-sql-db:mysql/v20.2.0"
+    module_name = "blueprints/terraform/terraform-google-sql-db:mysql/v21.0.0"
   }
 
 }
diff --git a/modules/postgresql/README.md b/modules/postgresql/README.md
index f512655d..cb42d246 100644
--- a/modules/postgresql/README.md
+++ b/modules/postgresql/README.md
@@ -13,7 +13,7 @@ Basic usage of this module is as follows:
 ```hcl
 module "pg" {
   source  = "terraform-google-modules/sql-db/google//modules/postgresql"
-  version = "~> 20.2"
+  version = "~> 21.0"
 
   name                 = var.pg_ha_name
   random_instance_name = true
diff --git a/modules/postgresql/metadata.yaml b/modules/postgresql/metadata.yaml
index 84126642..f9381733 100644
--- a/modules/postgresql/metadata.yaml
+++ b/modules/postgresql/metadata.yaml
@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/terraform-google-modules/terraform-google-sql-db.git
       sourceType: git
       dir: /modules/postgresql
-    version: 20.2.0
+    version: 21.0.0
     actuationTool:
       flavor: Terraform
       version: ">= 1.3"
diff --git a/modules/postgresql/versions.tf b/modules/postgresql/versions.tf
index f382aa1e..54bd3449 100644
--- a/modules/postgresql/versions.tf
+++ b/modules/postgresql/versions.tf
@@ -36,10 +36,10 @@ terraform {
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-sql-db:postgresql/v20.2.0"
+    module_name = "blueprints/terraform/terraform-google-sql-db:postgresql/v21.0.0"
   }
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-sql-db:postgresql/v20.2.0"
+    module_name = "blueprints/terraform/terraform-google-sql-db:postgresql/v21.0.0"
   }
 
 }
diff --git a/modules/private_service_access/metadata.yaml b/modules/private_service_access/metadata.yaml
index 277a2924..008d8172 100644
--- a/modules/private_service_access/metadata.yaml
+++ b/modules/private_service_access/metadata.yaml
@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/terraform-google-modules/terraform-google-sql-db.git
       sourceType: git
       dir: /modules/private_service_access
-    version: 20.2.0
+    version: 21.0.0
     actuationTool:
       flavor: Terraform
       version: ">= 0.13"
diff --git a/modules/private_service_access/versions.tf b/modules/private_service_access/versions.tf
index eb9aaf47..715032f3 100644
--- a/modules/private_service_access/versions.tf
+++ b/modules/private_service_access/versions.tf
@@ -32,11 +32,11 @@ terraform {
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-sql-db:private_service_access/v20.2.0"
+    module_name = "blueprints/terraform/terraform-google-sql-db:private_service_access/v21.0.0"
   }
 
   provider_meta "google-beta" {
-    module_name = "blueprints/terraform/terraform-google-sql-db:private_service_access/v20.2.0"
+    module_name = "blueprints/terraform/terraform-google-sql-db:private_service_access/v21.0.0"
   }
 
 }
diff --git a/modules/safer_mysql/metadata.yaml b/modules/safer_mysql/metadata.yaml
index 78abc8c2..038676e8 100644
--- a/modules/safer_mysql/metadata.yaml
+++ b/modules/safer_mysql/metadata.yaml
@@ -25,7 +25,7 @@ spec:
       repo: https://github.com/terraform-google-modules/terraform-google-sql-db.git
       sourceType: git
       dir: /modules/safer_mysql
-    version: 20.2.0
+    version: 21.0.0
     actuationTool:
       flavor: Terraform
       version: ">= 1.3"
diff --git a/modules/safer_mysql/versions.tf b/modules/safer_mysql/versions.tf
index 56cc85ab..021fde02 100644
--- a/modules/safer_mysql/versions.tf
+++ b/modules/safer_mysql/versions.tf
@@ -25,7 +25,7 @@ terraform {
   }
 
   provider_meta "google" {
-    module_name = "blueprints/terraform/terraform-google-sql-db:safer_mysql/v20.2.0"
+    module_name = "blueprints/terraform/terraform-google-sql-db:safer_mysql/v21.0.0"
   }
 
 }