diff --git a/manifests/.workshop/terraform/base.tf b/manifests/.workshop/terraform/base.tf
index 5ce0cf719e..0dc49e533e 100644
--- a/manifests/.workshop/terraform/base.tf
+++ b/manifests/.workshop/terraform/base.tf
@@ -12,7 +12,7 @@ terraform {
     }
     helm = {
       source  = "hashicorp/helm"
-      version = "2.17.0"
+      version = "3.0.2"
     }
     kubectl = {
       source  = "gavinbunney/kubectl"
diff --git a/manifests/modules/aiml/inferentia/.workshop/terraform/main.tf b/manifests/modules/aiml/inferentia/.workshop/terraform/main.tf
index 23f66a9d8a..b2cf85dc09 100644
--- a/manifests/modules/aiml/inferentia/.workshop/terraform/main.tf
+++ b/manifests/modules/aiml/inferentia/.workshop/terraform/main.tf
@@ -105,7 +105,7 @@ resource "aws_s3_bucket" "inference" {
 
 module "iam_assumable_role_inference" {
   source                        = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
-  version                       = "5.60.0"
+  version                       = "6.2.1"
   create_role                   = true
   role_name                     = "${var.addon_context.eks_cluster_id}-inference"
   provider_url                  = var.addon_context.eks_oidc_issuer_url
diff --git a/manifests/modules/aiml/q-cli/.workshop/terraform/main.tf b/manifests/modules/aiml/q-cli/.workshop/terraform/main.tf
index 540fe66d3f..9d7fe44974 100644
--- a/manifests/modules/aiml/q-cli/.workshop/terraform/main.tf
+++ b/manifests/modules/aiml/q-cli/.workshop/terraform/main.tf
@@ -159,7 +159,7 @@ resource "aws_eks_addon" "pod_identity" {
 
 module "iam_assumable_role_carts" {
   source                  = "terraform-aws-modules/iam/aws//modules/iam-assumable-role"
-  version                 = "5.60.0"
+  version                 = "6.2.1"
   create_role             = true
   role_requires_mfa       = false
   role_name               = "${var.addon_context.eks_cluster_id}-carts-dynamo"
diff --git a/manifests/modules/automation/continuousdelivery/codepipeline/.workshop/terraform/main.tf b/manifests/modules/automation/continuousdelivery/codepipeline/.workshop/terraform/main.tf
index 01cc52ecda..902d6d9581 100644
--- a/manifests/modules/automation/continuousdelivery/codepipeline/.workshop/terraform/main.tf
+++ b/manifests/modules/automation/continuousdelivery/codepipeline/.workshop/terraform/main.tf
@@ -256,7 +256,7 @@ resource "aws_kms_key" "artifact_encryption_key" {
 
 module "iam_assumable_role_ui" {
   source                        = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
-  version                       = "5.60.0"
+  version                       = "6.2.1"
   create_role                   = true
   role_name                     = "${var.addon_context.eks_cluster_id}-ecr-ui"
   provider_url                  = var.addon_context.eks_oidc_issuer_url
diff --git a/manifests/modules/automation/controlplanes/ack/.workshop/terraform/main.tf b/manifests/modules/automation/controlplanes/ack/.workshop/terraform/main.tf
index 5e6884f8f7..af37af0ba3 100644
--- a/manifests/modules/automation/controlplanes/ack/.workshop/terraform/main.tf
+++ b/manifests/modules/automation/controlplanes/ack/.workshop/terraform/main.tf
@@ -22,7 +22,7 @@ data "aws_ecrpublic_authorization_token" "token" {
 
 module "iam_assumable_role_carts" {
   source                        = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
-  version                       = "5.60.0"
+  version                       = "6.2.1"
   create_role                   = true
   role_name                     = "${var.addon_context.eks_cluster_id}-carts-ack"
   provider_url                  = var.addon_context.eks_oidc_issuer_url
@@ -82,7 +82,7 @@ EOF
 
 module "iam_assumable_role_ack" {
   source                        = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
-  version                       = "5.60.0"
+  version                       = "6.2.1"
   create_role                   = true
   role_name                     = "${var.addon_context.eks_cluster_id}-ack-controller"
   provider_url                  = var.addon_context.eks_oidc_issuer_url
diff --git a/manifests/modules/automation/controlplanes/crossplane/.workshop/terraform/main.tf b/manifests/modules/automation/controlplanes/crossplane/.workshop/terraform/main.tf
index 6b364198c1..4f361c56a0 100644
--- a/manifests/modules/automation/controlplanes/crossplane/.workshop/terraform/main.tf
+++ b/manifests/modules/automation/controlplanes/crossplane/.workshop/terraform/main.tf
@@ -42,7 +42,7 @@ locals {
 
 module "upbound_irsa_aws" {
   source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
-  version = "5.60.0"
+  version = "6.2.1"
 
   role_name_prefix           = "${var.addon_context.eks_cluster_id}-ddb-upbound-"
   policy_name_prefix         = "${var.addon_context.eks_cluster_id}-ddb-upbound-"
@@ -102,7 +102,7 @@ resource "kubectl_manifest" "upbound_aws_provider_config" {
 
 module "iam_assumable_role_carts" {
   source                        = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
-  version                       = "5.60.0"
+  version                       = "6.2.1"
   create_role                   = true
   role_name                     = "${var.addon_context.eks_cluster_id}-carts-crossplane"
   provider_url                  = var.addon_context.eks_oidc_issuer_url
diff --git a/manifests/modules/automation/gitops/argocd/.workshop/terraform/main.tf b/manifests/modules/automation/gitops/argocd/.workshop/terraform/main.tf
index b7c5ceb80f..4980dd9dfd 100644
--- a/manifests/modules/automation/gitops/argocd/.workshop/terraform/main.tf
+++ b/manifests/modules/automation/gitops/argocd/.workshop/terraform/main.tf
@@ -1,6 +1,6 @@
 module "ebs_csi_driver_irsa" {
   source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
-  version = "5.60.0"
+  version = "6.2.1"
 
   role_name_prefix   = "${var.addon_context.eks_cluster_id}-ebs-csi-"
   policy_name_prefix = "${var.addon_context.eks_cluster_id}-ebs-csi-"
diff --git a/manifests/modules/automation/gitops/flux/.workshop/terraform/main.tf b/manifests/modules/automation/gitops/flux/.workshop/terraform/main.tf
index b7c5ceb80f..4980dd9dfd 100644
--- a/manifests/modules/automation/gitops/flux/.workshop/terraform/main.tf
+++ b/manifests/modules/automation/gitops/flux/.workshop/terraform/main.tf
@@ -1,6 +1,6 @@
 module "ebs_csi_driver_irsa" {
   source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
-  version = "5.60.0"
+  version = "6.2.1"
 
   role_name_prefix   = "${var.addon_context.eks_cluster_id}-ebs-csi-"
   policy_name_prefix = "${var.addon_context.eks_cluster_id}-ebs-csi-"
diff --git a/manifests/modules/autoscaling/workloads/keda/.workshop/terraform/main.tf b/manifests/modules/autoscaling/workloads/keda/.workshop/terraform/main.tf
index abe1820f3c..210fe1eafd 100644
--- a/manifests/modules/autoscaling/workloads/keda/.workshop/terraform/main.tf
+++ b/manifests/modules/autoscaling/workloads/keda/.workshop/terraform/main.tf
@@ -20,7 +20,7 @@ module "eks_blueprints_addons" {
 
 module "iam_assumable_role_keda" {
   source                        = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
-  version                       = "5.60.0"
+  version                       = "6.2.1"
   create_role                   = true
   role_name                     = "${var.addon_context.eks_cluster_id}-keda"
   provider_url                  = var.addon_context.eks_oidc_issuer_url
diff --git a/manifests/modules/fundamentals/storage/ebs/.workshop/terraform/main.tf b/manifests/modules/fundamentals/storage/ebs/.workshop/terraform/main.tf
index fe7c4b7efb..9dc1bddf5e 100644
--- a/manifests/modules/fundamentals/storage/ebs/.workshop/terraform/main.tf
+++ b/manifests/modules/fundamentals/storage/ebs/.workshop/terraform/main.tf
@@ -1,6 +1,6 @@
 module "ebs_csi_driver_irsa" {
   source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
-  version = "5.60.0"
+  version = "6.2.1"
 
   role_name_prefix   = "${var.addon_context.eks_cluster_id}-ebs-csi-"
   policy_name_prefix = "${var.addon_context.eks_cluster_id}-ebs-csi-"
diff --git a/manifests/modules/fundamentals/storage/efs/.workshop/terraform/main.tf b/manifests/modules/fundamentals/storage/efs/.workshop/terraform/main.tf
index b650348000..685ca6e0d0 100644
--- a/manifests/modules/fundamentals/storage/efs/.workshop/terraform/main.tf
+++ b/manifests/modules/fundamentals/storage/efs/.workshop/terraform/main.tf
@@ -1,6 +1,6 @@
 module "efs_csi_driver_irsa" {
   source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
-  version = "5.60.0"
+  version = "6.2.1"
 
   role_name_prefix   = "${var.addon_context.eks_cluster_id}-efs-csi-"
   policy_name_prefix = "${var.addon_context.eks_cluster_id}-ebs-csi-"
diff --git a/manifests/modules/fundamentals/storage/fsxz/.workshop/terraform/main.tf b/manifests/modules/fundamentals/storage/fsxz/.workshop/terraform/main.tf
index 86af510eb0..3d46e9850c 100644
--- a/manifests/modules/fundamentals/storage/fsxz/.workshop/terraform/main.tf
+++ b/manifests/modules/fundamentals/storage/fsxz/.workshop/terraform/main.tf
@@ -1,7 +1,7 @@
 # Create FSxZ OIDC providers
 module "fsxz_oidc_providers" {
   source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
-  version = "5.60.0"
+  version = "6.2.1"
 
   # Create prefixes
   role_name_prefix   = "${var.addon_context.eks_cluster_id}-fsxz-csi-"
@@ -145,7 +145,7 @@ resource "aws_security_group_rule" "fsxz_egress" {
 
 module "iam_assumable_role_fsx" {
   source                        = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
-  version                       = "5.60.0"
+  version                       = "6.2.1"
   create_role                   = true
   role_name                     = "${var.addon_context.eks_cluster_id}-fsxz"
   provider_url                  = var.addon_context.eks_oidc_issuer_url
diff --git a/manifests/modules/fundamentals/storage/s3/.workshop/terraform/main.tf b/manifests/modules/fundamentals/storage/s3/.workshop/terraform/main.tf
index d56224dc6d..01446bcf22 100644
--- a/manifests/modules/fundamentals/storage/s3/.workshop/terraform/main.tf
+++ b/manifests/modules/fundamentals/storage/s3/.workshop/terraform/main.tf
@@ -8,7 +8,7 @@ resource "aws_s3_bucket" "mountpoint_s3" {
 # Create S3 CSI Driver IAM Role and associated policy
 module "mountpoint_s3_csi_driver_irsa" {
   source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
-  version = "5.60.0"
+  version = "6.2.1"
 
   # Create prefixes
   role_name_prefix   = "${var.addon_context.eks_cluster_id}-s3-csi-"
diff --git a/manifests/modules/networking/vpc-lattice/.workshop/terraform/main.tf b/manifests/modules/networking/vpc-lattice/.workshop/terraform/main.tf
index 3110a03a33..0949e3f23e 100644
--- a/manifests/modules/networking/vpc-lattice/.workshop/terraform/main.tf
+++ b/manifests/modules/networking/vpc-lattice/.workshop/terraform/main.tf
@@ -19,7 +19,7 @@ module "eks_blueprints_addons" {
 
 module "iam_assumable_role_lattice" {
   source                        = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
-  version                       = "5.60.0"
+  version                       = "6.2.1"
   create_role                   = true
   role_name                     = "${var.addon_context.eks_cluster_id}-lattice"
   provider_url                  = var.addon_context.eks_oidc_issuer_url
diff --git a/manifests/modules/observability/container-insights/.workshop/terraform/main.tf b/manifests/modules/observability/container-insights/.workshop/terraform/main.tf
index 5b3aa0eeae..e110697c60 100644
--- a/manifests/modules/observability/container-insights/.workshop/terraform/main.tf
+++ b/manifests/modules/observability/container-insights/.workshop/terraform/main.tf
@@ -82,7 +82,7 @@ module "opentelemetry_operator" {
 
 module "iam_assumable_role_adot_ci" {
   source                        = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
-  version                       = "5.60.0"
+  version                       = "6.2.1"
   create_role                   = true
   role_name                     = "${var.addon_context.eks_cluster_id}-adot-collector-ci"
   provider_url                  = var.addon_context.eks_oidc_issuer_url
diff --git a/manifests/modules/observability/kubecost/.workshop/terraform/main.tf b/manifests/modules/observability/kubecost/.workshop/terraform/main.tf
index 32fff6c908..1170698f2f 100644
--- a/manifests/modules/observability/kubecost/.workshop/terraform/main.tf
+++ b/manifests/modules/observability/kubecost/.workshop/terraform/main.tf
@@ -1,6 +1,6 @@
 module "ebs_csi_driver_irsa" {
   source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
-  version = "5.60.0"
+  version = "6.2.1"
 
   role_name_prefix   = "${var.addon_context.eks_cluster_id}-ebs-csi-"
   policy_name_prefix = "${var.addon_context.eks_cluster_id}-ebs-csi-"
diff --git a/manifests/modules/observability/oss-metrics/.workshop/terraform/main.tf b/manifests/modules/observability/oss-metrics/.workshop/terraform/main.tf
index 256ade6845..be81f041bf 100644
--- a/manifests/modules/observability/oss-metrics/.workshop/terraform/main.tf
+++ b/manifests/modules/observability/oss-metrics/.workshop/terraform/main.tf
@@ -2,7 +2,7 @@ data "aws_partition" "current" {}
 
 module "ebs_csi_driver_irsa" {
   source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
-  version = "5.60.0"
+  version = "6.2.1"
 
   role_name_prefix   = "${var.addon_context.eks_cluster_id}-ebs-csi-"
   policy_name_prefix = "${var.addon_context.eks_cluster_id}-ebs-csi-"
@@ -115,7 +115,7 @@ resource "aws_prometheus_workspace" "this" {
 
 module "iam_assumable_role_adot" {
   source  = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
-  version = "5.60.0"
+  version = "6.2.1"
 
   create_role  = true
   role_name    = "${var.addon_context.eks_cluster_id}-adot-collector"
diff --git a/manifests/modules/security/eks-pod-identity/.workshop/terraform/main.tf b/manifests/modules/security/eks-pod-identity/.workshop/terraform/main.tf
index f47ce59695..3219ecbbe7 100644
--- a/manifests/modules/security/eks-pod-identity/.workshop/terraform/main.tf
+++ b/manifests/modules/security/eks-pod-identity/.workshop/terraform/main.tf
@@ -92,7 +92,7 @@ resource "aws_dynamodb_table" "carts" {
 
 module "iam_assumable_role_carts" {
   source                  = "terraform-aws-modules/iam/aws//modules/iam-assumable-role"
-  version                 = "5.60.0"
+  version                 = "6.2.1"
   create_role             = true
   role_requires_mfa       = false
   role_name               = "${var.addon_context.eks_cluster_id}-carts-dynamo"
diff --git a/manifests/modules/security/irsa/.workshop/terraform/main.tf b/manifests/modules/security/irsa/.workshop/terraform/main.tf
index 0f74c1d277..7b6e3015ed 100644
--- a/manifests/modules/security/irsa/.workshop/terraform/main.tf
+++ b/manifests/modules/security/irsa/.workshop/terraform/main.tf
@@ -92,7 +92,7 @@ resource "aws_dynamodb_table" "carts" {
 
 module "iam_assumable_role_carts" {
   source                        = "terraform-aws-modules/iam/aws//modules/iam-assumable-role-with-oidc"
-  version                       = "5.60.0"
+  version                       = "6.2.1"
   create_role                   = true
   role_name                     = "${var.addon_context.eks_cluster_id}-carts-dynamo"
   provider_url                  = var.addon_context.eks_oidc_issuer_url
diff --git a/manifests/modules/security/secrets-manager/.workshop/terraform/main.tf b/manifests/modules/security/secrets-manager/.workshop/terraform/main.tf
index 5336898af8..abf5adb5f5 100644
--- a/manifests/modules/security/secrets-manager/.workshop/terraform/main.tf
+++ b/manifests/modules/security/secrets-manager/.workshop/terraform/main.tf
@@ -52,7 +52,7 @@ module "eks_blueprints_addons" {
 
 module "secrets_manager_role" {
   source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
-  version = "5.60.0"
+  version = "6.2.1"
 
   role_name_prefix   = "${var.eks_cluster_id}-secrets-"
   policy_name_prefix = "${var.eks_cluster_id}-secrets-"