diff --git a/infra/main.bicep b/infra/main.bicep
index 57fe519d..7d27a8ba 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -943,7 +943,12 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.13.
           }
         ]
       : []
-    tags: allTags
+    tags: {
+      ...resourceGroup().tags
+      ...existingTags
+      ...allTags
+      ...tags
+    }
     enableTelemetry: enableTelemetry
   }
 }
diff --git a/infra/main.json b/infra/main.json
index c2042a41..3d77f0cd 100644
--- a/infra/main.json
+++ b/infra/main.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.42.1.51946",
-      "templateHash": "3984182123932774684"
+      "version": "0.43.8.12551",
+      "templateHash": "10586044166511921089"
     },
     "name": "Modernize Your Code Solution Accelerator",
     "description": "CSA CTO Gold Standard Solution Accelerator for Modernize Your Code. \r\n"
@@ -5095,8 +5095,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.42.1.51946",
-              "templateHash": "15922750226218572834"
+              "version": "0.43.8.12551",
+              "templateHash": "14487392921976794826"
             }
           },
           "definitions": {
@@ -13106,8 +13106,8 @@
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').agentSvc)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').storageBlob)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').ods)]",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').monitor)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').oms)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').monitor)]",
         "dataCollectionEndpoint",
         "logAnalyticsWorkspace",
         "virtualNetwork"
@@ -26170,8 +26170,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.42.1.51946",
-              "templateHash": "9292767591417947872"
+              "version": "0.43.8.12551",
+              "templateHash": "14906568425252680703"
             },
             "name": "AI Services and Project Module",
             "description": "This module creates an AI Services resource and an AI Foundry project within it. It supports private networking, OpenAI deployments, and role assignments."
@@ -27507,8 +27507,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.42.1.51946",
-                      "templateHash": "17679330702241672588"
+                      "version": "0.43.8.12551",
+                      "templateHash": "16530911718603724547"
                     }
                   },
                   "definitions": {
@@ -29243,8 +29243,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.42.1.51946",
-                              "templateHash": "12801288885438838277"
+                              "version": "0.43.8.12551",
+                              "templateHash": "6748139957584741236"
                             }
                           },
                           "definitions": {
@@ -29397,8 +29397,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.42.1.51946",
-                              "templateHash": "6439859910553532577"
+                              "version": "0.43.8.12551",
+                              "templateHash": "9014582203949799641"
                             }
                           },
                           "definitions": {
@@ -29615,8 +29615,8 @@
                   "metadata": {
                     "_generator": {
                       "name": "bicep",
-                      "version": "0.42.1.51946",
-                      "templateHash": "17679330702241672588"
+                      "version": "0.43.8.12551",
+                      "templateHash": "16530911718603724547"
                     }
                   },
                   "definitions": {
@@ -31351,8 +31351,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.42.1.51946",
-                              "templateHash": "12801288885438838277"
+                              "version": "0.43.8.12551",
+                              "templateHash": "6748139957584741236"
                             }
                           },
                           "definitions": {
@@ -31505,8 +31505,8 @@
                           "metadata": {
                             "_generator": {
                               "name": "bicep",
-                              "version": "0.42.1.51946",
-                              "templateHash": "6439859910553532577"
+                              "version": "0.43.8.12551",
+                              "templateHash": "9014582203949799641"
                             }
                           },
                           "definitions": {
@@ -32421,9 +32421,9 @@
       },
       "dependsOn": [
         "aiServices",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
         "virtualNetwork"
       ]
     },
@@ -32479,8 +32479,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.42.1.51946",
-              "templateHash": "3598447245043879538"
+              "version": "0.43.8.12551",
+              "templateHash": "12228537903958998388"
             }
           },
           "definitions": {
@@ -40938,8 +40938,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.42.1.51946",
-              "templateHash": "18406833646069425594"
+              "version": "0.43.8.12551",
+              "templateHash": "17453447807793095031"
             }
           },
           "definitions": {
@@ -44801,8 +44801,8 @@
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.42.1.51946",
-              "templateHash": "14534421541012182178"
+              "version": "0.43.8.12551",
+              "templateHash": "15722739321567421405"
             }
           },
           "definitions": {
@@ -51099,7 +51099,7 @@
           "appLogsConfiguration": "[if(parameters('enableMonitoring'), createObject('value', createObject('destination', 'log-analytics', 'logAnalyticsWorkspaceResourceId', if(variables('useExistingLogAnalytics'), parameters('existingLogAnalyticsWorkspaceId'), reference('logAnalyticsWorkspace').outputs.resourceId.value), 'logAnalyticsConfiguration', createObject('customerId', if(variables('useExistingLogAnalytics'), reference('existingLogAnalyticsWorkspace').customerId, reference('logAnalyticsWorkspace').outputs.logAnalyticsWorkspaceId.value), 'sharedKey', if(variables('useExistingLogAnalytics'), listKeys('existingLogAnalyticsWorkspace', '2025-07-01').primarySharedKey, listOutputsWithSecureValues('logAnalyticsWorkspace', '2025-04-01').primarySharedKey)))), createObject('value', null()))]",
           "workloadProfiles": "[if(parameters('enablePrivateNetworking'), createObject('value', createArray(createObject('name', 'Consumption', 'workloadProfileType', 'Consumption'))), createObject('value', createArray()))]",
           "tags": {
-            "value": "[variables('allTags')]"
+            "value": "[shallowMerge(createArray(resourceGroup().tags, variables('existingTags'), variables('allTags'), parameters('tags')))]"
           },
           "enableTelemetry": {
             "value": "[parameters('enableTelemetry')]"
diff --git a/infra/main.parameters.json b/infra/main.parameters.json
index 2d38a529..712bbee7 100644
--- a/infra/main.parameters.json
+++ b/infra/main.parameters.json
@@ -46,6 +46,9 @@
     },
     "vmAdminPassword": {
       "value": "${AZURE_ENV_VM_ADMIN_PASSWORD}"
-    }
+    },
+    "tags": {
+       "value": "${AZURE_ENV_TAGS}"
+      }
   }
 }
\ No newline at end of file
diff --git a/infra/main.waf.parameters.json b/infra/main.waf.parameters.json
index 7d9f2f32..f8671c42 100644
--- a/infra/main.waf.parameters.json
+++ b/infra/main.waf.parameters.json
@@ -55,6 +55,9 @@
     },
     "enableScalability": {
       "value": true
-    }
+    },
+    "tags": {
+       "value": "${AZURE_ENV_TAGS}"
+      }
   }
 }
\ No newline at end of file
diff --git a/infra/main_custom.bicep b/infra/main_custom.bicep
index 446c84ca..44abbec4 100644
--- a/infra/main_custom.bicep
+++ b/infra/main_custom.bicep
@@ -886,7 +886,12 @@ module containerAppsEnvironment 'br/public:avm/res/app/managed-environment:0.13.
           }
         ]
       : []
-    tags: allTags
+    tags: {
+      ...resourceGroup().tags
+      ...existingTags
+      ...allTags
+      ...tags
+    }
     enableTelemetry: enableTelemetry
   }
 }