diff --git a/avm/res/key-vault/vault/README.md b/avm/res/key-vault/vault/README.md
index 880c933a5f..1155d01736 100644
--- a/avm/res/key-vault/vault/README.md
+++ b/avm/res/key-vault/vault/README.md
@@ -352,8 +352,10 @@ module vault 'br/public:avm/res/key-vault/vault:<version>' = {
     enableRbacAuthorization: false
     keys: [
       {
-        attributesExp: 1725109032
-        attributesNbf: 10000
+        attributes: {
+          exp: 1725109032
+          nbf: 10000
+        }
         name: 'keyName'
         roleAssignments: [
           {
@@ -495,8 +497,10 @@ module vault 'br/public:avm/res/key-vault/vault:<version>' = {
     ]
     secrets: [
       {
-        attributesExp: 1702648632
-        attributesNbf: 10000
+        attributes: {
+          exp: 1725109032
+          nbf: 10000
+        }
         contentType: 'Something'
         name: 'secretName'
         roleAssignments: [
@@ -608,8 +612,10 @@ module vault 'br/public:avm/res/key-vault/vault:<version>' = {
     "keys": {
       "value": [
         {
-          "attributesExp": 1725109032,
-          "attributesNbf": 10000,
+          "attributes": {
+            "exp": 1725109032,
+            "nbf": 10000
+          },
           "name": "keyName",
           "roleAssignments": [
             {
@@ -763,8 +769,10 @@ module vault 'br/public:avm/res/key-vault/vault:<version>' = {
     "secrets": {
       "value": [
         {
-          "attributesExp": 1702648632,
-          "attributesNbf": 10000,
+          "attributes": {
+            "exp": 1725109032,
+            "nbf": 10000
+          },
           "contentType": "Something",
           "name": "secretName",
           "roleAssignments": [
@@ -870,8 +878,10 @@ param enablePurgeProtection = false
 param enableRbacAuthorization = false
 param keys = [
   {
-    attributesExp: 1725109032
-    attributesNbf: 10000
+    attributes: {
+      exp: 1725109032
+      nbf: 10000
+    }
     name: 'keyName'
     roleAssignments: [
       {
@@ -1013,8 +1023,10 @@ param roleAssignments = [
 ]
 param secrets = [
   {
-    attributesExp: 1702648632
-    attributesNbf: 10000
+    attributes: {
+      exp: 1725109032
+      nbf: 10000
+    }
     contentType: 'Something'
     name: 'secretName'
     roleAssignments: [
diff --git a/avm/res/key-vault/vault/access-policy/main.json b/avm/res/key-vault/vault/access-policy/main.json
index ba6a0ab33f..fcfca42035 100644
--- a/avm/res/key-vault/vault/access-policy/main.json
+++ b/avm/res/key-vault/vault/access-policy/main.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.29.47.4906",
-      "templateHash": "7494731697751039419"
+      "version": "0.30.23.60470",
+      "templateHash": "15469258025112973480"
     },
     "name": "Key Vault Access Policies",
     "description": "This module deploys a Key Vault Access Policy.",
diff --git a/avm/res/key-vault/vault/key/main.json b/avm/res/key-vault/vault/key/main.json
index 6976827555..981d9bad38 100644
--- a/avm/res/key-vault/vault/key/main.json
+++ b/avm/res/key-vault/vault/key/main.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.30.3.12046",
-      "templateHash": "13039550242026782790"
+      "version": "0.30.23.60470",
+      "templateHash": "796741209006922272"
     },
     "name": "Key Vault Keys",
     "description": "This module deploys a Key Vault Key.",
diff --git a/avm/res/key-vault/vault/secret/main.json b/avm/res/key-vault/vault/secret/main.json
index b516966b2f..8564674f8e 100644
--- a/avm/res/key-vault/vault/secret/main.json
+++ b/avm/res/key-vault/vault/secret/main.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.29.47.4906",
-      "templateHash": "114626909766354577"
+      "version": "0.30.23.60470",
+      "templateHash": "10121697157844029321"
     },
     "name": "Key Vault Secrets",
     "description": "This module deploys a Key Vault Secret.",
diff --git a/avm/res/key-vault/vault/tests/e2e/max/main.test.bicep b/avm/res/key-vault/vault/tests/e2e/max/main.test.bicep
index 08693fdd86..c41f995bb5 100644
--- a/avm/res/key-vault/vault/tests/e2e/max/main.test.bicep
+++ b/avm/res/key-vault/vault/tests/e2e/max/main.test.bicep
@@ -123,8 +123,10 @@ module testDeployment '../../../main.bicep' = [
       enableRbacAuthorization: false
       keys: [
         {
-          attributesExp: 1725109032
-          attributesNbf: 10000
+          attributes: {
+            exp: 1725109032
+            nbf: 10000
+          }
           name: 'keyName'
           roleAssignments: [
             {
@@ -274,8 +276,10 @@ module testDeployment '../../../main.bicep' = [
       ]
       secrets: [
         {
-          attributesExp: 1702648632
-          attributesNbf: 10000
+          attributes: {
+            exp: 1725109032
+            nbf: 10000
+          }
           contentType: 'Something'
           name: 'secretName'
           roleAssignments: [