diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b30a2d4..c575e28 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,6 +1,2 @@
-.github/*     @clouddrove/approvers
-
-*     @clouddrove/clouddrovians @clouddrove/approvers
-
-.github/mergify.yml @clouddrove/admins
-.github/CODEOWNERS  @clouddrove/admins
+# These owners will be the default owners for everything in the repo.
+*    @anmolnagpal @clouddrove-ci @clouddrove/terraform-azure-admins
diff --git a/.github/workflows/auto_assignee.yml b/.github/workflows/auto_assignee.yml
new file mode 100644
index 0000000..f8b8bcd
--- /dev/null
+++ b/.github/workflows/auto_assignee.yml
@@ -0,0 +1,14 @@
+name: Auto Assign PRs
+
+on:
+  pull_request:
+    types: [opened, reopened]
+
+  workflow_dispatch:
+jobs:
+  assignee:
+    uses: clouddrove/github-shared-workflows/.github/workflows/auto_assignee.yml@master
+    secrets:
+      GITHUB: ${{ secrets.GITHUB }}
+    with:
+      assignees: 'clouddrove-ci'
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
new file mode 100644
index 0000000..26392e2
--- /dev/null
+++ b/.github/workflows/automerge.yml
@@ -0,0 +1,12 @@
+---
+name: Auto merge
+on:
+  pull_request:
+jobs:
+  auto-merge:
+    uses: clouddrove/github-shared-workflows/.github/workflows/auto_merge.yml@master
+    secrets:
+      GITHUB: ${{ secrets.GITHUB }}
+    with:
+      tfcheck: 'complete-example / Check code format'
+...
diff --git a/.github/workflows/readme.yml b/.github/workflows/readme.yml
index 444164d..c4a5793 100644
--- a/.github/workflows/readme.yml
+++ b/.github/workflows/readme.yml
@@ -12,4 +12,4 @@ jobs:
     uses: clouddrove/github-shared-workflows/.github/workflows/readme.yml@master
     secrets:
       TOKEN : ${{ secrets.GITHUB }}
-      SLACK_WEBHOOK_TERRAFORM: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }}
\ No newline at end of file
+      SLACK_WEBHOOK_TERRAFORM: ${{ secrets.SLACK_WEBHOOK_TERRAFORM }}
diff --git a/.github/workflows/semantic-releaser.yml b/.github/workflows/semantic-releaser.yml
deleted file mode 100644
index 6e685a0..0000000
--- a/.github/workflows/semantic-releaser.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Release
-
-on:
-  push:
-    branches:
-      - main
-    paths:
-      - '**.tf'
-      - '!examples/**.tf'
-
-jobs:
-  release:
-    name: Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: 14
-
-      - name: Release
-        env:
-          GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
-        run: npx semantic-release
diff --git a/.github/workflows/static-checks.yml b/.github/workflows/static-checks.yml
deleted file mode 100644
index b04783c..0000000
--- a/.github/workflows/static-checks.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-name: static-checks
-
-on:
-  pull_request:
-
-jobs:
-  versionExtract:
-    name: Get min/max versions
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Terraform min/max versions
-        id: minMax
-        uses: clowdhaus/terraform-min-max@main
-    outputs:
-      minVersion: ${{ steps.minMax.outputs.minVersion }}
-      maxVersion: ${{ steps.minMax.outputs.maxVersion }}
-
-  versionEvaluate:
-    name: Evaluate Terraform versions
-    runs-on: ubuntu-latest
-    needs: versionExtract
-    strategy:
-      fail-fast: false
-      matrix:
-        version:
-          - ${{ needs.versionExtract.outputs.minVersion }}
-          - ${{ needs.versionExtract.outputs.maxVersion }}
-        directory:
-          - examples/basic
-          - examples/complete
-          - examples/mysql-flexible-server-replication
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Install Terraform v${{ matrix.version }}
-        uses: hashicorp/setup-terraform@v1
-        with:
-          terraform_version: ${{ matrix.version }}
-
-      - name: Init & validate v${{ matrix.version }}
-        run: |
-          cd ${{ matrix.directory }}
-          terraform init
-          terraform validate
-      - name: tflint
-        uses: reviewdog/action-tflint@master
-        with:
-          tflint_version: v0.29.0
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          working_directory: ${{ matrix.directory }}
-          fail_on_error: 'true'
-          filter_mode: 'nofilter'
-          flags: '--module'
-
-  format:
-    name: Check code format
-    runs-on: ubuntu-latest
-    needs: versionExtract
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Install Terraform v${{ needs.versionExtract.outputs.maxVersion }}
-        uses: hashicorp/setup-terraform@v1
-        with:
-          terraform_version: ${{ needs.versionExtract.outputs.maxVersion }}
-
-      - name: Check Terraform format changes
-        run: terraform fmt --recursive -check=true
diff --git a/.github/workflows/tf-checks.yml b/.github/workflows/tf-checks.yml
new file mode 100644
index 0000000..0556411
--- /dev/null
+++ b/.github/workflows/tf-checks.yml
@@ -0,0 +1,24 @@
+name: tf-checks
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+  workflow_dispatch:
+jobs:
+   complete-example:
+    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
+    secrets: inherit
+    with:
+      working_directory: './examples/complete/'
+
+   basic-example:
+    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
+    secrets: inherit
+    with:
+      working_directory: './examples/basic/'
+
+   mysql-flexible-server-replication-example:
+    uses: clouddrove/github-shared-workflows/.github/workflows/tf-checks.yml@master
+    secrets: inherit
+    with:
+      working_directory: './examples/mysql-flexible-server-replication/'
diff --git a/.github/workflows/tflint.yml b/.github/workflows/tflint.yml
new file mode 100644
index 0000000..71a6fc4
--- /dev/null
+++ b/.github/workflows/tflint.yml
@@ -0,0 +1,11 @@
+name: tf-lint
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+  workflow_dispatch:
+jobs:
+  tf-lint:
+    uses: clouddrove/github-shared-workflows/.github/workflows/tf-lint.yml@master
+    secrets:
+      GITHUB: ${{ secrets.GITHUB }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9e713a5..6b9e2db 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -7,7 +7,7 @@ repos:
       - id: shellcheck
       - id: tflint
 
-  - repo: git://github.com/pre-commit/pre-commit-hooks
+  - repo: https://github.com/pre-commit/pre-commit-hooks.git
     rev: v4.0.1 # Use the ref you want to point at
     hooks:
       - id: end-of-file-fixer
@@ -19,3 +19,17 @@ repos:
       - id: debug-statements
       - id: check-yaml
       - id: check-added-large-files
+
+  - repo: https://github.com/antonbabenko/pre-commit-terraform
+    rev: v1.77.0
+    hooks:
+      - id: terraform_fmt
+      - id: terraform_docs
+        args:
+          - '--args=--lockfile=false'
+          - --hook-config=--add-to-existing-file=true
+          - --hook-config=--create-file-if-not-exist=true
+
+      - id: terraform_tflint
+        args:
+          - --args=--config=.tflint.hcl
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68b06ad..5830637 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,4 +42,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [1.0.0]: https://github.com/clouddrove/terraform-azure-flexible-mysql/compare/1.0.0...master
 
 [1.0.1]: https://github.com/clouddrove/terraform-azure-flexible-mysql/compare/1.0.0...1.0.1
+
 [1.0.2]: https://github.com/clouddrove/terraform-azure-flexible-mysql/compare/1.0.1...1.0.2
+
diff --git a/README.md b/README.md
index afc1679..4bfa730 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@
 <hr>
 
 
-We are a group of DevOps engineers & architects, joining hands in this ever evolving digital landscape. With our strong belief in Automation; just like microservices, always on the lookout to split the the infrastructure into smaller connected resources (database, cluster and more) which could be standardized, are manageable, scalable, secure & follow industry best practices. 
+We are a group of DevOps engineers & architects, joining hands in this ever evolving digital landscape. With our strong belief in Automation; just like microservices, always on the lookout to split the the infrastructure into smaller connected resources (database, cluster and more) which could be standardized, are manageable, scalable, secure & follow industry best practices.
 
 
 This module includes Terraform open source, examples, and automation tests (for better understanding), which would help you create and improve your infrastructure with minimalistic coding.
@@ -64,7 +64,7 @@ This module includes Terraform open source, examples, and automation tests (for
 Refer to complete documentation: [here](docs/io.md)
 
 
-<!-- 
+<!--
 ## Module Dependencies
 
 This module has dependencies on:
@@ -87,7 +87,7 @@ Refer [here](CHANGELOG.md).
 
 ## ✨ Contributors
 
-Big thanks to our contributors for elevating our project with their dedication and expertise! But, we do not wish to stop there, would like to invite contributions from the community in improving these projects and making them more versatile for better reach. Remember, every bit of contribution is immensely valuable, as, together, we are moving in only 1 direction, i.e. forward. 
+Big thanks to our contributors for elevating our project with their dedication and expertise! But, we do not wish to stop there, would like to invite contributions from the community in improving these projects and making them more versatile for better reach. Remember, every bit of contribution is immensely valuable, as, together, we are moving in only 1 direction, i.e. forward.
 
 <a href="https://github.com/clouddrove/terraform-azure-flexible-mysql/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=clouddrove/terraform-azure-flexible-mysql&max" />
@@ -115,7 +115,7 @@ Big thanks to our contributors for elevating our project with their dedication a
 
 
 
-## Feedback 
+## Feedback
 Spot a bug or have thoughts to share with us? Let's squash it together! Log it in our [issue tracker](https://github.com/clouddrove/terraform-azure-flexible-mysql/issues), feel free to drop us an email at [hello@clouddrove.com](mailto:hello@clouddrove.com).
 
 Show some love with a ★ on [our GitHub](https://github.com/clouddrove/terraform-azure-flexible-mysql)!  if our work has brightened your day! – your feedback fuels our journey!
@@ -127,7 +127,7 @@ We have [*100+ Terraform modules*][terraform_modules] 🙌. You could consider t
 
 - [Terraform Module Registry:](https://registry.terraform.io/namespaces/clouddrove) Discover our Terraform modules here.
 
-- [Terraform Modules for AWS/Azure Modules:](https://github.com/clouddrove/toc) Explore our comprehensive Table of Contents for easy navigation through our documentation for modules pertaining to AWS, Azure & GCP. 
+- [Terraform Modules for AWS/Azure Modules:](https://github.com/clouddrove/toc) Explore our comprehensive Table of Contents for easy navigation through our documentation for modules pertaining to AWS, Azure & GCP.
 
 - [Terraform Modules for Digital Ocean:](https://github.com/terraform-do-modules/toc) Check out our specialized Terraform modules for Digital Ocean.
 
@@ -153,7 +153,7 @@ Join our tech elites [Join Now][slack] 🚀
  Click [here][blog] :books: :star2:
 
 ## Tap into our capabilities
-We provide a platform for organizations to engage with experienced top-tier DevOps & Cloud services. Tap into our pool of certified engineers and architects to elevate your DevOps and Cloud Solutions. 
+We provide a platform for organizations to engage with experienced top-tier DevOps & Cloud services. Tap into our pool of certified engineers and architects to elevate your DevOps and Cloud Solutions.
 
 At [CloudDrove][website], has extensive experience in designing, building & migrating environments, securing, consulting, monitoring, optimizing, automating, and maintaining complex and large modern systems. With remarkable client footprints in American & European corridors, our certified architects & engineers are ready to serve you as per your requirements & schedule. Write to us at [business@clouddrove.com](mailto:business@clouddrove.com).
 
diff --git a/README.yaml b/README.yaml
index 6f4f5ab..430d628 100644
--- a/README.yaml
+++ b/README.yaml
@@ -4,7 +4,6 @@
 # Run `make readme` to rebuild the `README.md`
 #
 
-
 # Name of this project
 name: Terraform AZURE FLEXIBLE MYSQL
 
@@ -19,20 +18,40 @@ badges:
   - name: "Terraform"
     image: "https://img.shields.io/badge/Terraform-v1.1.7-green"
     url: "https://www.terraform.io"
+  - name: "tfsec"
+    image: "https://github.com/clouddrove/terraform-azure-flexible-mysql/actions/workflows/tfsec.yml/badge.svg"
+    url: "https://github.com/clouddrove/terraform-azure-flexible-mysql/actions/workflows/tfsec.yml"
   - name: "Licence"
     image: "https://img.shields.io/badge/License-APACHE-blue.svg"
     url: "LICENSE.md"
+  - name: "Changelog"
+    image: "https://img.shields.io/badge/Changelog-blue"
+    url: "CHANGELOG.md"
+
+# Prerequesties to display
+prerequesties:
+  - name: Terraform
+    url: https://learn.hashicorp.com/terraform/getting-started/install.html
+    version: ">= 1.7.8"
+
+providers:
+  - name: azure
+    url: https://azure.microsoft.com/
+    version: ">= 3.39.0"
+
+module_dependencies:
+  - name: Labels Module
+    url: https://github.com/clouddrove/terraform-azure-labels
+    description: Provides resource tagging.
 
 #  description of this project
 description: |-
   Terraform module to create flexible-mysql resource on AZURE.
-
 # extra content
 include:
   - "terraform.md"
 
 # How to use this project
-# yamllint disable rule:line-length
 usage: |-
   ### Simple Example
   Here is an example of how you can use this module in your inventory structure:
diff --git a/docs/io.md b/docs/io.md
index 1bb6eb9..56c0e8c 100644
--- a/docs/io.md
+++ b/docs/io.md
@@ -67,5 +67,6 @@
 | azurerm\_private\_dns\_zone\_virtual\_network\_link\_id | The ID of the Private DNS Zone Virtual Network Link. |
 | existing\_private\_dns\_zone\_virtual\_network\_link\_id | The ID of the Private DNS Zone Virtual Network Link. |
 | mysql\_flexible\_server\_id | The ID of the MySQL Flexible Server. |
+
 | password\_result | Password Value |
 
diff --git a/examples/basic/main.tf b/examples/basic/main.tf
index a852ad3..82034f8 100644
--- a/examples/basic/main.tf
+++ b/examples/basic/main.tf
@@ -1,4 +1,4 @@
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
 ## Flexible Mysql server module call.
 ##-----------------------------------------------------------------------------
 module "flexible-mysql" {
@@ -10,7 +10,6 @@ module "flexible-mysql" {
   virtual_network_id  = "/subscriptions/---------------<vnet_id>---------------"
   delegated_subnet_id = "/subscriptions/---------------<delegated_subnet_id>---------------"
   mysql_version       = "8.0.21"
-  mysql_server_name   = "testmysqlserver"
   private_dns         = true
   zone                = "1"
   admin_username      = "mysqlusername"
@@ -25,4 +24,4 @@ module "flexible-mysql" {
   ##azurerm_mysql_flexible_server_configuration
   server_configuration_names = ["interactive_timeout", "audit_log_enabled"]
   values                     = ["600", "ON"]
-}
\ No newline at end of file
+}
diff --git a/examples/basic/versions.tf b/examples/basic/versions.tf
index 75852e1..a9fe673 100644
--- a/examples/basic/versions.tf
+++ b/examples/basic/versions.tf
@@ -10,4 +10,4 @@ terraform {
       version = "3.112.0"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/examples/complete/main.tf b/examples/complete/main.tf
index f6872df..7d9fda3 100644
--- a/examples/complete/main.tf
+++ b/examples/complete/main.tf
@@ -1,14 +1,23 @@
 provider "azurerm" {
   features {}
+  subscription_id = "000000-11111-1223-XXX-XXXXXXXXXXXX"
 }
 
+provider "azurerm" {
+  features {}
+  alias           = "peer"
+  subscription_id = "000000-11111-1223-XXX-XXXXXXXXXXXX"
+}
+
+data "azurerm_client_config" "current_client_config" {}
+
 locals {
   name        = "app"
   environment = "test"
   label_order = ["name", "environment"]
 }
 
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
 ## Resource Group module call
 ## Resource group in which all resources will be deployed.
 ##-----------------------------------------------------------------------------
@@ -21,7 +30,7 @@ module "resource_group" {
   location    = "Central India"
 }
 
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
 ## Virtual Network module call.
 ##-----------------------------------------------------------------------------
 module "vnet" {
@@ -34,7 +43,7 @@ module "vnet" {
   address_space       = "10.0.0.0/16"
 }
 
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
 ## Subnet module call.
 ## Delegated subnet for mysql.
 ##-----------------------------------------------------------------------------
@@ -60,12 +69,56 @@ module "subnet" {
   }
 }
 
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
+## Key Vault module call.
+##-----------------------------------------------------------------------------
+module "vault" {
+  source  = "clouddrove/key-vault/azure"
+  version = "1.2.0"
+
+  providers = {
+    azurerm.dns_sub  = azurerm.peer,
+    azurerm.main_sub = azurerm
+  }
+
+  name                        = local.name
+  environment                 = local.environment
+  label_order                 = local.label_order
+  resource_group_name         = module.resource_group.resource_group_name
+  location                    = module.resource_group.resource_group_location
+  admin_objects_ids           = [data.azurerm_client_config.current_client_config.object_id]
+  virtual_network_id          = module.vnet.vnet_id[0]
+  subnet_id                   = module.subnet.default_subnet_id[0]
+  enable_rbac_authorization   = true
+  enabled_for_disk_encryption = false
+  #private endpoint
+  enable_private_endpoint = false
+  network_acls = {
+    bypass         = "AzureServices"
+    default_action = "Deny"
+    ip_rules       = ["0.0.0.0/0"]
+  }
+  ########Following to be uncommnented only when using DNS Zone from different subscription along with existing DNS zone.
+
+  # diff_sub                                      = true
+  # alias                                         = ""
+  # alias_sub                                     = ""
+
+  #########Following to be uncommmented when using DNS zone from different resource group or different subscription.
+  # existing_private_dns_zone                     = ""
+  # existing_private_dns_zone_resource_group_name = ""
+
+  #### enable diagnostic setting
+  diagnostic_setting_enable  = false
+  log_analytics_workspace_id = module.log-analytics.workspace_id ## when diagnostic_setting_enable enable,  add log analytics workspace id
+}
+
+##-----------------------------------------------------------------------------
 ## Log Analytics module call.
 ##-----------------------------------------------------------------------------
 module "log-analytics" {
   source                           = "clouddrove/log-analytics/azure"
-  version                          = "1.0.1"
+  version                          = "1.1.0"
   name                             = local.name
   environment                      = local.environment
   label_order                      = local.label_order
@@ -77,35 +130,37 @@ module "log-analytics" {
   internet_query_enabled           = true
   resource_group_name              = module.resource_group.resource_group_name
   log_analytics_workspace_location = module.resource_group.resource_group_location
+  log_analytics_workspace_id       = module.log-analytics.workspace_id
 }
 
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
 ## Flexible Mysql server module call.
 ##-----------------------------------------------------------------------------
 module "flexible-mysql" {
-  depends_on          = [module.resource_group, module.vnet]
-  source              = "../../"
-  name                = local.name
-  environment         = local.environment
-  resource_group_name = module.resource_group.resource_group_name
-  location            = module.resource_group.resource_group_location
-  virtual_network_id  = module.vnet.vnet_id[0]
-  delegated_subnet_id = module.subnet.default_subnet_id[0]
-  mysql_version       = "8.0.21"
-  mysql_server_name   = "testmysqlserver"
-  private_dns         = true
-  zone                = "1"
-  admin_username      = "mysqlusername"
-  admin_password      = "ba5yatgfgfhdsv6A3ns2lu4gqzzc"
-  sku_name            = "GP_Standard_D8ds_v4"
-  db_name             = "maindb"
-  charset             = "utf8mb3"
-  collation           = "utf8mb3_unicode_ci"
-  auto_grow_enabled   = true
-  iops                = 360
-  size_gb             = "20"
-  ##azurerm_mysql_flexible_server_configuration
+  depends_on                 = [module.resource_group, module.vnet, module.vault]
+  source                     = "../../"
+  name                       = local.name
+  environment                = local.environment
+  resource_group_name        = module.resource_group.resource_group_name
+  location                   = module.resource_group.resource_group_location
+  virtual_network_id         = module.vnet.vnet_id[0]
+  delegated_subnet_id        = module.subnet.default_subnet_id[0]
+  mysql_version              = "8.0.21"
+  private_dns                = true
+  zone                       = "1"
+  admin_username             = "mysqlusername"
+  admin_password             = "ba5yatgfgfhdsv6A3ns2lu4gqzzc"
+  sku_name                   = "GP_Standard_D8ds_v4"
+  db_name                    = "maindb"
+  charset                    = "utf8mb3"
+  collation                  = "utf8mb3_unicode_ci"
+  auto_grow_enabled          = true
+  iops                       = 360
+  size_gb                    = "20"
   server_configuration_names = ["interactive_timeout", "audit_log_enabled", "audit_log_events"]
   values                     = ["600", "ON", "CONNECTION,ADMIN,DDL,TABLE_ACCESS"]
   log_analytics_workspace_id = module.log-analytics.workspace_id
+  key_vault_id               = module.vault.id
+  key_vault_with_rbac        = true
+  cmk_enabled                = true
 }
diff --git a/examples/complete/output.tf b/examples/complete/output.tf
index 9b9a9fa..68c4646 100644
--- a/examples/complete/output.tf
+++ b/examples/complete/output.tf
@@ -15,6 +15,3 @@ output "azurerm_private_dns_zone_id" {
   value       = module.flexible-mysql.azurerm_private_dns_zone_id
   description = "The Private DNS Zone ID."
 }
-
-
-
diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf
index 75852e1..a8a0606 100644
--- a/examples/complete/versions.tf
+++ b/examples/complete/versions.tf
@@ -7,7 +7,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.112.0"
+      version = ">=3.112.0"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 3.1"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/examples/mysql-flexible-server-replication/main.tf b/examples/mysql-flexible-server-replication/main.tf
index 88c5008..84e9444 100644
--- a/examples/mysql-flexible-server-replication/main.tf
+++ b/examples/mysql-flexible-server-replication/main.tf
@@ -8,7 +8,7 @@ locals {
   label_order = ["name", "environment"]
 }
 
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
 ## Resource Group module call
 ## Resource group in which all resources will be deployed.
 ##-----------------------------------------------------------------------------
@@ -21,7 +21,7 @@ module "resource_group" {
   location    = "Canada Central"
 }
 
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
 ## Virtual Network module call.
 ##-----------------------------------------------------------------------------
 module "vnet" {
@@ -34,7 +34,7 @@ module "vnet" {
   address_space       = "10.0.0.0/16"
 }
 
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
 ## Subnet module call.
 ## Delegated subnet for mysql.
 ##-----------------------------------------------------------------------------
@@ -61,16 +61,16 @@ module "subnet" {
   }
 }
 
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
 ## Existing resource group where dns zone created
 ##-----------------------------------------------------------------------------
 data "azurerm_resource_group" "main" {
   name = "app-mysqll-test-resource-group"
 }
 
-##----------------------------------------------------------------------------- 
-## Data block for existing private dns zone. 
-## Required because for replication both flexible mysql servers must be in same private dns zone. 
+##-----------------------------------------------------------------------------
+## Data block for existing private dns zone.
+## Required because for replication both flexible mysql servers must be in same private dns zone.
 ##-----------------------------------------------------------------------------
 data "azurerm_private_dns_zone" "main" {
   depends_on          = [data.azurerm_resource_group.main]
@@ -78,12 +78,12 @@ data "azurerm_private_dns_zone" "main" {
   resource_group_name = data.azurerm_resource_group.main.name
 }
 
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
 ## Flexible Mysql server module call.
 ##-----------------------------------------------------------------------------
 module "flexible-mysql" {
   depends_on                     = [module.resource_group, module.vnet, data.azurerm_resource_group.main]
-  source                         = "clouddrove/flexible-mysql/azure"
+  source                         = "../../"
   name                           = local.name
   environment                    = local.environment
   main_rg_name                   = data.azurerm_resource_group.main.name
@@ -92,7 +92,6 @@ module "flexible-mysql" {
   virtual_network_id             = module.vnet.vnet_id[0]
   delegated_subnet_id            = module.subnet.default_subnet_id[0]
   mysql_version                  = "8.0.21"
-  mysql_server_name              = "testmysqlserver"
   zone                           = "1"
   admin_username                 = "mysqlusern"
   admin_password                 = "ba5yatgfgfhdsvvc6A3ns2lu4gqzzc"
diff --git a/examples/mysql-flexible-server-replication/output.tf b/examples/mysql-flexible-server-replication/output.tf
index 8e12edf..b755228 100644
--- a/examples/mysql-flexible-server-replication/output.tf
+++ b/examples/mysql-flexible-server-replication/output.tf
@@ -10,8 +10,3 @@ output "azurerm_flexible-mysql_server_configuration_id" {
   value       = module.flexible-mysql.azurerm_mysql_flexible_server_configuration_id
   description = "The ID of the MySQL Flexible Server Configuration."
 }
-
-
-
-
-
diff --git a/examples/mysql-flexible-server-replication/versions.tf b/examples/mysql-flexible-server-replication/versions.tf
index 75852e1..a9fe673 100644
--- a/examples/mysql-flexible-server-replication/versions.tf
+++ b/examples/mysql-flexible-server-replication/versions.tf
@@ -10,4 +10,4 @@ terraform {
       version = "3.112.0"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/main.tf b/main.tf
index ea182c8..3bf4174 100644
--- a/main.tf
+++ b/main.tf
@@ -1,18 +1,16 @@
-##----------------------------------------------------------------------------- 
-## Vritual Network and Subnet Creation  
+##-----------------------------------------------------------------------------
+## Vritual Network and Subnet Creation
 ##-----------------------------------------------------------------------------
 data "azurerm_client_config" "current" {}
-
-##----------------------------------------------------------------------------- 
-## Locals Declaration 
+##-----------------------------------------------------------------------------
+## Locals Declaration
 ##-----------------------------------------------------------------------------
 locals {
   resource_group_name = var.resource_group_name
-  location            = var.location
 }
 
-##----------------------------------------------------------------------------- 
-## Labels module callled that will be used for naming and tags.   
+##-----------------------------------------------------------------------------
+## Labels module callled that will be used for naming and tags.
 ##-----------------------------------------------------------------------------
 module "labels" {
   source      = "clouddrove/labels/azure"
@@ -24,9 +22,9 @@ module "labels" {
   repository  = var.repository
 }
 
-##----------------------------------------------------------------------------- 
+##-----------------------------------------------------------------------------
 ## Random Password Resource.
-## Will be passed as admin password of mysql server when admin password is not passed manually as variable. 
+## Will be passed as admin password of mysql server when admin password is not passed manually as variable.
 ##-----------------------------------------------------------------------------
 
 resource "random_password" "main" {
@@ -38,8 +36,8 @@ resource "random_password" "main" {
   special     = false
 }
 
-##----------------------------------------------------------------------------- 
-## Below resource will create flexible mysql server in Azure environment.    
+##-----------------------------------------------------------------------------
+## Below resource will create flexible mysql server in Azure environment.
 ##-----------------------------------------------------------------------------
 
 resource "azurerm_mysql_flexible_server" "main" {
@@ -51,7 +49,7 @@ resource "azurerm_mysql_flexible_server" "main" {
   administrator_password            = var.admin_password == null ? random_password.main[0].result : var.admin_password
   backup_retention_days             = var.backup_retention_days
   delegated_subnet_id               = var.delegated_subnet_id
-  private_dns_zone_id               = var.private_dns ? join("", azurerm_private_dns_zone.main.*.id) : var.existing_private_dns_zone_id
+  private_dns_zone_id               = var.private_dns ? azurerm_private_dns_zone.main[0].id : var.existing_private_dns_zone_id
   sku_name                          = var.sku_name
   create_mode                       = var.create_mode
   geo_redundant_backup_enabled      = var.geo_redundant_backup_enabled
@@ -80,6 +78,27 @@ resource "azurerm_mysql_flexible_server" "main" {
 
   }
 
+  dynamic "identity" {
+    for_each = var.cmk_enabled ? [true] : []
+    content {
+      type = "UserAssigned"
+      identity_ids = flatten([
+        [azurerm_user_assigned_identity.primary_cmk_umi[0].id],
+        var.geo_redundant_backup_enabled ? [azurerm_user_assigned_identity.geo_cmk_umi[0].id] : []
+      ])
+    }
+  }
+
+  dynamic "customer_managed_key" {
+    for_each = var.cmk_enabled ? [true] : []
+    content {
+      key_vault_key_id                     = azurerm_key_vault_key.primary_cmk_key[0].id
+      primary_user_assigned_identity_id    = azurerm_user_assigned_identity.primary_cmk_umi[0].id
+      geo_backup_key_vault_key_id          = var.geo_redundant_backup_enabled ? azurerm_key_vault_key.geo_cmk_key[0].id : null
+      geo_backup_user_assigned_identity_id = var.geo_redundant_backup_enabled ? azurerm_user_assigned_identity.geo_cmk_umi[0].id : null
+    }
+  }
+
   version = var.mysql_version
   zone    = var.zone
 
@@ -88,6 +107,9 @@ resource "azurerm_mysql_flexible_server" "main" {
   depends_on = [azurerm_private_dns_zone_virtual_network_link.main, azurerm_private_dns_zone_virtual_network_link.main2]
 }
 
+##-----------------------------------------------------------------------------
+## Below resource will create mysql flexible database.
+
 ##----------------------------------------------------------------------------- 
 ## Below resource will create mysql server active directory administrator. 
 ##-----------------------------------------------------------------------------
@@ -106,41 +128,33 @@ resource "azurerm_mysql_flexible_server_active_directory_administrator" "main" {
 
 ##----------------------------------------------------------------------------- 
 ## Below resource will create mysql flexible database. 
+
 ##-----------------------------------------------------------------------------
 
 resource "azurerm_mysql_flexible_database" "main" {
   count               = var.enabled ? 1 : 0
   name                = var.db_name
   resource_group_name = local.resource_group_name
-  server_name         = join("", azurerm_mysql_flexible_server.main.*.name)
+  server_name         = azurerm_mysql_flexible_server.main[0].name
   charset             = var.charset
   collation           = var.collation
   depends_on          = [azurerm_mysql_flexible_server_active_directory_administrator.main]
 }
 
-##----------------------------------------------------------------------------- 
-## Below resource will create flexible mysql server configuration. 
+##-----------------------------------------------------------------------------
+## Below resource will create flexible mysql server configuration.
 ##-----------------------------------------------------------------------------
 
 resource "azurerm_mysql_flexible_server_configuration" "main" {
   count               = var.enabled ? length(var.server_configuration_names) : 0
   name                = element(var.server_configuration_names, count.index)
   resource_group_name = local.resource_group_name
-  server_name         = join("", azurerm_mysql_flexible_server.main.*.name)
+  server_name         = azurerm_mysql_flexible_server.main[0].name
   value               = element(var.values, count.index)
 }
 
-##------------------------------------------------------------------------
-## Manages a Customer Managed Key for a MySQL Server. - Default is "false"
-##------------------------------------------------------------------------
-resource "azurerm_mysql_server_key" "main" {
-  count            = var.enabled && var.key_vault_key_id != null ? 1 : 0
-  server_id        = join("", azurerm_mysql_flexible_server.main.*.id)
-  key_vault_key_id = var.key_vault_key_id
-}
-
-##----------------------------------------------------------------------------- 
-## Below resource will deploy private dns for flexible mysql server. 
+##-----------------------------------------------------------------------------
+## Below resource will deploy private dns for flexible mysql server.
 ##-----------------------------------------------------------------------------
 resource "azurerm_private_dns_zone" "main" {
   count               = var.enabled && var.private_dns ? 1 : 0
@@ -149,21 +163,21 @@ resource "azurerm_private_dns_zone" "main" {
   tags                = var.custom_tags == null ? module.labels.tags : var.custom_tags
 }
 
-##----------------------------------------------------------------------------- 
-## Below resource will create vnet link in above created mysql private dns resource. 
+##-----------------------------------------------------------------------------
+## Below resource will create vnet link in above created mysql private dns resource.
 ##-----------------------------------------------------------------------------
 resource "azurerm_private_dns_zone_virtual_network_link" "main" {
   count                 = var.enabled && var.private_dns ? 1 : 0
   name                  = format("mysql-endpoint-link-%s", module.labels.id)
-  private_dns_zone_name = join("", azurerm_private_dns_zone.main.*.name)
+  private_dns_zone_name = azurerm_private_dns_zone.main[0].name
   virtual_network_id    = var.virtual_network_id
   resource_group_name   = local.resource_group_name
   registration_enabled  = var.registration_enabled
   tags                  = var.custom_tags == null ? module.labels.tags : var.custom_tags
 }
 
-##----------------------------------------------------------------------------- 
-## Below resource will create vnet link in previously existing mysql private dns zone.  
+##-----------------------------------------------------------------------------
+## Below resource will create vnet link in previously existing mysql private dns zone.
 ##-----------------------------------------------------------------------------
 resource "azurerm_private_dns_zone_virtual_network_link" "main2" {
   count                 = var.enabled && var.existing_private_dns_zone ? 1 : 0
@@ -200,3 +214,68 @@ resource "azurerm_monitor_diagnostic_setting" "mysql" {
     }
   }
 }
+
+resource "azurerm_user_assigned_identity" "primary_cmk_umi" {
+  count               = var.cmk_enabled ? 1 : 0
+  name                = format("%s-cmk-primary-identity", module.labels.id)
+  resource_group_name = local.resource_group_name
+  location            = var.location
+}
+
+##-----------------------------------------------------------------------------
+## Customer Managed Key (CMK) - Key Vault Key Creation
+##-----------------------------------------------------------------------------
+resource "azurerm_key_vault_key" "primary_cmk_key" {
+  count        = var.cmk_enabled ? 1 : 0
+  name         = format("%s-cmk-key", module.labels.id)
+  key_vault_id = var.key_vault_id
+  key_type     = var.cmk_key_type
+  key_size     = var.cmk_key_size
+  key_opts     = ["encrypt", "decrypt", "sign", "verify", "wrapKey", "unwrapKey"]
+}
+
+resource "azurerm_role_assignment" "primary_cmk_role_assignment" {
+  count                = var.key_vault_with_rbac && var.cmk_enabled ? 1 : 0
+  principal_id         = azurerm_user_assigned_identity.primary_cmk_umi[0].principal_id
+  role_definition_name = "Key Vault Crypto Service Encryption User"
+  scope                = var.key_vault_id
+}
+
+resource "azurerm_key_vault_access_policy" "primary_cmk_access_policy" {
+  count           = !var.key_vault_with_rbac && var.cmk_enabled ? 1 : 0
+  key_vault_id    = var.key_vault_id
+  tenant_id       = data.azurerm_client_config.current.tenant_id
+  object_id       = azurerm_user_assigned_identity.primary_cmk_umi[0].principal_id
+  key_permissions = ["Get", "WrapKey", "UnwrapKey", "List"]
+}
+
+resource "azurerm_user_assigned_identity" "geo_cmk_umi" {
+  count               = var.geo_redundant_backup_enabled && var.cmk_enabled ? 1 : 0
+  name                = format("%s-cmk-geo-identity", module.labels.id)
+  resource_group_name = local.resource_group_name
+  location            = var.location
+}
+
+resource "azurerm_key_vault_key" "geo_cmk_key" {
+  count        = var.geo_redundant_backup_enabled && var.cmk_enabled ? 1 : 0
+  name         = format("%s-geo-cmk-key", module.labels.id)
+  key_vault_id = var.key_vault_id
+  key_type     = var.cmk_key_type
+  key_size     = var.cmk_key_size
+  key_opts     = ["encrypt", "decrypt", "sign", "verify", "wrapKey", "unwrapKey"]
+}
+
+resource "azurerm_role_assignment" "geo_cmk_role_assignment" {
+  count                = var.key_vault_with_rbac && var.cmk_enabled && var.geo_redundant_backup_enabled ? 1 : 0
+  principal_id         = azurerm_user_assigned_identity.geo_cmk_umi[0].principal_id
+  role_definition_name = "Key Vault Crypto Service Encryption User"
+  scope                = var.key_vault_id
+}
+
+resource "azurerm_key_vault_access_policy" "geo_cmk_access_policy" {
+  count           = !var.key_vault_with_rbac && var.cmk_enabled && var.geo_redundant_backup_enabled ? 1 : 0
+  key_vault_id    = var.key_vault_id
+  tenant_id       = data.azurerm_client_config.current.tenant_id
+  object_id       = azurerm_user_assigned_identity.geo_cmk_umi[0].principal_id
+  key_permissions = ["Get", "WrapKey", "UnwrapKey", "List"]
+}
diff --git a/output.tf b/output.tf
index 1fdd5ea..0786b39 100644
--- a/output.tf
+++ b/output.tf
@@ -1,22 +1,24 @@
 output "mysql_flexible_server_id" {
-  value       = join("", azurerm_mysql_flexible_server.main.*.id)
+  value       = azurerm_mysql_flexible_server.main[0].id
   description = "The ID of the MySQL Flexible Server."
 }
 
 output "azurerm_private_dns_zone_virtual_network_link_id" {
-  value       = join("", azurerm_private_dns_zone_virtual_network_link.main.*.id)
+  value       = azurerm_private_dns_zone_virtual_network_link.main[0].id
   description = "The ID of the Private DNS Zone Virtual Network Link."
 }
+
 output "existing_private_dns_zone_virtual_network_link_id" {
-  value       = join("", azurerm_private_dns_zone_virtual_network_link.main2.*.id)
-  description = "The ID of the Private DNS Zone Virtual Network Link."
+  value = length(azurerm_private_dns_zone_virtual_network_link.main2) > 0 ? azurerm_private_dns_zone_virtual_network_link.main2[0].id : null
 }
+
 output "azurerm_mysql_flexible_server_configuration_id" {
-  value       = join("", azurerm_mysql_flexible_server_configuration.main.*.id)
+  value       = azurerm_mysql_flexible_server_configuration.main[0].id
   description = "The ID of the MySQL Flexible Server Configuration."
 }
+
 output "azurerm_private_dns_zone_id" {
-  value       = join("", azurerm_private_dns_zone.main.*.id)
+  value       = azurerm_private_dns_zone.main[0].id
   description = "The Private DNS Zone ID."
 }
 
@@ -25,8 +27,3 @@ output "password_result" {
   description = "Password Value"
   sensitive   = true
 }
-
-
-
-
-
diff --git a/variables.tf b/variables.tf
index 9a72fc8..e131f50 100644
--- a/variables.tf
+++ b/variables.tf
@@ -31,12 +31,11 @@ variable "managedby" {
 }
 
 variable "resource_group_name" {
+  type        = string
   description = "A container that holds related resources for an Azure solution"
   default     = ""
 }
 
-
-
 variable "enabled" {
   type        = bool
   description = "Set to false to prevent the module from creating any resources."
@@ -49,11 +48,6 @@ variable "existing_private_dns_zone" {
   default     = false
 }
 
-variable "enable_private_endpoint" {
-  description = "Manages a Private Endpoint to Azure database for MySQL"
-  default     = false
-}
-
 variable "registration_enabled" {
   type        = bool
   description = "Is auto-registration of virtual machine records in the virtual network in the Private DNS zone enabled"
@@ -62,14 +56,11 @@ variable "registration_enabled" {
 ###########azurerm_mysql_flexible_server######
 
 variable "admin_username" {
+  type        = string
   description = "The administrator login name for the new SQL Server"
   default     = null
 }
 
-variable "mysql_server_name" {
-  type    = string
-  default = ""
-}
 variable "admin_password" {
   type        = string
   description = "The password associated with the admin_username user"
@@ -142,35 +133,12 @@ variable "source_server_id" {
   description = "The resource ID of the source MySQL Flexible Server to be restored. Required when create_mode is PointInTimeRestore, GeoRestore, and Replica. Changing this forces a new MySQL Flexible Server to be created."
 }
 
-variable "start_ip_address" {
-  type    = string
-  default = ""
-}
-
-variable "end_ip_address" {
-  type    = string
-  default = ""
-}
-
 variable "virtual_network_id" {
   type        = string
   description = "The name of the virtual network"
   default     = ""
 }
 
-variable "key_vault_key_id" {
-  type        = string
-  description = "The URL to a Key Vault Key"
-  default     = null
-}
-
-variable "key_vault_id" {
-  type        = string
-  default     = ""
-  description = "Specifies the URL to a Key Vault Key (either from a Key Vault Key, or the Key URL for the Key Vault Secret"
-}
-
-
 variable "private_dns" {
   type    = bool
   default = false
@@ -297,6 +265,31 @@ variable "eventhub_authorization_rule_id" {
   description = "Eventhub authorization rule id to pass it to destination details of diagnosys setting of NSG."
 }
 
+variable "cmk_enabled" {
+  type    = bool
+  default = false
+}
+
+variable "key_vault_id" {
+  type    = string
+  default = null
+}
+
+variable "cmk_key_type" {
+  type    = string
+  default = "RSA"
+}
+
+variable "cmk_key_size" {
+  type    = number
+  default = 2048
+}
+
+variable "key_vault_with_rbac" {
+  type    = bool
+  default = false
+}
+
 variable "custom_tags" {
   type    = map(string)
   default = {}
@@ -323,3 +316,8 @@ variable "entra_authentication" {
   })
   default = {}
 }
+
+variable "mysql_server_name" {
+  type    = string
+  default = null
+}
diff --git a/versions.tf b/versions.tf
index 78a772f..a8a0606 100644
--- a/versions.tf
+++ b/versions.tf
@@ -7,7 +7,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = ">=3.0.0"
+      version = ">=3.112.0"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = ">= 3.1"
     }
   }
-}
\ No newline at end of file
+}