diff --git a/deployments/cognito-rds-s3/terraform/cognito-rds-s3-components/main.tf b/deployments/cognito-rds-s3/terraform/cognito-rds-s3-components/main.tf
index 72c934575..75a67f2c0 100644
--- a/deployments/cognito-rds-s3/terraform/cognito-rds-s3-components/main.tf
+++ b/deployments/cognito-rds-s3/terraform/cognito-rds-s3-components/main.tf
@@ -69,7 +69,7 @@ data "aws_iam_role" "user_namespace_irsa_iam_role" {
 }
 
 module "kubeflow_secrets_manager_irsa" {
-  source                            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.28.0"
+  source                            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.31.0"
   kubernetes_namespace              = kubernetes_namespace.kubeflow.metadata[0].name
   create_kubernetes_namespace       = false
   create_kubernetes_service_account = true
@@ -84,7 +84,7 @@ module "kubeflow_secrets_manager_irsa" {
 
 module "kubeflow_pipeline_irsa" {
   count                             = local.use_static ? 0 : 1
-  source                            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.28.0"
+  source                            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.31.0"
   kubernetes_namespace              = kubernetes_namespace.kubeflow.metadata[0].name
   create_kubernetes_namespace       = false
   create_kubernetes_service_account = false
@@ -99,7 +99,7 @@ module "kubeflow_pipeline_irsa" {
 
 module "user_namespace_irsa" {
   count                             = local.use_static ? 0 : 1
-  source                            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.28.0"
+  source                            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.31.0"
   kubernetes_namespace              = "kubeflow-user-example-com"
   create_kubernetes_namespace       = false
   create_kubernetes_service_account = false
diff --git a/deployments/cognito-rds-s3/terraform/main.tf b/deployments/cognito-rds-s3/terraform/main.tf
index a6790cb4a..25a75339b 100644
--- a/deployments/cognito-rds-s3/terraform/main.tf
+++ b/deployments/cognito-rds-s3/terraform/main.tf
@@ -112,7 +112,7 @@ data "aws_ec2_instance_type_offerings" "availability_zones_gpu" {
 # EKS Blueprints
 #---------------------------------------------------------------
 module "eks_blueprints" {
-  source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.28.0"
+  source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.31.0"
 
   cluster_name    = local.cluster_name
   cluster_version = local.eks_version
@@ -127,7 +127,7 @@ module "eks_blueprints" {
 }
 
 module "eks_blueprints_kubernetes_addons" {
-  source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.28.0"
+  source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.31.0"
 
   eks_cluster_id       = module.eks_blueprints.eks_cluster_id
   eks_cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint
diff --git a/deployments/cognito/terraform/main.tf b/deployments/cognito/terraform/main.tf
index 16c7ac86e..d1b932a41 100644
--- a/deployments/cognito/terraform/main.tf
+++ b/deployments/cognito/terraform/main.tf
@@ -113,7 +113,7 @@ data "aws_ec2_instance_type_offerings" "availability_zones_gpu" {
 # EKS Blueprints
 #---------------------------------------------------------------
 module "eks_blueprints" {
-  source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.28.0"
+  source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.31.0"
 
   cluster_name    = local.cluster_name
   cluster_version = local.eks_version
@@ -128,7 +128,7 @@ module "eks_blueprints" {
 }
 
 module "eks_blueprints_kubernetes_addons" {
-  source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.28.0"
+  source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.31.0"
 
   eks_cluster_id       = module.eks_blueprints.eks_cluster_id
   eks_cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint
diff --git a/deployments/rds-s3/terraform/main.tf b/deployments/rds-s3/terraform/main.tf
index 60fa07fe7..9ac833de5 100644
--- a/deployments/rds-s3/terraform/main.tf
+++ b/deployments/rds-s3/terraform/main.tf
@@ -105,7 +105,7 @@ data "aws_ec2_instance_type_offerings" "availability_zones_gpu" {
 # EKS Blueprints
 #---------------------------------------------------------------
 module "eks_blueprints" {
-  source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.28.0"
+  source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.31.0"
 
   cluster_name    = local.cluster_name
   cluster_version = local.eks_version
@@ -120,7 +120,7 @@ module "eks_blueprints" {
 }
 
 module "eks_blueprints_kubernetes_addons" {
-  source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.28.0"
+  source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.31.0"
 
   eks_cluster_id       = module.eks_blueprints.eks_cluster_id
   eks_cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint
diff --git a/deployments/rds-s3/terraform/rds-s3-components/main.tf b/deployments/rds-s3/terraform/rds-s3-components/main.tf
index e307c1fe2..bf90e095e 100644
--- a/deployments/rds-s3/terraform/rds-s3-components/main.tf
+++ b/deployments/rds-s3/terraform/rds-s3-components/main.tf
@@ -62,7 +62,7 @@ data "aws_iam_role" "user_namespace_irsa_iam_role" {
 
 module "kubeflow_secrets_manager_irsa" {
   count                             = local.use_static || var.use_rds ? 1 : 0
-  source                            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.28.0"
+  source                            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.31.0"
   kubernetes_namespace              = kubernetes_namespace.kubeflow.metadata[0].name
   create_kubernetes_namespace       = false
   create_kubernetes_service_account = true
@@ -77,7 +77,7 @@ module "kubeflow_secrets_manager_irsa" {
 
 module "kubeflow_pipeline_irsa" {
   count                             = local.use_static ? 0 : 1
-  source                            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.28.0"
+  source                            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.31.0"
   kubernetes_namespace              = kubernetes_namespace.kubeflow.metadata[0].name
   create_kubernetes_namespace       = false
   create_kubernetes_service_account = false
@@ -92,7 +92,7 @@ module "kubeflow_pipeline_irsa" {
 
 module "user_namespace_irsa" {
   count                             = local.use_static ? 0 : 1
-  source                            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.28.0"
+  source                            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.31.0"
   kubernetes_namespace              = "kubeflow-user-example-com"
   create_kubernetes_namespace       = false
   create_kubernetes_service_account = false
diff --git a/deployments/vanilla/terraform/main.tf b/deployments/vanilla/terraform/main.tf
index 55860b4dc..a08c76307 100644
--- a/deployments/vanilla/terraform/main.tf
+++ b/deployments/vanilla/terraform/main.tf
@@ -105,7 +105,7 @@ data "aws_ec2_instance_type_offerings" "availability_zones_gpu" {
 # EKS Blueprints
 #---------------------------------------------------------------
 module "eks_blueprints" {
-  source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.28.0"
+  source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.31.0"
 
   cluster_name    = local.cluster_name
   cluster_version = local.eks_version
@@ -119,7 +119,7 @@ module "eks_blueprints" {
 }
 
 module "eks_blueprints_kubernetes_addons" {
-  source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.28.0"
+  source = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons?ref=v4.31.0"
 
   eks_cluster_id       = module.eks_blueprints.eks_cluster_id
   eks_cluster_endpoint = module.eks_blueprints.eks_cluster_endpoint
diff --git a/iaac/terraform/apps/admission-webhook/main.tf b/iaac/terraform/apps/admission-webhook/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/apps/admission-webhook/main.tf
+++ b/iaac/terraform/apps/admission-webhook/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/apps/central-dashboard/main.tf b/iaac/terraform/apps/central-dashboard/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/apps/central-dashboard/main.tf
+++ b/iaac/terraform/apps/central-dashboard/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/apps/jupyter-web-app/main.tf b/iaac/terraform/apps/jupyter-web-app/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/apps/jupyter-web-app/main.tf
+++ b/iaac/terraform/apps/jupyter-web-app/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/apps/katib/main.tf b/iaac/terraform/apps/katib/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/apps/katib/main.tf
+++ b/iaac/terraform/apps/katib/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/apps/kubeflow-pipelines/main.tf b/iaac/terraform/apps/kubeflow-pipelines/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/apps/kubeflow-pipelines/main.tf
+++ b/iaac/terraform/apps/kubeflow-pipelines/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/apps/models-web-app/main.tf b/iaac/terraform/apps/models-web-app/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/apps/models-web-app/main.tf
+++ b/iaac/terraform/apps/models-web-app/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/apps/notebook-controller/main.tf b/iaac/terraform/apps/notebook-controller/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/apps/notebook-controller/main.tf
+++ b/iaac/terraform/apps/notebook-controller/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/apps/profiles-and-kfam/main.tf b/iaac/terraform/apps/profiles-and-kfam/main.tf
index 904a9c766..9aaf9c8a0 100644
--- a/iaac/terraform/apps/profiles-and-kfam/main.tf
+++ b/iaac/terraform/apps/profiles-and-kfam/main.tf
@@ -5,7 +5,7 @@ resource "aws_iam_policy" "profile_controller_policy" {
 }
 
 module "irsa" {
-  source                            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.28.0"
+  source                            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.31.0"
   kubernetes_namespace              = "kubeflow"
   create_kubernetes_namespace       = false
   create_kubernetes_service_account = false
@@ -19,7 +19,7 @@ module "irsa" {
 }
 
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/apps/tensorboard-controller/main.tf b/iaac/terraform/apps/tensorboard-controller/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/apps/tensorboard-controller/main.tf
+++ b/iaac/terraform/apps/tensorboard-controller/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/apps/tensorboards-web-app/main.tf b/iaac/terraform/apps/tensorboards-web-app/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/apps/tensorboards-web-app/main.tf
+++ b/iaac/terraform/apps/tensorboards-web-app/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/apps/training-operator/main.tf b/iaac/terraform/apps/training-operator/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/apps/training-operator/main.tf
+++ b/iaac/terraform/apps/training-operator/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/apps/volumes-web-app/main.tf b/iaac/terraform/apps/volumes-web-app/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/apps/volumes-web-app/main.tf
+++ b/iaac/terraform/apps/volumes-web-app/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/common/ack-sagemaker-controller/main.tf b/iaac/terraform/common/ack-sagemaker-controller/main.tf
index d1e228824..8e20c1b8c 100644
--- a/iaac/terraform/common/ack-sagemaker-controller/main.tf
+++ b/iaac/terraform/common/ack-sagemaker-controller/main.tf
@@ -5,7 +5,7 @@ resource "aws_iam_policy" "sagemaker_ack_controller_studio_access" {
 }
 
 module "irsa" {
-  source                            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.28.0"
+  source                            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/irsa?ref=v4.31.0"
   kubernetes_namespace              = local.namespace
   create_kubernetes_namespace       = true
   create_kubernetes_service_account = false
@@ -19,7 +19,7 @@ module "irsa" {
 }
 
 module "helm_addon" {
-  source            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source            = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   manage_via_gitops = false
   helm_config       = local.helm_config
   set_values = [
diff --git a/iaac/terraform/common/aws-authservice/main.tf b/iaac/terraform/common/aws-authservice/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/common/aws-authservice/main.tf
+++ b/iaac/terraform/common/aws-authservice/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/common/aws-secrets-manager/main.tf b/iaac/terraform/common/aws-secrets-manager/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/common/aws-secrets-manager/main.tf
+++ b/iaac/terraform/common/aws-secrets-manager/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/common/aws-telemetry/main.tf b/iaac/terraform/common/aws-telemetry/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/common/aws-telemetry/main.tf
+++ b/iaac/terraform/common/aws-telemetry/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/common/cluster-local-gateway/main.tf b/iaac/terraform/common/cluster-local-gateway/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/common/cluster-local-gateway/main.tf
+++ b/iaac/terraform/common/cluster-local-gateway/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/common/dex/main.tf b/iaac/terraform/common/dex/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/common/dex/main.tf
+++ b/iaac/terraform/common/dex/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/common/istio/main.tf b/iaac/terraform/common/istio/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/common/istio/main.tf
+++ b/iaac/terraform/common/istio/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/common/knative-eventing/main.tf b/iaac/terraform/common/knative-eventing/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/common/knative-eventing/main.tf
+++ b/iaac/terraform/common/knative-eventing/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/common/knative-serving/main.tf b/iaac/terraform/common/knative-serving/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/common/knative-serving/main.tf
+++ b/iaac/terraform/common/knative-serving/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/common/kserve/main.tf b/iaac/terraform/common/kserve/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/common/kserve/main.tf
+++ b/iaac/terraform/common/kserve/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/common/kubeflow-issuer/main.tf b/iaac/terraform/common/kubeflow-issuer/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/common/kubeflow-issuer/main.tf
+++ b/iaac/terraform/common/kubeflow-issuer/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/common/kubeflow-istio-resources/main.tf b/iaac/terraform/common/kubeflow-istio-resources/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/common/kubeflow-istio-resources/main.tf
+++ b/iaac/terraform/common/kubeflow-istio-resources/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/common/kubeflow-roles/main.tf b/iaac/terraform/common/kubeflow-roles/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/common/kubeflow-roles/main.tf
+++ b/iaac/terraform/common/kubeflow-roles/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/common/oidc-authservice/main.tf b/iaac/terraform/common/oidc-authservice/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/common/oidc-authservice/main.tf
+++ b/iaac/terraform/common/oidc-authservice/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/iaac/terraform/common/user-namespace/main.tf b/iaac/terraform/common/user-namespace/main.tf
index 507708f58..9b8297a26 100644
--- a/iaac/terraform/common/user-namespace/main.tf
+++ b/iaac/terraform/common/user-namespace/main.tf
@@ -1,5 +1,5 @@
 module "helm_addon" {
-  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.28.0"
+  source        = "github.com/aws-ia/terraform-aws-eks-blueprints//modules/kubernetes-addons/helm-addon?ref=v4.31.0"
   helm_config   = local.helm_config
   addon_context = var.addon_context
 }
diff --git a/tests/e2e/utils/auto-efs-setup.py b/tests/e2e/utils/auto-efs-setup.py
index 138665359..2f9807429 100755
--- a/tests/e2e/utils/auto-efs-setup.py
+++ b/tests/e2e/utils/auto-efs-setup.py
@@ -12,10 +12,11 @@
 def main():
     header()
 
-    verify_prerequisites()
+    if not SKIP_DRIVER_INSTALLATION:
+        verify_prerequisites()
+        setup_iam_authorization()
+        setup_efs_driver()
 
-    setup_iam_authorization()
-    setup_efs_driver()
     setup_efs_file_system()
     setup_efs_provisioning()
 
@@ -51,9 +52,15 @@ def verify_oidc_provider_prerequisite():
 def is_oidc_provider_present() -> bool:
     eks_client = get_eks_client()
     try:
-        https_oidc_provider = eks_client.describe_cluster(
-            name=CLUSTER_NAME,
-        ).get('cluster').get('identity').get('oidc').get('issuer')
+        https_oidc_provider = (
+            eks_client.describe_cluster(
+                name=CLUSTER_NAME,
+            )
+            .get("cluster")
+            .get("identity")
+            .get("oidc")
+            .get("issuer")
+        )
         return True if "oidc" in https_oidc_provider else False
     except:
         return False
@@ -340,7 +347,6 @@ def wait_for_efs_file_system_to_become_available(efs_file_system_creation_token)
     print("Waiting for EFS file system to become available...")
 
     while status != "available":
-
         status = efs_client.describe_file_systems(
             CreationToken=efs_file_system_creation_token
         )["FileSystems"][0]["LifeCycleState"]
@@ -422,7 +428,6 @@ def create_mount_targets(efs_client, efs_security_group_id, file_system_id, subn
 
 def wait_for_mount_target_to_become_available(efs_client, mount_target_ids):
     for mount_target_id in mount_target_ids:
-
         status = None
 
         print(f"Waiting for EFS mount target {mount_target_id} to become available...")
@@ -586,6 +591,14 @@ def footer():
     help=f"Specify the path to the source files if different. Default is set to empty.",
     required=False,
 )
+SKIP_DRIVER_INSTALLATION_DEFAULT = False
+parser.add_argument(
+    "--skip-driver-installation",
+    default=SKIP_DRIVER_INSTALLATION_DEFAULT,
+    action="store_true",
+    help=f"Skips the creation of the service account for the EFS controller and skips installing the EFS CSI driver since the default Terraform installation performs these steps by default.",
+    required=False,
+)
 
 args, _ = parser.parse_known_args()
 
@@ -599,6 +612,7 @@ def footer():
     EFS_GID = args.efs_gid
     EFS_UID = args.efs_uid
     DIRECTORY_PATH = args.directory
+    SKIP_DRIVER_INSTALLATION = args.skip_driver_installation
 
     AWS_ACCOUNT_ID = boto3.client("sts").get_caller_identity()["Account"]
     EFS_IAM_POLICY_NAME = "AmazonEKS_EFS_CSI_Driver_Policy" + EFS_FILE_SYSTEM_NAME
diff --git a/website/content/en/docs/add-ons/storage/efs/guide.md b/website/content/en/docs/add-ons/storage/efs/guide.md
index b3561c4db..004a63fae 100644
--- a/website/content/en/docs/add-ons/storage/efs/guide.md
+++ b/website/content/en/docs/add-ons/storage/efs/guide.md
@@ -39,18 +39,10 @@ export CLAIM_NAME=<efs-claim>
 
 ## 2.0 Set up EFS
 
-#### Setup for Manifest deployments
-
 You can either use Automated or Manual setup to set up the resources required. If you choose the manual route, you get another choice between **static and dynamic provisioning**, so pick whichever suits you. On the other hand, for the automated script we currently only support **dynamic provisioning**. Whichever combination you pick, be sure to continue picking the appropriate sections through the rest of this guide. 
 
-#### Setup for Terraform deployments
-
-Follow the Manual setup to set up the resources required. As part of the Manual setup, you get another choice between **static and dynamic provisioning**, so pick whichever suits you.
-
 ### 2.1 [Option 1] Automated setup
 
-> Important: Terraform deployment users should not follow these Automated setup instructions and should follow the [Manual setup instructions](#22-option-2-manual-setup).
-
 The script automates all the manual resource creation steps but is currently only available for **Dynamic Provisioning** option.  
 It performs the required cluster configuration, creates an EFS file system and it also takes care of creating a storage class for dynamic provisioning. Once done, move to section 3.0. 
 1. Run the following commands from the `tests/e2e` directory:
@@ -62,15 +54,22 @@ cd $GITHUB_ROOT/tests/e2e
 pip install -r requirements.txt
 ```
 
-3. Run the automated script.
+3. Run the appropriate automated script command for your deployment type.
 
 > Note: If you want the script to create a new security group for EFS, specify a name here. On the other hand, if you want to use an existing Security group, you can specify that name too. We have used the same name as the claim we are going to create. 
 
-```bash
+{{< tabpane persistLang=false >}}
+{{< tab header="Manifest" lang="toml" >}}
 export SECURITY_GROUP_TO_CREATE=$CLAIM_NAME
 
 python utils/auto-efs-setup.py --region $CLUSTER_REGION --cluster $CLUSTER_NAME --efs_file_system_name $CLAIM_NAME --efs_security_group_name $SECURITY_GROUP_TO_CREATE
-```
+{{< /tab >}}
+{{< tab header="Terraform" lang="toml" >}}
+export SECURITY_GROUP_TO_CREATE=$CLAIM_NAME
+
+python utils/auto-efs-setup.py --region $CLUSTER_REGION --cluster $CLUSTER_NAME --efs_file_system_name $CLAIM_NAME --efs_security_group_name $SECURITY_GROUP_TO_CREATE --skip-driver-installation
+{{< /tab >}}
+{{< /tabpane >}}
 
 4. The script above takes care of creating the `StorageClass (SC)` which is a cluster scoped resource. In order to create the `PersistentVolumeClaim (PVC)` you can either use the yaml file provided in this directory or use the Kubeflow UI directly. 
 The PVC needs to be in the namespace you will be accessing it from. Replace the `kubeflow-user-example-com` namespace specified the below with the namespace for your kubeflow user and edit the `efs/dynamic-provisioning/pvc.yaml` file accordingly.