diff --git a/src/_nebari/constants.py b/src/_nebari/constants.py
index f30da0f870..bf38b5bf9f 100644
--- a/src/_nebari/constants.py
+++ b/src/_nebari/constants.py
@@ -9,7 +9,7 @@
 # 04-kubernetes-ingress
 DEFAULT_TRAEFIK_IMAGE_TAG = "2.9.1"
 
-HIGHEST_SUPPORTED_K8S_VERSION = ("1", "29", "2")
+HIGHEST_SUPPORTED_K8S_VERSION = ("1", "31")  # specify Major and Minor version
 DEFAULT_GKE_RELEASE_CHANNEL = "UNSPECIFIED"
 
 DEFAULT_NEBARI_DASK_VERSION = CURRENT_RELEASE
diff --git a/src/_nebari/provider/cloud/commons.py b/src/_nebari/provider/cloud/commons.py
index 566b2029a4..d2bed87c48 100644
--- a/src/_nebari/provider/cloud/commons.py
+++ b/src/_nebari/provider/cloud/commons.py
@@ -6,9 +6,7 @@
 def filter_by_highest_supported_k8s_version(k8s_versions_list):
     filtered_k8s_versions_list = []
     for k8s_version in k8s_versions_list:
-        version = tuple(
-            filter(None, re.search(r"(\d+)\.(\d+)(?:\.(\d+))?", k8s_version).groups())
-        )
+        version = tuple(filter(None, re.search(r"(\d+)\.(\d+)", k8s_version).groups()))
         if version <= HIGHEST_SUPPORTED_K8S_VERSION:
             filtered_k8s_versions_list.append(k8s_version)
     return filtered_k8s_versions_list
diff --git a/src/_nebari/stages/infrastructure/template/aws/modules/kubernetes/main.tf b/src/_nebari/stages/infrastructure/template/aws/modules/kubernetes/main.tf
index 1f3e688e68..2537b12dad 100644
--- a/src/_nebari/stages/infrastructure/template/aws/modules/kubernetes/main.tf
+++ b/src/_nebari/stages/infrastructure/template/aws/modules/kubernetes/main.tf
@@ -147,6 +147,9 @@ resource "aws_eks_addon" "aws-ebs-csi-driver" {
         "eks.amazonaws.com/nodegroup" = "general"
       }
     }
+    defaultStorageClass = {
+      enabled = true
+    }
   })
 
   # Ensure cluster and node groups are created
diff --git a/src/_nebari/stages/kubernetes_ingress/template/versions.tf b/src/_nebari/stages/kubernetes_ingress/template/versions.tf
index 341def1365..d1e5f8acfb 100644
--- a/src/_nebari/stages/kubernetes_ingress/template/versions.tf
+++ b/src/_nebari/stages/kubernetes_ingress/template/versions.tf
@@ -6,7 +6,7 @@ terraform {
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "2.20.0"
+      version = "2.35.1"
     }
   }
   required_version = ">= 1.0"
diff --git a/src/_nebari/stages/kubernetes_initialize/template/versions.tf b/src/_nebari/stages/kubernetes_initialize/template/versions.tf
index 341def1365..d1e5f8acfb 100644
--- a/src/_nebari/stages/kubernetes_initialize/template/versions.tf
+++ b/src/_nebari/stages/kubernetes_initialize/template/versions.tf
@@ -6,7 +6,7 @@ terraform {
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "2.20.0"
+      version = "2.35.1"
     }
   }
   required_version = ">= 1.0"
diff --git a/src/_nebari/stages/kubernetes_keycloak/template/versions.tf b/src/_nebari/stages/kubernetes_keycloak/template/versions.tf
index 341def1365..d1e5f8acfb 100644
--- a/src/_nebari/stages/kubernetes_keycloak/template/versions.tf
+++ b/src/_nebari/stages/kubernetes_keycloak/template/versions.tf
@@ -6,7 +6,7 @@ terraform {
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "2.20.0"
+      version = "2.35.1"
     }
   }
   required_version = ">= 1.0"
diff --git a/src/_nebari/stages/kubernetes_keycloak_configuration/template/versions.tf b/src/_nebari/stages/kubernetes_keycloak_configuration/template/versions.tf
index 00353a6d2f..d3f87478e2 100644
--- a/src/_nebari/stages/kubernetes_keycloak_configuration/template/versions.tf
+++ b/src/_nebari/stages/kubernetes_keycloak_configuration/template/versions.tf
@@ -6,7 +6,7 @@ terraform {
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "2.20.0"
+      version = "2.35.1"
     }
     keycloak = {
       source  = "mrparkers/keycloak"
diff --git a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/argo-workflows/versions.tf b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/argo-workflows/versions.tf
index 341def1365..d1e5f8acfb 100644
--- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/argo-workflows/versions.tf
+++ b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/argo-workflows/versions.tf
@@ -6,7 +6,7 @@ terraform {
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "2.20.0"
+      version = "2.35.1"
     }
   }
   required_version = ">= 1.0"
diff --git a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/monitoring/versions.tf b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/monitoring/versions.tf
index 341def1365..d1e5f8acfb 100644
--- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/monitoring/versions.tf
+++ b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/monitoring/versions.tf
@@ -6,7 +6,7 @@ terraform {
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "2.20.0"
+      version = "2.35.1"
     }
   }
   required_version = ">= 1.0"
diff --git a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/rook-ceph/versions.tf b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/rook-ceph/versions.tf
index 341def1365..d1e5f8acfb 100644
--- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/rook-ceph/versions.tf
+++ b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/rook-ceph/versions.tf
@@ -6,7 +6,7 @@ terraform {
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "2.20.0"
+      version = "2.35.1"
     }
   }
   required_version = ">= 1.0"
diff --git a/src/_nebari/stages/kubernetes_services/template/versions.tf b/src/_nebari/stages/kubernetes_services/template/versions.tf
index 00353a6d2f..d3f87478e2 100644
--- a/src/_nebari/stages/kubernetes_services/template/versions.tf
+++ b/src/_nebari/stages/kubernetes_services/template/versions.tf
@@ -6,7 +6,7 @@ terraform {
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "2.20.0"
+      version = "2.35.1"
     }
     keycloak = {
       source  = "mrparkers/keycloak"
diff --git a/src/_nebari/stages/nebari_tf_extensions/template/versions.tf b/src/_nebari/stages/nebari_tf_extensions/template/versions.tf
index 00353a6d2f..d3f87478e2 100644
--- a/src/_nebari/stages/nebari_tf_extensions/template/versions.tf
+++ b/src/_nebari/stages/nebari_tf_extensions/template/versions.tf
@@ -6,7 +6,7 @@ terraform {
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "2.20.0"
+      version = "2.35.1"
     }
     keycloak = {
       source  = "mrparkers/keycloak"