diff --git a/infrastructure/templates/public-api/components/alerts/flexibleServers/databaseAlive.bicep b/infrastructure/templates/public-api/components/alerts/postgreSqlFlexibleServers/databaseAlive.bicep
similarity index 100%
rename from infrastructure/templates/public-api/components/alerts/flexibleServers/databaseAlive.bicep
rename to infrastructure/templates/public-api/components/alerts/postgreSqlFlexibleServers/databaseAlive.bicep
diff --git a/infrastructure/templates/public-api/components/alerts/flexibleServers/queryTimeAlert.bicep b/infrastructure/templates/public-api/components/alerts/postgreSqlFlexibleServers/queryTimeAlert.bicep
similarity index 100%
rename from infrastructure/templates/public-api/components/alerts/flexibleServers/queryTimeAlert.bicep
rename to infrastructure/templates/public-api/components/alerts/postgreSqlFlexibleServers/queryTimeAlert.bicep
diff --git a/infrastructure/templates/public-api/components/alerts/flexibleServers/transactionTimeAlert.bicep b/infrastructure/templates/public-api/components/alerts/postgreSqlFlexibleServers/transactionTimeAlert.bicep
similarity index 100%
rename from infrastructure/templates/public-api/components/alerts/flexibleServers/transactionTimeAlert.bicep
rename to infrastructure/templates/public-api/components/alerts/postgreSqlFlexibleServers/transactionTimeAlert.bicep
diff --git a/infrastructure/templates/public-api/components/postgresqlDatabase.bicep b/infrastructure/templates/public-api/components/postgresqlDatabase.bicep
index d588ccc92d..b02b328b58 100644
--- a/infrastructure/templates/public-api/components/postgresqlDatabase.bicep
+++ b/infrastructure/templates/public-api/components/postgresqlDatabase.bicep
@@ -144,7 +144,7 @@ resource adminRoleAssignments 'Microsoft.DBforPostgreSQL/flexibleServers/adminis
   ]
 }]
 
-module databaseAliveAlert 'alerts/flexibleServers/databaseAlive.bicep' = if (alerts != null && alerts!.availability) {
+module databaseAliveAlert 'alerts/postgreSqlFlexibleServers/databaseAlive.bicep' = if (alerts != null && alerts!.availability) {
   name: '${databaseServerName}DbAliveDeploy'
   params: {
     resourceNames: [databaseServerName]
@@ -153,7 +153,7 @@ module databaseAliveAlert 'alerts/flexibleServers/databaseAlive.bicep' = if (ale
   }
 }
 
-module queryTimeAlert 'alerts/flexibleServers/queryTimeAlert.bicep' = if (alerts != null && alerts!.queryTime) {
+module queryTimeAlert 'alerts/postgreSqlFlexibleServers/queryTimeAlert.bicep' = if (alerts != null && alerts!.queryTime) {
   name: '${databaseServerName}QueryTimeDeploy'
   params: {
     resourceNames: [databaseServerName]
@@ -162,7 +162,7 @@ module queryTimeAlert 'alerts/flexibleServers/queryTimeAlert.bicep' = if (alerts
   }
 }
 
-module transactionTimeAlert 'alerts/flexibleServers/transactionTimeAlert.bicep' = if (alerts != null && alerts!.transactionTime) {
+module transactionTimeAlert 'alerts/postgreSqlFlexibleServers/transactionTimeAlert.bicep' = if (alerts != null && alerts!.transactionTime) {
   name: '${databaseServerName}TransactionTimeDeploy'
   params: {
     resourceNames: [databaseServerName]