diff --git a/modules/azurerm/sonar-base-instance/secret.tf b/modules/azurerm/sonar-base-instance/secret.tf
index a3b737a21..b2d8d63c2 100644
--- a/modules/azurerm/sonar-base-instance/secret.tf
+++ b/modules/azurerm/sonar-base-instance/secret.tf
@@ -34,7 +34,7 @@ locals {
 data "azurerm_client_config" "current" {}
 
 resource "azurerm_key_vault" "vault" {
-  name                       = var.name
+  name                       = trim(substr(var.name, -24, -1), "-")
   location                   = var.resource_group.location
   resource_group_name        = var.resource_group.name
   enabled_for_deployment     = true