diff --git a/charts/cluster-templates/questions.yaml b/charts/cluster-templates/questions.yaml
index ff394f3..3cf6b5a 100644
--- a/charts/cluster-templates/questions.yaml
+++ b/charts/cluster-templates/questions.yaml
@@ -1,561 +1,561 @@
-questions:
-  - variable: cluster.name
-    default: mycluster
-    description: 'Specify the name of the cluster'
-    label: 'Cluster Name'
-    required: true
-    type: string
-    group: 'General'
-  - variable: cloudCredentialSecretName
-    default:
-    description: 'CloudCredentialName for provisioning cluster'
-    label: 'CloudCredential Name'
-    type: cloudcredential
-    group: 'General'
-  - variable: cloudprovider
-    default: custom
-    description: 'Specify Infrastructure provider for underlying nodes'
-    label: 'Infrastructure Provider'
-    type: enum
-    required: true
-    options:
-      - amazonec2
-      - azure
-      - digitalocean
-      - elemental
-      - harvester
-      - vsphere
-      - custom
-    group: 'General'
-  - variable: kubernetesVersion
-    default: v1.30.8+rke2r1
-    description: 'Specify Kubernetes Version'
-    label: 'Kubernetes Version'
-    type: enum
-    required: true
-    options:
-      - v1.30.8+rke2r1
-      - v1.29.12+rke2r1
-      - v1.28.15+rke2r1
-    group: 'General'
-  - variable: localClusterAuthEndpoint.enabled
-    default: false
-    label: 'Local Auth Access Endpoint'
-    description: 'Enable Local Auth Access Endpoint'
-    type: boolean
-    group: 'Auth Access Endpoint'
-    show_subquestion_if: true
-    subquestions:
-      - variable: localClusterAuthEndpoint.fqdn
-        default:
-        description: 'Local Auth Access Endpoint FQDN'
-        label: 'Auth Endpoint FQDN'
-        type: hostname
-        group: 'Auth Access Endpoint'
-      - variable: localClusterAuthEndpoint.caCerts
-        default:
-        label: 'Auth Endpoint Cacerts'
-        description: 'Local Auth Access Endpoint CACerts'
-        type: multiline
-        group: 'Auth Access Endpoint'
-  - variable: addons.monitoring.enabled
-    default: false
-    label: 'Enable Monitoring'
-    description: 'Enable Rancher Monitoring'
-    type: boolean
-    group: 'Monitoring'
-    show_subquestion_if: true
-    subquestions:
-      - variable: monitoring.version
-        default:
-        label: 'Monitoring Version'
-        description: 'Choose chart version of monitoring. If empty latest version will be installed'
-        type: string
-        group: 'Monitoring'
-      - variable: monitoring.values
-        default:
-        label: 'Monitoring Values'
-        description: 'Custom monitoring chart values'
-        type: multiline
-        group: 'Monitoring'
-  - variable: nodepools.0.name
-    default:
-    description: 'Specify nodepool name'
-    type: string
-    label: 'Nodepool name'
-    required: true
-    show_if: cloudprovider=amazonec2 || cloudprovider=vsphere || cloudprovider=azure || cloudprovider=digitalocean || cloudprovider=harvester || cloudprovider=elemental
-    group: 'Nodepools'
-  - variable: nodepools.0.quantity
-    default: 1
-    description: 'Specify node count'
-    type: int
-    required: true
-    show_if: cloudprovider=amazonec2 || cloudprovider=vsphere || cloudprovider=azure || cloudprovider=digitalocean || cloudprovider=harvester || cloudprovider=elemental
-    label: 'Node count'
-    group: 'Nodepools'
-  - variable: nodepools.0.etcd
-    default: true
-    label: etcd
-    type: boolean
-    show_if: cloudprovider=amazonec2 || cloudprovider=vsphere || cloudprovider=azure || cloudprovider=digitalocean || cloudprovider=harvester || cloudprovider=elemental
-    group: 'Nodepools'
-  - variable: nodepools.0.worker
-    default: true
-    label: worker
-    type: boolean
-    show_if: cloudprovider=amazonec2 || cloudprovider=vsphere || cloudprovider=azure || cloudprovider=digitalocean || cloudprovider=harvester || cloudprovider=elemental
-    group: 'Nodepools'
-  - variable: nodepools.0.controlplane
-    label: controlplane
-    default: true
-    type: boolean
-    show_if: cloudprovider=amazonec2 || cloudprovider=vsphere || cloudprovider=azure || cloudprovider=digitalocean || cloudprovider=harvester || cloudprovider=elemental
-    group: 'Nodepools'
-  # amazonec2
-  - variable: nodepools.0.region
-    label: 'Region'
-    default: us-east-1
-    type: string
-    description: 'AWS EC2 Region'
-    required: true
-    show_if: cloudprovider=amazonec2
-    group: 'Nodepools'
-  - variable: nodepools.0.zone
-    label: 'Zone'
-    default: a
-    type: string
-    description: 'AWS EC2 Zone'
-    required: true
-    show_if: cloudprovider=amazonec2
-    group: 'Nodepools'
-  - variable: nodepools.0.instanceType
-    label: 'Instance Type'
-    default: t3a.medium
-    type: string
-    description: 'AWS instance type'
-    required: true
-    show_if: cloudprovider=amazonec2
-    group: 'Nodepools'
-  - variable: nodepools.0.rootSize
-    label: 'Root Disk Size'
-    default: 16g
-    type: string
-    description: 'AWS EC2 root disk size'
-    show_if: cloudprovider=amazonec2
-    group: 'Nodepools'
-  - variable: nodepools.0.vpcId
-    label: 'VPC/SUBNET'
-    default: ''
-    type: string
-    description: 'AWS EC2 vpc ID'
-    required: true
-    show_if: cloudprovider=amazonec2
-    group: 'Nodepools'
-  - variable: nodepools.0.iamInstanceProfile
-    label: 'Instance Profile Name'
-    default: ''
-    type: string
-    description: 'AWS EC2 Instance Profile Name'
-    show_if: cloudprovider=amazonec2
-    group: 'Nodepools'
-  - variable: nodepools.0.ami
-    label: 'AMI ID'
-    default: ''
-    type: string
-    description: 'AWS EC2 AMI ID'
-    show_if: cloudprovider=amazonec2
-    group: 'Nodepools'
-  - variable: nodepools.0.sshUser
-    label: 'SSH Username for AMI'
-    default: ubuntu
-    type: string
-    description: 'AWS EC2 SSH Username for AMI'
-    show_if: cloudprovider=amazonec2
-    group: 'Nodepools'
-  - variable: nodepools.0.createSecurityGroup
-    label: 'Create security group'
-    default: true
-    type: boolean
-    description: 'Whether to create `rancher-node` security group. If false, can provide with existing security group'
-    show_if: cloudprovider=amazonec2
-    group: 'Nodepools'
-    show_subquestion_if: false
-    subquestions:
-      - variable: nodepools.0.securityGroups
-        label: 'Security groups'
-        default:
-        type: string
-        description: 'Using existing security groups'
-        group: 'Nodepools'
-  # vsphere
-  - variable: nodepools.0.vcenter
-    label: 'vSphere IP/hostname'
-    default: ''
-    type: hostname
-    description: 'vSphere IP/hostname for vCenter'
-    required: true
-    show_if: cloudprovider=vsphere
-    group: 'Nodepools'
-  - variable: nodepools.0.datacenter
-    label: 'Vsphere Datacenter'
-    default: ''
-    type: hostname
-    description: 'vSphere datacenter for virtual machine'
-    required: true
-    show_if: cloudprovider=vsphere
-    group: 'Nodepools'
-  - variable: nodepools.0.datastore
-    label: 'Vsphere Datastore'
-    default: ''
-    type: string
-    description: 'vSphere datastore for virtual machine'
-    required: true
-    show_if: cloudprovider=vsphere
-    group: 'Nodepools'
-  - variable: nodepools.0.datastoreCluster
-    label: 'Vsphere DatastoreCluster'
-    default: ''
-    type: string
-    description: 'vSphere datastore cluster for virtual machine'
-    required: true
-    show_if: cloudprovider=vsphere
-    group: 'Nodepools'
-  - variable: nodepools.0.diskSize
-    label: 'Disk Size'
-    default: '20480'
-    type: string
-    description: 'vSphere size of disk for docker VM (in MB)'
-    show_if: cloudprovider=vsphere
-    group: 'Nodepools'
-  - variable: nodepools.0.memorySize
-    label: 'Memory Size'
-    default: '2048'
-    type: string
-    description: 'vSphere size of memory for docker VM (in MB)'
-    show_if: cloudprovider=vsphere
-    group: 'Nodepools'
-  - variable: nodepools.0.network
-    label: 'Network'
-    default: ''
-    type: string
-    description: 'vSphere network where the virtual machine will be attached'
-    show_if: cloudprovider=vsphere
-    group: 'Nodepools'
-  - variable: nodepools.0.pool
-    label: 'Resource Pool'
-    default: ''
-    type: string
-    description: 'vSphere resource pool for docker VM'
-    show_if: cloudprovider=vsphere
-    group: 'Nodepools'
-  - variable: nodepools.0.sshPort
-    label: 'SSH Port'
-    default: '22'
-    type: string
-    description: 'If using a non-B2D image you can specify the ssh port'
-    show_if: cloudprovider=vsphere
-    group: 'Nodepools'
-  - variable: nodepools.0.sshUserGroup
-    label: 'SSH User Group'
-    default: docker:staff
-    type: hostname
-    description: "If using a non-B2D image the uploaded keys will need chown'ed, defaults to staff e.g. docker:staff"
-    show_if: cloudprovider=vsphere
-    group: 'Nodepools'
-  - variable: nodepools.0.vappIpallocationpolicy
-    label: 'IP allocation policy'
-    default: ''
-    type: enum
-    options:
-      - dhcp
-      - fixed
-      - transient
-      - fixedAllocated
-    description: "'vSphere vApp IP allocation policy. Supported values are: dhcp, fixed, transient and fixedAllocated'"
-    show_if: cloudprovider=vsphere
-    group: 'Nodepools'
-  - variable: nodepools.0.vappIpprotocol
-    label: 'IP protocol'
-    default: ''
-    type: enum
-    options:
-      - IPv4
-      - IPv6
-    description: "'vSphere vApp IP protocol for this deployment. Supported values are: IPv4 and IPv6'"
-    show_if: cloudprovider=vsphere
-    group: 'Nodepools'
-  # harvester
-  - variable: nodepools.0.diskSize
-    label: 'Disk Size'
-    default: 40
-    type: string
-    description: 'Size of virtual hard disk in GB'
-    show_if: cloudprovider=harvester
-    group: 'Nodepools'
-  - variable: nodepools.0.diskBus
-    label: 'Disk Bus Type'
-    default: string
-    type: virtio
-    description: 'harvester disk type'
-    show_if: cloudprovider=harvester
-    group: 'Nodepools'
-  - variable: nodepools.0.cpuCount
-    label: 'CPUs'
-    default: 2
-    type: string
-    description: 'number of CPUs for your VM'
-    show_if: cloudprovider=harvester
-    group: 'Nodepools'
-  - variable: nodepools.0.memorySize
-    label: 'Memory Size'
-    default: 4
-    type: string
-    description: 'Memory for VM in GB (available RAM)'
-    show_if: cloudprovider=harvester
-    group: 'Nodepools'
-  - variable: nodepools.0.networkName
-    label: 'Network'
-    default: default/network-name-1
-    type: string
-    description: 'Name of vlan network in harvester'
-    show_if: cloudprovider=harvester
-    group: 'Nodepools'
-  - variable: nodepools.0.imageName
-    label: 'Name of Image'
-    default: default/image-rand
-    type: string
-    description: 'Name of image in harvester'
-    show_if: cloudprovider=harvester
-    group: 'Nodepools'
-  - variable: nodepools.0.vmNamespace
-    label: 'vm Namespace'
-    default: default
-    type: string
-    description: 'namespace to deploy the VM to'
-    show_if: cloudprovider=harvester
-    group: 'Nodepools'
-  - variable: nodepools.0.sshUser
-    label: 'SSH User'
-    default: ubuntu
-    type: string
-    description: 'SSH username'
-    show_if: cloudprovider=harvester
-    group: 'Nodepools'
-  # digitalocean
-  - variable: nodepools.0.image
-    label: 'Image'
-    default: ubuntu-20-04-x64
-    type: string
-    description: 'Digital Ocean Image'
-    show_if: cloudprovider=digitalocean
-    group: 'Nodepools'
-  - variable: nodepools.0.backups
-    label: 'Backup'
-    default: false
-    type: boolean
-    description: 'enable backups for droplet'
-    show_if: cloudprovider=digitalocean
-    group: 'Nodepools'
-  - variable: nodepools.0.ipv6
-    label: 'IPv6'
-    default: false
-    type: boolean
-    description: 'enable ipv6 for droplet'
-    show_if: cloudprovider=digitalocean
-    group: 'Nodepools'
-  - variable: nodepools.0.monitoring
-    label: 'Monitoring'
-    default: false
-    type: boolean
-    description: 'enable monitoring for droplet'
-    show_if: cloudprovider=digitalocean
-    group: 'Nodepools'
-  - variable: nodepools.0.privateNetworking
-    label: 'Private Networking'
-    default: false
-    type: boolean
-    description: 'enable private networking for droplet'
-    show_if: cloudprovider=digitalocean
-    group: 'Nodepools'
-  - variable: nodepools.0.region
-    label: 'Region'
-    default: sfo3
-    type: string
-    description: 'Digital Ocean region'
-    show_if: cloudprovider=digitalocean
-    group: 'Nodepools'
-  - variable: nodepools.0.size
-    label: 'Size'
-    default: s-4vcpu-8gb
-    type: string
-    description: 'Digital Ocean size'
-    show_if: cloudprovider=digitalocean
-    group: 'Nodepools'
-  - variable: nodepools.0.userdata
-    label: 'Userdata'
-    default:
-    type: multiline
-    description: 'File contents for userdata'
-    show_if: cloudprovider=digitalocean
-    group: 'Nodepools'
-  - variable: nodepools.0.sshPort
-    label: 'SSH Port'
-    default: 22
-    type: string
-    description: 'SSH port'
-    show_if: cloudprovider=digitalocean
-    group: 'Nodepools'
-  - variable: nodepools.0.sshUser
-    label: 'SSH User'
-    default: root
-    type: string
-    description: 'SSH username'
-    show_if: cloudprovider=digitalocean
-    group: 'Nodepools'
-  # azure
-  - variable: nodepools.0.availabilitySet
-    label: 'Availability Set'
-    default: docker-machine
-    type: string
-    description: 'Azure Availability Set to place the virtual machine into'
-    show_if: cloudprovider=azure
-    group: 'Nodepools'
-  - variable: nodepools.0.diskSize
-    label: 'Disk Size'
-    default: ''
-    type: string
-    description: 'Disk size if using managed disk(Gib)'
-    show_if: cloudprovider=azure
-    group: 'Nodepools'
-  - variable: nodepools.0.dns
-    label: 'DNS'
-    default: ''
-    type: string
-    description: 'A unique DNS label for the public IP adddress'
-    show_if: cloudprovider=azure
-    group: 'Nodepools'
-  - variable: nodepools.0.environment
-    label: 'Environment'
-    default: AzurePublicCloud
-    type: enum
-    options:
-      - AzurePublicCloud
-      - AzureGermanCloud
-      - AzureChinaCloud
-      - AzureUSGovernmentCloud
-    description: 'Azure environment'
-    show_if: cloudprovider=azure
-    group: 'Nodepools'
-  - variable: nodepools.0.faultDomainCount
-    label: 'Fault Domain Count'
-    default: ''
-    type: string
-    description: 'Fault domain count to use for availability set'
-    show_if: cloudprovider=azure
-    group: 'Nodepools'
-  - variable: nodepools.0.image
-    label: 'Image'
-    default: canonical:UbuntuServer:18.04-LTS:latest
-    type: string
-    description: 'Azure virtual machine OS image'
-    show_if: cloudprovider=azure
-    group: 'Nodepools'
-  - variable: nodepools.0.location
-    label: 'Location'
-    default: westus
-    type: string
-    description: 'Azure region to create the virtual machine'
-    show_if: cloudprovider=azure
-    group: 'Nodepools'
-  - variable: nodepools.0.managedDisks
-    label: 'Managed Disks'
-    default: false
-    type: boolean
-    description: 'Configures VM and availability set for managed disks'
-    show_if: cloudprovider=azure
-    group: 'Nodepools'
-  - variable: nodepools.0.noPublicIp
-    label: 'No Public IP'
-    default: false
-    type: boolean
-    description: 'Do not create a public IP address for the machine'
-    show_if: cloudprovider=azure
-    group: 'Nodepools'
-  - variable: nodepools.0.privateIpAddress
-    label: 'Private IP Address'
-    default: ''
-    type: string
-    description: 'Specify a static private IP address for the machine'
-    show_if: cloudprovider=azure
-    group: 'Nodepools'
-  - variable: nodepools.0.resourceGroup
-    label: 'Resource Group'
-    default: docker-machine
-    type: string
-    description: 'Azure Resource Group name (will be created if missing)'
-    show_if: cloudprovider=azure
-    group: 'Nodepools'
-  - variable: nodepools.0.size
-    label: 'Size'
-    default: 'Standard_D2_v2'
-    type: string
-    description: 'Size for Azure Virtual Machine'
-    show_if: cloudprovider=azure
-    group: 'Nodepools'
-  - variable: nodepools.0.sshUser
-    label: 'SSH Username'
-    default: docker-user
-    type: string
-    description: 'Username for SSH login'
-    show_if: cloudprovider=azure
-    group: 'Nodepools'
-  - variable: nodepools.0.staticPublicIp
-    label: 'Static Public IP'
-    default: false
-    type: boolean
-    description: 'Assign a static public IP address to the machine'
-    show_if: cloudprovider=azure
-    group: 'Nodepools'
-  - variable: nodepools.0.storageType
-    label: 'Storage Account'
-    default: 'Standard_LRS'
-    type: string
-    description: 'Type of Storage Account to host the OS Disk for the machine'
-    show_if: cloudprovider=azure
-    group: 'Nodepools'
-  - variable: nodepools.0.subnet
-    label: 'Subnet'
-    default: docker-machine
-    type: string
-    description: 'Azure Subnet Name to be used within the Virtual Network'
-    show_if: cloudprovider=azure
-    group: 'Nodepools'
-  - variable: nodepools.0.subnetPrefix
-    label: 'Subnet Prefix'
-    default: '192.168.0.0/16'
-    type: string
-    description: 'Private CIDR block to be used for the new subnet, should comply RFC 1918'
-    show_if: cloudprovider=azure
-    group: 'Nodepools'
-  - variable: nodepools.0.updateDomainCount
-    label: 'Update Domain Count'
-    default: ''
-    type: string
-    description: 'Update domain count to use for availability set'
-    show_if: cloudprovider=azure
-    group: 'Nodepools'
-  - variable: nodepools.0.usePrivateIp
-    label: 'Use Private IP'
-    default: false
-    type: boolean
-    description: 'Azure Subnet Name to be used within the Virtual Network'
-    show_if: cloudprovider=azure
-    group: 'Nodepools'
-  - variable: nodepools.0.vnet
-    label: 'Vnet'
-    default: 'docker-machine-vnet'
-    type: string
-    description: 'Azure Virtual Network name to connect the virtual machine (in [resourcegroup:]name format)'
-    show_if: cloudprovider=azure
-    group: 'Nodepools'
+# questions:
+#   - variable: cluster.name
+#     default: mycluster
+#     description: 'Specify the name of the cluster'
+#     label: 'Cluster Name'
+#     required: true
+#     type: string
+#     group: 'General'
+#   - variable: cloudCredentialSecretName
+#     default:
+#     description: 'CloudCredentialName for provisioning cluster'
+#     label: 'CloudCredential Name'
+#     type: cloudcredential
+#     group: 'General'
+#   - variable: cloudprovider
+#     default: custom
+#     description: 'Specify Infrastructure provider for underlying nodes'
+#     label: 'Infrastructure Provider'
+#     type: enum
+#     required: true
+#     options:
+#       - amazonec2
+#       - azure
+#       - digitalocean
+#       - elemental
+#       - harvester
+#       - vsphere
+#       - custom
+#     group: 'General'
+#   - variable: kubernetesVersion
+#     default: v1.31.5+rke2r1
+#     description: 'Specify Kubernetes Version'
+#     label: 'Kubernetes Version'
+#     type: enum
+#     required: true
+#     options:
+#       - v1.31.5+rke2r1
+#       - v1.30.9+rke2r1
+#       - v1.29.13+rke2r1
+#     group: 'General'
+#   - variable: localClusterAuthEndpoint.enabled
+#     default: false
+#     label: 'Local Auth Access Endpoint'
+#     description: 'Enable Local Auth Access Endpoint'
+#     type: boolean
+#     group: 'Auth Access Endpoint'
+#     show_subquestion_if: true
+#     subquestions:
+#       - variable: localClusterAuthEndpoint.fqdn
+#         default:
+#         description: 'Local Auth Access Endpoint FQDN'
+#         label: 'Auth Endpoint FQDN'
+#         type: hostname
+#         group: 'Auth Access Endpoint'
+#       - variable: localClusterAuthEndpoint.caCerts
+#         default:
+#         label: 'Auth Endpoint Cacerts'
+#         description: 'Local Auth Access Endpoint CACerts'
+#         type: multiline
+#         group: 'Auth Access Endpoint'
+#   - variable: addons.monitoring.enabled
+#     default: false
+#     label: 'Enable Monitoring'
+#     description: 'Enable Rancher Monitoring'
+#     type: boolean
+#     group: 'Monitoring'
+#     show_subquestion_if: true
+#     subquestions:
+#       - variable: monitoring.version
+#         default:
+#         label: 'Monitoring Version'
+#         description: 'Choose chart version of monitoring. If empty latest version will be installed'
+#         type: string
+#         group: 'Monitoring'
+#       - variable: monitoring.values
+#         default:
+#         label: 'Monitoring Values'
+#         description: 'Custom monitoring chart values'
+#         type: multiline
+#         group: 'Monitoring'
+#   - variable: nodepools.0.name
+#     default:
+#     description: 'Specify nodepool name'
+#     type: string
+#     label: 'Nodepool name'
+#     required: true
+#     show_if: cloudprovider=amazonec2 || cloudprovider=vsphere || cloudprovider=azure || cloudprovider=digitalocean || cloudprovider=harvester || cloudprovider=elemental
+#     group: 'Nodepools'
+#   - variable: nodepools.0.quantity
+#     default: 1
+#     description: 'Specify node count'
+#     type: int
+#     required: true
+#     show_if: cloudprovider=amazonec2 || cloudprovider=vsphere || cloudprovider=azure || cloudprovider=digitalocean || cloudprovider=harvester || cloudprovider=elemental
+#     label: 'Node count'
+#     group: 'Nodepools'
+#   - variable: nodepools.0.etcd
+#     default: true
+#     label: etcd
+#     type: boolean
+#     show_if: cloudprovider=amazonec2 || cloudprovider=vsphere || cloudprovider=azure || cloudprovider=digitalocean || cloudprovider=harvester || cloudprovider=elemental
+#     group: 'Nodepools'
+#   - variable: nodepools.0.worker
+#     default: true
+#     label: worker
+#     type: boolean
+#     show_if: cloudprovider=amazonec2 || cloudprovider=vsphere || cloudprovider=azure || cloudprovider=digitalocean || cloudprovider=harvester || cloudprovider=elemental
+#     group: 'Nodepools'
+#   - variable: nodepools.0.controlplane
+#     label: controlplane
+#     default: true
+#     type: boolean
+#     show_if: cloudprovider=amazonec2 || cloudprovider=vsphere || cloudprovider=azure || cloudprovider=digitalocean || cloudprovider=harvester || cloudprovider=elemental
+#     group: 'Nodepools'
+#   # amazonec2
+#   - variable: nodepools.0.region
+#     label: 'Region'
+#     default: us-east-1
+#     type: string
+#     description: 'AWS EC2 Region'
+#     required: true
+#     show_if: cloudprovider=amazonec2
+#     group: 'Nodepools'
+#   - variable: nodepools.0.zone
+#     label: 'Zone'
+#     default: a
+#     type: string
+#     description: 'AWS EC2 Zone'
+#     required: true
+#     show_if: cloudprovider=amazonec2
+#     group: 'Nodepools'
+#   - variable: nodepools.0.instanceType
+#     label: 'Instance Type'
+#     default: t3a.medium
+#     type: string
+#     description: 'AWS instance type'
+#     required: true
+#     show_if: cloudprovider=amazonec2
+#     group: 'Nodepools'
+#   - variable: nodepools.0.rootSize
+#     label: 'Root Disk Size'
+#     default: 16g
+#     type: string
+#     description: 'AWS EC2 root disk size'
+#     show_if: cloudprovider=amazonec2
+#     group: 'Nodepools'
+#   - variable: nodepools.0.vpcId
+#     label: 'VPC/SUBNET'
+#     default: ''
+#     type: string
+#     description: 'AWS EC2 vpc ID'
+#     required: true
+#     show_if: cloudprovider=amazonec2
+#     group: 'Nodepools'
+#   - variable: nodepools.0.iamInstanceProfile
+#     label: 'Instance Profile Name'
+#     default: ''
+#     type: string
+#     description: 'AWS EC2 Instance Profile Name'
+#     show_if: cloudprovider=amazonec2
+#     group: 'Nodepools'
+#   - variable: nodepools.0.ami
+#     label: 'AMI ID'
+#     default: ''
+#     type: string
+#     description: 'AWS EC2 AMI ID'
+#     show_if: cloudprovider=amazonec2
+#     group: 'Nodepools'
+#   - variable: nodepools.0.sshUser
+#     label: 'SSH Username for AMI'
+#     default: ubuntu
+#     type: string
+#     description: 'AWS EC2 SSH Username for AMI'
+#     show_if: cloudprovider=amazonec2
+#     group: 'Nodepools'
+#   - variable: nodepools.0.createSecurityGroup
+#     label: 'Create security group'
+#     default: true
+#     type: boolean
+#     description: 'Whether to create `rancher-node` security group. If false, can provide with existing security group'
+#     show_if: cloudprovider=amazonec2
+#     group: 'Nodepools'
+#     show_subquestion_if: false
+#     subquestions:
+#       - variable: nodepools.0.securityGroups
+#         label: 'Security groups'
+#         default:
+#         type: string
+#         description: 'Using existing security groups'
+#         group: 'Nodepools'
+#   # vsphere
+#   - variable: nodepools.0.vcenter
+#     label: 'vSphere IP/hostname'
+#     default: ''
+#     type: hostname
+#     description: 'vSphere IP/hostname for vCenter'
+#     required: true
+#     show_if: cloudprovider=vsphere
+#     group: 'Nodepools'
+#   - variable: nodepools.0.datacenter
+#     label: 'Vsphere Datacenter'
+#     default: ''
+#     type: hostname
+#     description: 'vSphere datacenter for virtual machine'
+#     required: true
+#     show_if: cloudprovider=vsphere
+#     group: 'Nodepools'
+#   - variable: nodepools.0.datastore
+#     label: 'Vsphere Datastore'
+#     default: ''
+#     type: string
+#     description: 'vSphere datastore for virtual machine'
+#     required: true
+#     show_if: cloudprovider=vsphere
+#     group: 'Nodepools'
+#   - variable: nodepools.0.datastoreCluster
+#     label: 'Vsphere DatastoreCluster'
+#     default: ''
+#     type: string
+#     description: 'vSphere datastore cluster for virtual machine'
+#     required: true
+#     show_if: cloudprovider=vsphere
+#     group: 'Nodepools'
+#   - variable: nodepools.0.diskSize
+#     label: 'Disk Size'
+#     default: '20480'
+#     type: string
+#     description: 'vSphere size of disk for docker VM (in MB)'
+#     show_if: cloudprovider=vsphere
+#     group: 'Nodepools'
+#   - variable: nodepools.0.memorySize
+#     label: 'Memory Size'
+#     default: '2048'
+#     type: string
+#     description: 'vSphere size of memory for docker VM (in MB)'
+#     show_if: cloudprovider=vsphere
+#     group: 'Nodepools'
+#   - variable: nodepools.0.network
+#     label: 'Network'
+#     default: ''
+#     type: string
+#     description: 'vSphere network where the virtual machine will be attached'
+#     show_if: cloudprovider=vsphere
+#     group: 'Nodepools'
+#   - variable: nodepools.0.pool
+#     label: 'Resource Pool'
+#     default: ''
+#     type: string
+#     description: 'vSphere resource pool for docker VM'
+#     show_if: cloudprovider=vsphere
+#     group: 'Nodepools'
+#   - variable: nodepools.0.sshPort
+#     label: 'SSH Port'
+#     default: '22'
+#     type: string
+#     description: 'If using a non-B2D image you can specify the ssh port'
+#     show_if: cloudprovider=vsphere
+#     group: 'Nodepools'
+#   - variable: nodepools.0.sshUserGroup
+#     label: 'SSH User Group'
+#     default: docker:staff
+#     type: hostname
+#     description: "If using a non-B2D image the uploaded keys will need chown'ed, defaults to staff e.g. docker:staff"
+#     show_if: cloudprovider=vsphere
+#     group: 'Nodepools'
+#   - variable: nodepools.0.vappIpallocationpolicy
+#     label: 'IP allocation policy'
+#     default: ''
+#     type: enum
+#     options:
+#       - dhcp
+#       - fixed
+#       - transient
+#       - fixedAllocated
+#     description: "'vSphere vApp IP allocation policy. Supported values are: dhcp, fixed, transient and fixedAllocated'"
+#     show_if: cloudprovider=vsphere
+#     group: 'Nodepools'
+#   - variable: nodepools.0.vappIpprotocol
+#     label: 'IP protocol'
+#     default: ''
+#     type: enum
+#     options:
+#       - IPv4
+#       - IPv6
+#     description: "'vSphere vApp IP protocol for this deployment. Supported values are: IPv4 and IPv6'"
+#     show_if: cloudprovider=vsphere
+#     group: 'Nodepools'
+#   # harvester
+#   - variable: nodepools.0.diskSize
+#     label: 'Disk Size'
+#     default: 40
+#     type: string
+#     description: 'Size of virtual hard disk in GB'
+#     show_if: cloudprovider=harvester
+#     group: 'Nodepools'
+#   - variable: nodepools.0.diskBus
+#     label: 'Disk Bus Type'
+#     default: string
+#     type: virtio
+#     description: 'harvester disk type'
+#     show_if: cloudprovider=harvester
+#     group: 'Nodepools'
+#   - variable: nodepools.0.cpuCount
+#     label: 'CPUs'
+#     default: 2
+#     type: string
+#     description: 'number of CPUs for your VM'
+#     show_if: cloudprovider=harvester
+#     group: 'Nodepools'
+#   - variable: nodepools.0.memorySize
+#     label: 'Memory Size'
+#     default: 4
+#     type: string
+#     description: 'Memory for VM in GB (available RAM)'
+#     show_if: cloudprovider=harvester
+#     group: 'Nodepools'
+#   - variable: nodepools.0.networkName
+#     label: 'Network'
+#     default: default/network-name-1
+#     type: string
+#     description: 'Name of vlan network in harvester'
+#     show_if: cloudprovider=harvester
+#     group: 'Nodepools'
+#   - variable: nodepools.0.imageName
+#     label: 'Name of Image'
+#     default: default/image-rand
+#     type: string
+#     description: 'Name of image in harvester'
+#     show_if: cloudprovider=harvester
+#     group: 'Nodepools'
+#   - variable: nodepools.0.vmNamespace
+#     label: 'vm Namespace'
+#     default: default
+#     type: string
+#     description: 'namespace to deploy the VM to'
+#     show_if: cloudprovider=harvester
+#     group: 'Nodepools'
+#   - variable: nodepools.0.sshUser
+#     label: 'SSH User'
+#     default: ubuntu
+#     type: string
+#     description: 'SSH username'
+#     show_if: cloudprovider=harvester
+#     group: 'Nodepools'
+#   # digitalocean
+#   - variable: nodepools.0.image
+#     label: 'Image'
+#     default: ubuntu-20-04-x64
+#     type: string
+#     description: 'Digital Ocean Image'
+#     show_if: cloudprovider=digitalocean
+#     group: 'Nodepools'
+#   - variable: nodepools.0.backups
+#     label: 'Backup'
+#     default: false
+#     type: boolean
+#     description: 'enable backups for droplet'
+#     show_if: cloudprovider=digitalocean
+#     group: 'Nodepools'
+#   - variable: nodepools.0.ipv6
+#     label: 'IPv6'
+#     default: false
+#     type: boolean
+#     description: 'enable ipv6 for droplet'
+#     show_if: cloudprovider=digitalocean
+#     group: 'Nodepools'
+#   - variable: nodepools.0.monitoring
+#     label: 'Monitoring'
+#     default: false
+#     type: boolean
+#     description: 'enable monitoring for droplet'
+#     show_if: cloudprovider=digitalocean
+#     group: 'Nodepools'
+#   - variable: nodepools.0.privateNetworking
+#     label: 'Private Networking'
+#     default: false
+#     type: boolean
+#     description: 'enable private networking for droplet'
+#     show_if: cloudprovider=digitalocean
+#     group: 'Nodepools'
+#   - variable: nodepools.0.region
+#     label: 'Region'
+#     default: sfo3
+#     type: string
+#     description: 'Digital Ocean region'
+#     show_if: cloudprovider=digitalocean
+#     group: 'Nodepools'
+#   - variable: nodepools.0.size
+#     label: 'Size'
+#     default: s-4vcpu-8gb
+#     type: string
+#     description: 'Digital Ocean size'
+#     show_if: cloudprovider=digitalocean
+#     group: 'Nodepools'
+#   - variable: nodepools.0.userdata
+#     label: 'Userdata'
+#     default:
+#     type: multiline
+#     description: 'File contents for userdata'
+#     show_if: cloudprovider=digitalocean
+#     group: 'Nodepools'
+#   - variable: nodepools.0.sshPort
+#     label: 'SSH Port'
+#     default: 22
+#     type: string
+#     description: 'SSH port'
+#     show_if: cloudprovider=digitalocean
+#     group: 'Nodepools'
+#   - variable: nodepools.0.sshUser
+#     label: 'SSH User'
+#     default: root
+#     type: string
+#     description: 'SSH username'
+#     show_if: cloudprovider=digitalocean
+#     group: 'Nodepools'
+#   # azure
+#   - variable: nodepools.0.availabilitySet
+#     label: 'Availability Set'
+#     default: docker-machine
+#     type: string
+#     description: 'Azure Availability Set to place the virtual machine into'
+#     show_if: cloudprovider=azure
+#     group: 'Nodepools'
+#   - variable: nodepools.0.diskSize
+#     label: 'Disk Size'
+#     default: ''
+#     type: string
+#     description: 'Disk size if using managed disk(Gib)'
+#     show_if: cloudprovider=azure
+#     group: 'Nodepools'
+#   - variable: nodepools.0.dns
+#     label: 'DNS'
+#     default: ''
+#     type: string
+#     description: 'A unique DNS label for the public IP adddress'
+#     show_if: cloudprovider=azure
+#     group: 'Nodepools'
+#   - variable: nodepools.0.environment
+#     label: 'Environment'
+#     default: AzurePublicCloud
+#     type: enum
+#     options:
+#       - AzurePublicCloud
+#       - AzureGermanCloud
+#       - AzureChinaCloud
+#       - AzureUSGovernmentCloud
+#     description: 'Azure environment'
+#     show_if: cloudprovider=azure
+#     group: 'Nodepools'
+#   - variable: nodepools.0.faultDomainCount
+#     label: 'Fault Domain Count'
+#     default: ''
+#     type: string
+#     description: 'Fault domain count to use for availability set'
+#     show_if: cloudprovider=azure
+#     group: 'Nodepools'
+#   - variable: nodepools.0.image
+#     label: 'Image'
+#     default: canonical:UbuntuServer:18.04-LTS:latest
+#     type: string
+#     description: 'Azure virtual machine OS image'
+#     show_if: cloudprovider=azure
+#     group: 'Nodepools'
+#   - variable: nodepools.0.location
+#     label: 'Location'
+#     default: westus
+#     type: string
+#     description: 'Azure region to create the virtual machine'
+#     show_if: cloudprovider=azure
+#     group: 'Nodepools'
+#   - variable: nodepools.0.managedDisks
+#     label: 'Managed Disks'
+#     default: false
+#     type: boolean
+#     description: 'Configures VM and availability set for managed disks'
+#     show_if: cloudprovider=azure
+#     group: 'Nodepools'
+#   - variable: nodepools.0.noPublicIp
+#     label: 'No Public IP'
+#     default: false
+#     type: boolean
+#     description: 'Do not create a public IP address for the machine'
+#     show_if: cloudprovider=azure
+#     group: 'Nodepools'
+#   - variable: nodepools.0.privateIpAddress
+#     label: 'Private IP Address'
+#     default: ''
+#     type: string
+#     description: 'Specify a static private IP address for the machine'
+#     show_if: cloudprovider=azure
+#     group: 'Nodepools'
+#   - variable: nodepools.0.resourceGroup
+#     label: 'Resource Group'
+#     default: docker-machine
+#     type: string
+#     description: 'Azure Resource Group name (will be created if missing)'
+#     show_if: cloudprovider=azure
+#     group: 'Nodepools'
+#   - variable: nodepools.0.size
+#     label: 'Size'
+#     default: 'Standard_D2_v2'
+#     type: string
+#     description: 'Size for Azure Virtual Machine'
+#     show_if: cloudprovider=azure
+#     group: 'Nodepools'
+#   - variable: nodepools.0.sshUser
+#     label: 'SSH Username'
+#     default: docker-user
+#     type: string
+#     description: 'Username for SSH login'
+#     show_if: cloudprovider=azure
+#     group: 'Nodepools'
+#   - variable: nodepools.0.staticPublicIp
+#     label: 'Static Public IP'
+#     default: false
+#     type: boolean
+#     description: 'Assign a static public IP address to the machine'
+#     show_if: cloudprovider=azure
+#     group: 'Nodepools'
+#   - variable: nodepools.0.storageType
+#     label: 'Storage Account'
+#     default: 'Standard_LRS'
+#     type: string
+#     description: 'Type of Storage Account to host the OS Disk for the machine'
+#     show_if: cloudprovider=azure
+#     group: 'Nodepools'
+#   - variable: nodepools.0.subnet
+#     label: 'Subnet'
+#     default: docker-machine
+#     type: string
+#     description: 'Azure Subnet Name to be used within the Virtual Network'
+#     show_if: cloudprovider=azure
+#     group: 'Nodepools'
+#   - variable: nodepools.0.subnetPrefix
+#     label: 'Subnet Prefix'
+#     default: '192.168.0.0/16'
+#     type: string
+#     description: 'Private CIDR block to be used for the new subnet, should comply RFC 1918'
+#     show_if: cloudprovider=azure
+#     group: 'Nodepools'
+#   - variable: nodepools.0.updateDomainCount
+#     label: 'Update Domain Count'
+#     default: ''
+#     type: string
+#     description: 'Update domain count to use for availability set'
+#     show_if: cloudprovider=azure
+#     group: 'Nodepools'
+#   - variable: nodepools.0.usePrivateIp
+#     label: 'Use Private IP'
+#     default: false
+#     type: boolean
+#     description: 'Azure Subnet Name to be used within the Virtual Network'
+#     show_if: cloudprovider=azure
+#     group: 'Nodepools'
+#   - variable: nodepools.0.vnet
+#     label: 'Vnet'
+#     default: 'docker-machine-vnet'
+#     type: string
+#     description: 'Azure Virtual Network name to connect the virtual machine (in [resourcegroup:]name format)'
+#     show_if: cloudprovider=azure
+#     group: 'Nodepools'
diff --git a/charts/cluster-templates/values-aws.yaml b/charts/cluster-templates/values-aws.yaml
index 23b50ca..1dbe08a 100644
--- a/charts/cluster-templates/values-aws.yaml
+++ b/charts/cluster-templates/values-aws.yaml
@@ -14,13 +14,13 @@ rancher:
 
 # cluster values
 cluster:
-  # annotations:
-    # key: value
   # labels:
     # key: value
+  # annotations:
+    # key: value
   name: rke2-cluster-aws
   config:
-    kubernetesVersion: v1.30.8+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.31.5+rke2r1 # https://github.com/rancher/rke2/releases
     enableNetworkPolicy: true
     localClusterAuthEndpoint:
       enabled: false
diff --git a/charts/cluster-templates/values-custom.yaml b/charts/cluster-templates/values-custom.yaml
index b64fd8a..78e00b5 100644
--- a/charts/cluster-templates/values-custom.yaml
+++ b/charts/cluster-templates/values-custom.yaml
@@ -11,13 +11,13 @@ rancher:
 
 # cluster values
 cluster:
-  # annotations:
-    # key: value
   # labels:
     # key: value
+  # annotations:
+    # key: value
   name: rke2-cluster-custom
   config:
-    kubernetesVersion: v1.30.8+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.31.5+rke2r1 # https://github.com/rancher/rke2/releases
     enableNetworkPolicy: true
     localClusterAuthEndpoint:
       enabled: false
diff --git a/charts/cluster-templates/values-digitalocean.yaml b/charts/cluster-templates/values-digitalocean.yaml
index ccffa8d..0936e83 100644
--- a/charts/cluster-templates/values-digitalocean.yaml
+++ b/charts/cluster-templates/values-digitalocean.yaml
@@ -14,13 +14,13 @@ rancher:
 
 # cluster values
 cluster:
-  # annotations:
-    # key: value
   # labels:
     # key: value
+  # annotations:
+    # key: value
   name: rke2-cluster-digitalocean
   config:
-    kubernetesVersion: v1.30.8+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.31.5+rke2r1 # https://github.com/rancher/rke2/releases
     enableNetworkPolicy: true
     localClusterAuthEndpoint:
       enabled: false
diff --git a/charts/cluster-templates/values-elemental.yaml b/charts/cluster-templates/values-elemental.yaml
index 997f523..bc6c998 100644
--- a/charts/cluster-templates/values-elemental.yaml
+++ b/charts/cluster-templates/values-elemental.yaml
@@ -11,13 +11,13 @@ rancher:
 
 # cluster values
 cluster:
-  # annotations:
-    # key: value
   # labels:
     # key: value
+  # annotations:
+    # key: value
   name: rke2-cluster-elemental
   config:
-    kubernetesVersion: v1.30.8+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.31.5+rke2r1 # https://github.com/rancher/rke2/releases
     enableNetworkPolicy: true
     localClusterAuthEndpoint:
       enabled: false
diff --git a/charts/cluster-templates/values-harvester.yaml b/charts/cluster-templates/values-harvester.yaml
index 48cf67f..a42854e 100644
--- a/charts/cluster-templates/values-harvester.yaml
+++ b/charts/cluster-templates/values-harvester.yaml
@@ -14,13 +14,13 @@ rancher:
 
 # cluster values
 cluster:
-  # annotations:
-    # key: value
   # labels:
     # key: value
+  # annotations:
+    # key: value
   name: rke2-cluster-harvester
   config:
-    kubernetesVersion: v1.30.8+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.31.5+rke2r1 # https://github.com/rancher/rke2/releases
     enableNetworkPolicy: true
     localClusterAuthEndpoint:
       enabled: false
diff --git a/charts/cluster-templates/values-vsphere.yaml b/charts/cluster-templates/values-vsphere.yaml
index 09d47e3..468338e 100644
--- a/charts/cluster-templates/values-vsphere.yaml
+++ b/charts/cluster-templates/values-vsphere.yaml
@@ -18,13 +18,13 @@ vcenter:
 
 # cluster values
 cluster:
-  # annotations:
-    # key: value
   # labels:
     # key: value
+  # annotations:
+    # key: value
   name: rke2-cluster-vsphere
   config:
-    kubernetesVersion: v1.30.8+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.31.5+rke2r1 # https://github.com/rancher/rke2/releases
     enableNetworkPolicy: true
     localClusterAuthEndpoint:
       enabled: false
diff --git a/charts/cluster-templates/values.yaml b/charts/cluster-templates/values.yaml
index 9744de6..4a13628 100644
--- a/charts/cluster-templates/values.yaml
+++ b/charts/cluster-templates/values.yaml
@@ -14,13 +14,13 @@ rancher:
 
 # cluster values
 cluster:
-  # annotations:
-    # key: value
   # labels:
     # key: value
+  # annotations:
+    # key: value
   name: rke2-cluster
   config:
-    kubernetesVersion: v1.30.8+rke2r1 # https://github.com/rancher/rke2/releases
+    kubernetesVersion: v1.31.5+rke2r1 # https://github.com/rancher/rke2/releases
     enableNetworkPolicy: true
     localClusterAuthEndpoint:
       enabled: false