diff --git a/Environments/Todo-Mongo-AKS/main.bicep b/Environments/Todo-Mongo-AKS/main.bicep
index b8b500a..1055c0d 100644
--- a/Environments/Todo-Mongo-AKS/main.bicep
+++ b/Environments/Todo-Mongo-AKS/main.bicep
@@ -1,7 +1,4 @@
-@minLength(1)
-@maxLength(64)
-@description('Name of the the environment which is used to generate a short unique hash used in all resources.')
-param environmentName string
+
 
 @minLength(1)
 @description('Primary location for all resources')
@@ -17,7 +14,7 @@ param sharedAKSEnvironmentName string
 var sharedAKSResourceGroup = '${sharedAKSProjectName}-${sharedAKSEnvironmentName}'
 
 var abbrs = loadJsonContent('./abbreviations.json')
-var resourceToken = toLower(uniqueString(subscription().id, environmentName, location))
+var resourceToken = toLower(uniqueString(subscription().id, resourceGroup().id, location))
 
 // Store secrets in a keyvault
 module keyVault './core/security/keyvault.bicep' = {
@@ -25,7 +22,6 @@ module keyVault './core/security/keyvault.bicep' = {
   params: {
     name: !empty(keyVaultName) ? keyVaultName : '${abbrs.keyVaultVaults}${resourceToken}'
     location: location
-    tags: tags
     principalId: principalId
   }
 }
@@ -116,7 +112,6 @@ resource configStoreKeyValue2 'Microsoft.AppConfiguration/configurationStores/ke
   properties: {
     value: cosmos.outputs.databaseName
     contentType: contentType
-    tags: tags
   }
 }
 
@@ -126,7 +121,6 @@ resource configStoreKeyValue3 'Microsoft.AppConfiguration/configurationStores/ke
   properties: {
     value: keyVault.outputs.endpoint
     contentType: contentType
-    tags: tags
   }
 }