diff --git a/infra/main.bicep b/infra/main.bicep
index 1fc9582c4..56589a8d2 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -165,6 +165,25 @@ var replicaLocation = replicaRegionPairs[location]
 // Resources      //
 // ============== //
 
+var deployerInfo = deployer()
+var allTags = union(
+  {
+    'azd-env-name': solutionName
+  },
+  tags
+)
+resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
+  name: 'default'
+  properties: {
+    tags: {
+      ...allTags
+      TemplateName: 'MACAE'
+      CreatedBy: split(deployerInfo.userPrincipalName, '@')[0] 
+    }
+  }
+}
+
+
 #disable-next-line no-deployments-resources
 resource avmTelemetry 'Microsoft.Resources/deployments@2024-03-01' = if (enableTelemetry) {
   name: '46d3xbcp.ptn.sa-multiagentcustauteng.${replace('-..--..-', '.', '-')}.${substring(uniqueString(deployment().name, location), 0, 4)}'