diff --git a/templates/shared_services/gitea/terraform/gitea-webapp.tf b/templates/shared_services/gitea/terraform/gitea-webapp.tf
index f755033e2f..d22f969c77 100644
--- a/templates/shared_services/gitea/terraform/gitea-webapp.tf
+++ b/templates/shared_services/gitea/terraform/gitea-webapp.tf
@@ -46,9 +46,9 @@ resource "azurerm_linux_web_app" "gitea" {
 
     GITEA__database__SSL_MODE = "true"
     GITEA__database__DB_TYPE  = "mysql"
-    GITEA__database__HOST     = azurerm_mysql_server.gitea.fqdn
+    GITEA__database__HOST     = azurerm_mysql_flexible_server.gitea.fqdn
     GITEA__database__NAME     = azurerm_mysql_database.gitea.name
-    GITEA__database__USER     = "${azurerm_mysql_server.gitea.administrator_login}@${azurerm_mysql_server.gitea.fqdn}"
+    GITEA__database__USER     = "${azurerm_mysql_flexible_server.gitea.administrator_login}@${azurerm_mysql_flexible_server.gitea.fqdn}"
     GITEA__database__PASSWD   = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.db_password.id})"
   }
 
diff --git a/templates/shared_services/gitea/terraform/mysql.tf b/templates/shared_services/gitea/terraform/mysql.tf
index 42bea9c4ff..ade07b629d 100644
--- a/templates/shared_services/gitea/terraform/mysql.tf
+++ b/templates/shared_services/gitea/terraform/mysql.tf
@@ -6,13 +6,13 @@ resource "random_password" "password" {
   min_special = 2
 }
 
-resource "azurerm_mysql_server" "gitea" {
+resource "azurerm_mysql_flexible_server" "gitea" {
   name                              = "mysql-${var.tre_id}"
   resource_group_name               = local.core_resource_group_name
   location                          = data.azurerm_resource_group.rg.location
   administrator_login               = "mysqladmin"
   administrator_login_password      = random_password.password.result
-  sku_name                          = "GP_Gen5_2"
+  sku_name                          = "Standard_D2s_v3"
   storage_mb                        = 5120
   version                           = "8.0"
   auto_grow_enabled                 = true
@@ -30,7 +30,7 @@ resource "azurerm_mysql_server" "gitea" {
 resource "azurerm_mysql_database" "gitea" {
   name                = "gitea"
   resource_group_name = local.core_resource_group_name
-  server_name         = azurerm_mysql_server.gitea.name
+  server_name         = azurerm_mysql_flexible_server.gitea.name
   charset             = "utf8"
   collation           = "utf8_unicode_ci"
 }
@@ -41,15 +41,15 @@ moved {
 }
 
 resource "azurerm_private_endpoint" "private_endpoint" {
-  name                = "pe-${azurerm_mysql_server.gitea.name}"
+  name                = "pe-${azurerm_mysql_flexible_server.gitea.name}"
   location            = data.azurerm_resource_group.rg.location
   resource_group_name = local.core_resource_group_name
   subnet_id           = data.azurerm_subnet.shared.id
   tags                = local.tre_shared_service_tags
 
   private_service_connection {
-    private_connection_resource_id = azurerm_mysql_server.gitea.id
-    name                           = "psc-${azurerm_mysql_server.gitea.name}"
+    private_connection_resource_id = azurerm_mysql_flexible_server.gitea.id
+    name                           = "psc-${azurerm_mysql_flexible_server.gitea.name}"
     subresource_names              = ["mysqlServer"]
     is_manual_connection           = false
   }
@@ -63,7 +63,7 @@ resource "azurerm_private_endpoint" "private_endpoint" {
 }
 
 resource "azurerm_key_vault_secret" "db_password" {
-  name         = "${azurerm_mysql_server.gitea.name}-administrator-password"
+  name         = "${azurerm_mysql_flexible_server.gitea.name}-administrator-password"
   value        = random_password.password.result
   key_vault_id = data.azurerm_key_vault.keyvault.id
   tags         = local.tre_shared_service_tags
diff --git a/templates/workspace_services/gitea/terraform/gitea-webapp.tf b/templates/workspace_services/gitea/terraform/gitea-webapp.tf
index 92c0b68ac8..4b8a8c3a01 100644
--- a/templates/workspace_services/gitea/terraform/gitea-webapp.tf
+++ b/templates/workspace_services/gitea/terraform/gitea-webapp.tf
@@ -56,9 +56,9 @@ resource "azurerm_linux_web_app" "gitea" {
     GITEA__service__SHOW_REGISTRATION_BUTTON         = false
     GITEA__database__SSL_MODE                        = "true"
     GITEA__database__DB_TYPE                         = "mysql"
-    GITEA__database__HOST                            = azurerm_mysql_server.gitea.fqdn
+    GITEA__database__HOST                            = azurerm_mysql_flexible_server.gitea.fqdn
     GITEA__database__NAME                            = azurerm_mysql_database.gitea.name
-    GITEA__database__USER                            = "${azurerm_mysql_server.gitea.administrator_login}@${azurerm_mysql_server.gitea.fqdn}"
+    GITEA__database__USER                            = "${azurerm_mysql_flexible_server.gitea.administrator_login}@${azurerm_mysql_flexible_server.gitea.fqdn}"
     GITEA__database__PASSWD                          = "@Microsoft.KeyVault(SecretUri=${azurerm_key_vault_secret.db_password.id})"
   }
 
diff --git a/templates/workspace_services/gitea/terraform/mysql.tf b/templates/workspace_services/gitea/terraform/mysql.tf
index ddd855edf4..97b9016846 100644
--- a/templates/workspace_services/gitea/terraform/mysql.tf
+++ b/templates/workspace_services/gitea/terraform/mysql.tf
@@ -6,23 +6,21 @@ resource "random_password" "password" {
   min_special = 2
 }
 
-resource "azurerm_mysql_server" "gitea" {
-  name                              = "mysql-${local.service_resource_name_suffix}"
-  resource_group_name               = data.azurerm_resource_group.ws.name
-  location                          = data.azurerm_resource_group.ws.location
-  administrator_login               = "mysqladmin"
-  administrator_login_password      = random_password.password.result
-  sku_name                          = "GP_Gen5_2"
-  storage_mb                        = 5120
-  version                           = "8.0"
-  auto_grow_enabled                 = true
-  backup_retention_days             = 7
-  geo_redundant_backup_enabled      = false
-  infrastructure_encryption_enabled = false
-  public_network_access_enabled     = false
-  ssl_enforcement_enabled           = true
-  ssl_minimal_tls_version_enforced  = "TLS1_2"
-  tags                              = local.workspace_service_tags
+resource "azurerm_mysql_flexible_server" "gitea" {
+  name                          = "mysql-${local.service_resource_name_suffix}"
+  resource_group_name           = data.azurerm_resource_group.ws.name
+  location                      = data.azurerm_resource_group.ws.location
+  sku_name                      = "GP_Gen5_2"
+  version                       = "8.0"
+  backup_retention_days         = 7
+  geo_redundant_backup_enabled  = false
+  public_network_access_enabled = false
+  tags                          = local.workspace_service_tags
+
+  administrator_login {
+    username = "mysqladmin"
+    password = random_password.password.result
+  }
 
   lifecycle { ignore_changes = [tags] }
 }
@@ -30,7 +28,7 @@ resource "azurerm_mysql_server" "gitea" {
 resource "azurerm_mysql_database" "gitea" {
   name                = "gitea"
   resource_group_name = data.azurerm_resource_group.ws.name
-  server_name         = azurerm_mysql_server.gitea.name
+  server_name         = azurerm_mysql_flexible_server.gitea.name
   charset             = "utf8"
   collation           = "utf8_unicode_ci"
 }
@@ -41,15 +39,15 @@ moved {
 }
 
 resource "azurerm_private_endpoint" "private_endpoint" {
-  name                = "pe-${azurerm_mysql_server.gitea.name}"
+  name                = "pe-${azurerm_mysql_flexible_server.gitea.name}"
   location            = data.azurerm_resource_group.ws.location
   resource_group_name = data.azurerm_resource_group.ws.name
   subnet_id           = data.azurerm_subnet.services.id
   tags                = local.workspace_service_tags
 
   private_service_connection {
-    private_connection_resource_id = azurerm_mysql_server.gitea.id
-    name                           = "psc-${azurerm_mysql_server.gitea.name}"
+    private_connection_resource_id = azurerm_mysql_flexible_server.gitea.id
+    name                           = "psc-${azurerm_mysql_flexible_server.gitea.name}"
     subresource_names              = ["mysqlServer"]
     is_manual_connection           = false
   }
@@ -63,7 +61,7 @@ resource "azurerm_private_endpoint" "private_endpoint" {
 }
 
 resource "azurerm_key_vault_secret" "db_password" {
-  name         = "${azurerm_mysql_server.gitea.name}-administrator-password"
+  name         = "${azurerm_mysql_flexible_server.gitea.name}-administrator-password"
   value        = random_password.password.result
   key_vault_id = data.azurerm_key_vault.ws.id
   tags         = local.workspace_service_tags
diff --git a/templates/workspace_services/mysql/terraform/mysql.tf b/templates/workspace_services/mysql/terraform/mysql.tf
index 9c0f387392..5ae65c9896 100644
--- a/templates/workspace_services/mysql/terraform/mysql.tf
+++ b/templates/workspace_services/mysql/terraform/mysql.tf
@@ -6,7 +6,7 @@ resource "random_password" "password" {
   min_special = 2
 }
 
-resource "azurerm_mysql_server" "mysql" {
+resource "azurerm_mysql_flexible_server" "mysql" {
   name                              = "mysql-${local.service_resource_name_suffix}"
   resource_group_name               = data.azurerm_resource_group.ws.name
   location                          = data.azurerm_resource_group.ws.location
@@ -30,21 +30,21 @@ resource "azurerm_mysql_server" "mysql" {
 resource "azurerm_mysql_database" "db" {
   name                = var.db_name
   resource_group_name = data.azurerm_resource_group.ws.name
-  server_name         = azurerm_mysql_server.mysql.name
+  server_name         = azurerm_mysql_flexible_server.mysql.name
   charset             = "utf8"
   collation           = "utf8_unicode_ci"
 }
 
 resource "azurerm_private_endpoint" "mysql_private_endpoint" {
-  name                = "pe-${azurerm_mysql_server.mysql.name}"
+  name                = "pe-${azurerm_mysql_flexible_server.mysql.name}"
   location            = data.azurerm_resource_group.ws.location
   resource_group_name = data.azurerm_resource_group.ws.name
   subnet_id           = data.azurerm_subnet.services.id
   tags                = local.workspace_service_tags
 
   private_service_connection {
-    private_connection_resource_id = azurerm_mysql_server.mysql.id
-    name                           = "psc-${azurerm_mysql_server.mysql.name}"
+    private_connection_resource_id = azurerm_mysql_flexible_server.mysql.id
+    name                           = "psc-${azurerm_mysql_flexible_server.mysql.name}"
     subresource_names              = ["mysqlServer"]
     is_manual_connection           = false
   }
@@ -58,7 +58,7 @@ resource "azurerm_private_endpoint" "mysql_private_endpoint" {
 }
 
 resource "azurerm_key_vault_secret" "db_password" {
-  name         = "${azurerm_mysql_server.mysql.name}-administrator-password"
+  name         = "${azurerm_mysql_flexible_server.mysql.name}-administrator-password"
   value        = random_password.password.result
   key_vault_id = data.azurerm_key_vault.ws.id
   tags         = local.workspace_service_tags
diff --git a/templates/workspace_services/mysql/terraform/outputs.tf b/templates/workspace_services/mysql/terraform/outputs.tf
index 824c5705ab..4b6aaa7fe0 100644
--- a/templates/workspace_services/mysql/terraform/outputs.tf
+++ b/templates/workspace_services/mysql/terraform/outputs.tf
@@ -1,3 +1,3 @@
 output "mysql_fqdn" {
-  value = azurerm_mysql_server.mysql.fqdn
+  value = azurerm_mysql_flexible_server.mysql.fqdn
 }