diff --git a/terraform/subscriptions/s940/c2/monitor/grafana.tf b/terraform/subscriptions/s940/c2/monitor/grafana.tf
index 78c3e12c..a76a5900 100644
--- a/terraform/subscriptions/s940/c2/monitor/grafana.tf
+++ b/terraform/subscriptions/s940/c2/monitor/grafana.tf
@@ -1,14 +1,4 @@
 
-data "azurerm_key_vault" "this" {
-  name                = module.config.key_vault_name
-  resource_group_name = module.config.common_resource_group
-}
-
-data "azurerm_key_vault_secret" "grafana-admin-password" {
-  name         = "mysql-grafana-${module.config.environment}-admin-password"
-  key_vault_id = data.azurerm_key_vault.this.id
-}
-
 # This MI must not be deleted, has been given Directory Reader role by Equnior AAD Team!
 module "grafana-mi-server" {
   source              = "../../../modules/userassignedidentity"
@@ -31,8 +21,6 @@ resource "azurerm_mysql_flexible_server" "grafana" {
   zone                   = 2
   backup_retention_days  = 35
   sku_name               = "B_Standard_B2ms"
-  administrator_login    = "radixadmin"
-  administrator_password = data.azurerm_key_vault_secret.grafana-admin-password.value
 
   tags = {
     IaC = "terraform"
diff --git a/terraform/subscriptions/s940/extmon/monitor/grafana.tf b/terraform/subscriptions/s940/extmon/monitor/grafana.tf
index 08ee28f0..9efe3cfa 100644
--- a/terraform/subscriptions/s940/extmon/monitor/grafana.tf
+++ b/terraform/subscriptions/s940/extmon/monitor/grafana.tf
@@ -1,14 +1,4 @@
 
-data "azurerm_key_vault" "this" {
-  name                = module.config.key_vault_name
-  resource_group_name = module.config.common_resource_group
-}
-
-data "azurerm_key_vault_secret" "grafana-admin-password" {
-  name         = "mysql-grafana-prod-admin-password"
-  key_vault_id = data.azurerm_key_vault.this.id
-}
-
 # This MI must not be deleted, has been given Directory Reader role by Equnior AAD Team!
 module "grafana-mi-server" {
   source              = "../../../modules/userassignedidentity"
@@ -24,8 +14,6 @@ resource "azurerm_mysql_flexible_server" "grafana" {
   zone                   = 2
   backup_retention_days  = 35
   sku_name               = "B_Standard_B2ms"
-  administrator_login    = "radixadmin"
-  administrator_password = data.azurerm_key_vault_secret.grafana-admin-password.value
 
   tags = {
     IaC = "terraform"
diff --git a/terraform/subscriptions/s940/prod/monitor/grafana.tf b/terraform/subscriptions/s940/prod/monitor/grafana.tf
index 4f3ae869..53023a26 100644
--- a/terraform/subscriptions/s940/prod/monitor/grafana.tf
+++ b/terraform/subscriptions/s940/prod/monitor/grafana.tf
@@ -1,14 +1,4 @@
 
-data "azurerm_key_vault" "this" {
-  name                = module.config.key_vault_name
-  resource_group_name = module.config.common_resource_group
-}
-
-data "azurerm_key_vault_secret" "grafana-admin-password" {
-  name         = "mysql-grafana-prod-admin-password"
-  key_vault_id = data.azurerm_key_vault.this.id
-}
-
 # This MI must not be deleted, has been given Directory Reader role by Equnior AAD Team!
 module "grafana-mi-server" {
   source              = "../../../modules/userassignedidentity"
@@ -31,8 +21,6 @@ resource "azurerm_mysql_flexible_server" "grafana" {
   zone                   = 2
   backup_retention_days  = 35
   sku_name               = "B_Standard_B2ms"
-  administrator_login    = "radixadmin"
-  administrator_password = data.azurerm_key_vault_secret.grafana-admin-password.value
 
   tags = {
     IaC = "terraform"
diff --git a/terraform/subscriptions/s941/dev/monitor/grafana.tf b/terraform/subscriptions/s941/dev/monitor/grafana.tf
index eaae7213..1cec3753 100644
--- a/terraform/subscriptions/s941/dev/monitor/grafana.tf
+++ b/terraform/subscriptions/s941/dev/monitor/grafana.tf
@@ -1,14 +1,3 @@
-
-data "azurerm_key_vault" "this" {
-  name                = module.config.key_vault_name
-  resource_group_name = module.config.common_resource_group
-}
-
-data "azurerm_key_vault_secret" "grafana-admin-password" {
-  name         = "mysql-grafana-${module.config.environment}-admin-password"
-  key_vault_id = data.azurerm_key_vault.this.id
-}
-
 # This MI must not be deleted, has been given Directory Reader role by Equnior AAD Team!
 module "grafana-mi-server" {
   source              = "../../../modules/userassignedidentity"
@@ -31,8 +20,6 @@ resource "azurerm_mysql_flexible_server" "grafana" {
   zone                   = 2
   backup_retention_days  = 7
   sku_name               = "B_Standard_B1ms"
-  administrator_login    = "radixadmin"
-  administrator_password = data.azurerm_key_vault_secret.grafana-admin-password.value
 
   tags = {
     IaC = "terraform"
diff --git a/terraform/subscriptions/s941/playground/monitor/grafana.tf b/terraform/subscriptions/s941/playground/monitor/grafana.tf
index eaae7213..dcabeaef 100644
--- a/terraform/subscriptions/s941/playground/monitor/grafana.tf
+++ b/terraform/subscriptions/s941/playground/monitor/grafana.tf
@@ -1,14 +1,4 @@
 
-data "azurerm_key_vault" "this" {
-  name                = module.config.key_vault_name
-  resource_group_name = module.config.common_resource_group
-}
-
-data "azurerm_key_vault_secret" "grafana-admin-password" {
-  name         = "mysql-grafana-${module.config.environment}-admin-password"
-  key_vault_id = data.azurerm_key_vault.this.id
-}
-
 # This MI must not be deleted, has been given Directory Reader role by Equnior AAD Team!
 module "grafana-mi-server" {
   source              = "../../../modules/userassignedidentity"
@@ -31,8 +21,6 @@ resource "azurerm_mysql_flexible_server" "grafana" {
   zone                   = 2
   backup_retention_days  = 7
   sku_name               = "B_Standard_B1ms"
-  administrator_login    = "radixadmin"
-  administrator_password = data.azurerm_key_vault_secret.grafana-admin-password.value
 
   tags = {
     IaC = "terraform"