diff --git a/frontend/src/routes/Infrastructure/Clusters/ManagedClusters/CreateCluster/components/assisted-installer/hypershift/HostsForm.tsx b/frontend/src/routes/Infrastructure/Clusters/ManagedClusters/CreateCluster/components/assisted-installer/hypershift/HostsForm.tsx
index 6741f8f38df..2e64a31652e 100644
--- a/frontend/src/routes/Infrastructure/Clusters/ManagedClusters/CreateCluster/components/assisted-installer/hypershift/HostsForm.tsx
+++ b/frontend/src/routes/Infrastructure/Clusters/ManagedClusters/CreateCluster/components/assisted-installer/hypershift/HostsForm.tsx
@@ -33,6 +33,8 @@ const HostsForm: React.FC<HostsFormProps> = ({ control, handleChange }) => {
     setInfraEnvNamespace,
     controllerAvailabilityPolicy,
     setControllerAvailabilityPolicy,
+    infrastructureAvailabilityPolicy,
+    setInfrastructureAvailabilityPolicy,
   } = React.useContext(HypershiftAgentContext)
   const { agentsState, clusterImageSetsState, infraEnvironmentsState, nodePoolsState } = useSharedAtoms()
   const { waitForAll } = useSharedRecoil()
@@ -52,6 +54,7 @@ const HostsForm: React.FC<HostsFormProps> = ({ control, handleChange }) => {
       setNodePools(values.nodePools)
       setInfraEnvNamespace(values.agentNamespace)
       setControllerAvailabilityPolicy(values.controllerAvailabilityPolicy)
+      setInfrastructureAvailabilityPolicy(values.infrastructureAvailabilityPolicy)
       handleChange(control)
     }
     // eslint-disable-next-line
@@ -92,6 +95,7 @@ const HostsForm: React.FC<HostsFormProps> = ({ control, handleChange }) => {
       initNodePools={nodePools}
       nodePools={currentNodePools}
       controllerAvailabilityPolicy={controllerAvailabilityPolicy}
+      infrastructureAvailabilityPolicy={infrastructureAvailabilityPolicy}
     />
   ) : (
     <LoadingState />
diff --git a/frontend/src/routes/Infrastructure/Clusters/ManagedClusters/CreateCluster/components/assisted-installer/hypershift/HypershiftAgentContext.tsx b/frontend/src/routes/Infrastructure/Clusters/ManagedClusters/CreateCluster/components/assisted-installer/hypershift/HypershiftAgentContext.tsx
index e88228f80dd..7ece56affb0 100644
--- a/frontend/src/routes/Infrastructure/Clusters/ManagedClusters/CreateCluster/components/assisted-installer/hypershift/HypershiftAgentContext.tsx
+++ b/frontend/src/routes/Infrastructure/Clusters/ManagedClusters/CreateCluster/components/assisted-installer/hypershift/HypershiftAgentContext.tsx
@@ -18,6 +18,8 @@ export type NodePoolFormValue = {
 export type HypershiftAgentContextType = {
   controllerAvailabilityPolicy: string
   setControllerAvailabilityPolicy: (policy: string) => void
+  infrastructureAvailabilityPolicy: string
+  setInfrastructureAvailabilityPolicy: (policy: string) => void
   nodePools?: NodePoolFormValue[]
   setNodePools: (nodePools: any) => void
   isAdvancedNetworking: boolean
@@ -35,6 +37,8 @@ export type HypershiftAgentContextType = {
 export const HypershiftAgentContext = React.createContext<HypershiftAgentContextType>({
   controllerAvailabilityPolicy: '',
   setControllerAvailabilityPolicy: noop,
+  infrastructureAvailabilityPolicy: '',
+  setInfrastructureAvailabilityPolicy: noop,
   nodePools: [],
   setNodePools: noop,
   isAdvancedNetworking: false,
@@ -57,10 +61,13 @@ export const useHypershiftContextValues = (): HypershiftAgentContextType => {
   const [infraEnvNamespace, setInfraEnvNamespace] = React.useState('')
   const [sshPublicKey, setSshPublicKey] = React.useState('')
   const [controllerAvailabilityPolicy, setControllerAvailabilityPolicy] = React.useState('')
+  const [infrastructureAvailabilityPolicy, setInfrastructureAvailabilityPolicy] = React.useState('')
 
   return {
     controllerAvailabilityPolicy,
     setControllerAvailabilityPolicy,
+    infrastructureAvailabilityPolicy,
+    setInfrastructureAvailabilityPolicy,
     nodePools,
     setNodePools,
     isAdvancedNetworking,
diff --git a/frontend/src/routes/Infrastructure/Clusters/ManagedClusters/CreateCluster/templates/assisted-installer/hypershift-template.hbs b/frontend/src/routes/Infrastructure/Clusters/ManagedClusters/CreateCluster/templates/assisted-installer/hypershift-template.hbs
index 1a8641c85a2..578ffcf3d12 100644
--- a/frontend/src/routes/Infrastructure/Clusters/ManagedClusters/CreateCluster/templates/assisted-installer/hypershift-template.hbs
+++ b/frontend/src/routes/Infrastructure/Clusters/ManagedClusters/CreateCluster/templates/assisted-installer/hypershift-template.hbs
@@ -42,6 +42,9 @@ spec:
   {{#if hypershift-hosts.controllerAvailabilityPolicy}}
   controllerAvailabilityPolicy: {{{hypershift-hosts.controllerAvailabilityPolicy}}}
   {{/if}}
+  {{#if hypershift-hosts.infrastructureAvailabilityPolicy}}
+  infrastructureAvailabilityPolicy: {{{hypershift-hosts.infrastructureAvailabilityPolicy}}}
+  {{/if}}
   platform:
     type: Agent
     agent: