diff --git a/avm/res/azure-stack-hci/cluster/README.md b/avm/res/azure-stack-hci/cluster/README.md
index 65e5b42e42..ba38a69d15 100644
--- a/avm/res/azure-stack-hci/cluster/README.md
+++ b/avm/res/azure-stack-hci/cluster/README.md
@@ -603,7 +603,7 @@ An array of Network ATC Network Intent objects that define the Compute, Manageme
 | [`overrideQosPolicy`](#parameter-networkintentsoverrideqospolicy) | bool | Specify whether to override the qosPolicy property. Use false by default. |
 | [`overrideVirtualSwitchConfiguration`](#parameter-networkintentsoverridevirtualswitchconfiguration) | bool | Specify whether to override the virtualSwitchConfiguration property. Use false by default. |
 | [`qosPolicyOverrides`](#parameter-networkintentsqospolicyoverrides) | object | The qosPolicy overrides for the network intent. |
-| [`trafficType`](#parameter-networkintentstraffictype) | array | The traffic types for the network intent. Allowed values: "Compute", "Management", "Storage". |
+| [`trafficType`](#parameter-networkintentstraffictype) | array | The traffic types for the network intent. |
 | [`virtualSwitchConfigurationOverrides`](#parameter-networkintentsvirtualswitchconfigurationoverrides) | object | The virtualSwitchConfiguration overrides for the network intent. |
 
 ### Parameter: `networkIntents.adapter`
@@ -625,7 +625,7 @@ The adapter property overrides for the network intent.
 | Parameter | Type | Description |
 | :-- | :-- | :-- |
 | [`jumboPacket`](#parameter-networkintentsadapterpropertyoverridesjumbopacket) | string | The jumboPacket configuration for the network adapters. |
-| [`networkDirect`](#parameter-networkintentsadapterpropertyoverridesnetworkdirect) | string | The networkDirect configuration for the network adapters. Allowed values: "Enabled", "Disabled". |
+| [`networkDirect`](#parameter-networkintentsadapterpropertyoverridesnetworkdirect) | string | The networkDirect configuration for the network adapters. |
 | [`networkDirectTechnology`](#parameter-networkintentsadapterpropertyoverridesnetworkdirecttechnology) | string | The networkDirectTechnology configuration for the network adapters. Allowed values: "RoCEv2", "iWARP". |
 
 ### Parameter: `networkIntents.adapterPropertyOverrides.jumboPacket`
@@ -637,10 +637,17 @@ The jumboPacket configuration for the network adapters.
 
 ### Parameter: `networkIntents.adapterPropertyOverrides.networkDirect`
 
-The networkDirect configuration for the network adapters. Allowed values: "Enabled", "Disabled".
+The networkDirect configuration for the network adapters.
 
 - Required: Yes
 - Type: string
+- Allowed:
+  ```Bicep
+  [
+    'Disabled'
+    'Enabled'
+  ]
+  ```
 
 ### Parameter: `networkIntents.adapterPropertyOverrides.networkDirectTechnology`
 
@@ -715,10 +722,18 @@ Recommend 3.
 
 ### Parameter: `networkIntents.trafficType`
 
-The traffic types for the network intent. Allowed values: "Compute", "Management", "Storage".
+The traffic types for the network intent.
 
 - Required: Yes
 - Type: array
+- Allowed:
+  ```Bicep
+  [
+    'Compute'
+    'Management'
+    'Storage'
+  ]
+  ```
 
 ### Parameter: `networkIntents.virtualSwitchConfigurationOverrides`
 
@@ -731,22 +746,30 @@ The virtualSwitchConfiguration overrides for the network intent.
 
 | Parameter | Type | Description |
 | :-- | :-- | :-- |
-| [`enableIov`](#parameter-networkintentsvirtualswitchconfigurationoverridesenableiov) | string | The enableIov configuration for the network intent. Allowed values: "True", "False". |
-| [`loadBalancingAlgorithm`](#parameter-networkintentsvirtualswitchconfigurationoverridesloadbalancingalgorithm) | string | The loadBalancingAlgorithm configuration for the network intent. Allowed values: "Dynamic", "HyperVPort", "IPHash". |
+| [`enableIov`](#parameter-networkintentsvirtualswitchconfigurationoverridesenableiov) | bool | The enableIov configuration for the network intent |
+| [`loadBalancingAlgorithm`](#parameter-networkintentsvirtualswitchconfigurationoverridesloadbalancingalgorithm) | string | The loadBalancingAlgorithm configuration for the network intent. |
 
 ### Parameter: `networkIntents.virtualSwitchConfigurationOverrides.enableIov`
 
-The enableIov configuration for the network intent. Allowed values: "True", "False".
+The enableIov configuration for the network intent
 
 - Required: Yes
-- Type: string
+- Type: bool
 
 ### Parameter: `networkIntents.virtualSwitchConfigurationOverrides.loadBalancingAlgorithm`
 
-The loadBalancingAlgorithm configuration for the network intent. Allowed values: "Dynamic", "HyperVPort", "IPHash".
+The loadBalancingAlgorithm configuration for the network intent.
 
 - Required: Yes
 - Type: string
+- Allowed:
+  ```Bicep
+  [
+    'Dynamic'
+    'HyperVPort'
+    'IPHash'
+  ]
+  ```
 
 ### Parameter: `startingIPAddress`
 
diff --git a/avm/res/azure-stack-hci/cluster/main.json b/avm/res/azure-stack-hci/cluster/main.json
index 1f8e1f82be..6a7cc340d2 100644
--- a/avm/res/azure-stack-hci/cluster/main.json
+++ b/avm/res/azure-stack-hci/cluster/main.json
@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.29.47.4906",
-      "templateHash": "13299255301563208667"
+      "templateHash": "10344293108601439009"
     },
     "name": "Azure Stack HCI Cluster",
     "description": "This module deploys an Azure Stack HCI Cluster on the provided Arc Machines.",
@@ -48,8 +48,12 @@
             },
             "networkDirect": {
               "type": "string",
+              "allowedValues": [
+                "Disabled",
+                "Enabled"
+              ],
               "metadata": {
-                "description": "Required. The networkDirect configuration for the network adapters. Allowed values: \"Enabled\", \"Disabled\"."
+                "description": "Required. The networkDirect configuration for the network adapters."
               }
             },
             "networkDirectTechnology": {
@@ -105,15 +109,20 @@
           "type": "object",
           "properties": {
             "enableIov": {
-              "type": "string",
+              "type": "bool",
               "metadata": {
-                "description": "Required. The enableIov configuration for the network intent. Allowed values: \"True\", \"False\"."
+                "description": "Required. The enableIov configuration for the network intent"
               }
             },
             "loadBalancingAlgorithm": {
               "type": "string",
+              "allowedValues": [
+                "Dynamic",
+                "HyperVPort",
+                "IPHash"
+              ],
               "metadata": {
-                "description": "Required. The loadBalancingAlgorithm configuration for the network intent. Allowed values: \"Dynamic\", \"HyperVPort\", \"IPHash\"."
+                "description": "Required. The loadBalancingAlgorithm configuration for the network intent."
               }
             }
           },
@@ -123,13 +132,18 @@
         },
         "trafficType": {
           "type": "array",
-          "items": {
-            "type": "string"
-          },
+          "allowedValues": [
+            "Compute",
+            "Management",
+            "Storage"
+          ],
           "metadata": {
-            "description": "Required. The traffic types for the network intent. Allowed values: \"Compute\", \"Management\", \"Storage\"."
+            "description": "Required. The traffic types for the network intent."
           }
         }
+      },
+      "metadata": {
+        "__bicep_export!": true
       }
     },
     "storageAdapterIPInfoType": {
@@ -153,6 +167,9 @@
             "description": "Required. The subnet mask for the storage adapter."
           }
         }
+      },
+      "metadata": {
+        "__bicep_export!": true
       }
     },
     "storageNetworksType": {
@@ -180,12 +197,18 @@
             "description": "Optional. The storage adapter IP information for 3-node switchless or manual config deployments."
           }
         }
+      },
+      "metadata": {
+        "__bicep_export!": true
       }
     },
     "storageNetworksArrayType": {
       "type": "array",
       "items": {
         "$ref": "#/definitions/storageNetworksType"
+      },
+      "metadata": {
+        "__bicep_export!": true
       }
     },
     "securityConfigurationType": {
@@ -251,6 +274,9 @@
             "description": "Required. Enable/Disable WDAC enforcement."
           }
         }
+      },
+      "metadata": {
+        "__bicep_export!": true
       }
     },
     "roleAssignmentType": {
@@ -324,7 +350,10 @@
           }
         }
       },
-      "nullable": true
+      "nullable": true,
+      "metadata": {
+        "__bicep_export!": true
+      }
     }
   },
   "parameters": {