diff --git a/manifests/.workshop/terraform/base.tf b/manifests/.workshop/terraform/base.tf
index f4b8d3386..c8e40cfa0 100644
--- a/manifests/.workshop/terraform/base.tf
+++ b/manifests/.workshop/terraform/base.tf
@@ -8,11 +8,11 @@ terraform {
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "2.38.0"
+      version = "3.1.0"
     }
     helm = {
       source  = "hashicorp/helm"
-      version = "2.17.0"
+      version = "3.1.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 15695f947..363d6b86d 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.6.0"
   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 1c312b960..b2bece3a3 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.6.0"
   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 083334a53..97b5e68f9 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.6.0"
   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 7e41b3ddd..0ea644db0 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.6.0"
   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.6.0"
   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 64f590c0b..7064dd7f0 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.6.0"
 
   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.6.0"
   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 588ff67b1..8e875bb1a 100644
--- a/manifests/modules/automation/gitops/argocd/.workshop/terraform/main.tf
+++ b/manifests/modules/automation/gitops/argocd/.workshop/terraform/main.tf
@@ -9,7 +9,7 @@ terraform {
 
 module "ebs_csi_driver_irsa" {
   source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
-  version = "5.60.0"
+  version = "6.6.0"
 
   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 8c0eeb600..19fa13e3e 100644
--- a/manifests/modules/automation/gitops/flux/.workshop/terraform/main.tf
+++ b/manifests/modules/automation/gitops/flux/.workshop/terraform/main.tf
@@ -9,7 +9,7 @@ terraform {
 
 module "ebs_csi_driver_irsa" {
   source  = "terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks"
-  version = "5.60.0"
+  version = "6.6.0"
 
   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 60e3be954..1c79eee88 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.6.0"
   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/fastpaths/developers/.workshop/terraform/preprovision/eks-auto.tf b/manifests/modules/fastpaths/developers/.workshop/terraform/preprovision/eks-auto.tf
index 416f4dd38..df6b6b235 100644
--- a/manifests/modules/fastpaths/developers/.workshop/terraform/preprovision/eks-auto.tf
+++ b/manifests/modules/fastpaths/developers/.workshop/terraform/preprovision/eks-auto.tf
@@ -22,7 +22,7 @@ terraform {
   required_providers {
     helm = {
       source                = "hashicorp/helm"
-      version               = "2.17.0"
+      version               = "3.1.2"
       configuration_aliases = [helm.auto_mode]
     }
   }
diff --git a/manifests/modules/fastpaths/developers/.workshop/terraform/preprovision/pod-identity.tf b/manifests/modules/fastpaths/developers/.workshop/terraform/preprovision/pod-identity.tf
index f9aced1ef..0cc029a70 100644
--- a/manifests/modules/fastpaths/developers/.workshop/terraform/preprovision/pod-identity.tf
+++ b/manifests/modules/fastpaths/developers/.workshop/terraform/preprovision/pod-identity.tf
@@ -33,7 +33,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.6.0"
   create_role             = true
   role_requires_mfa       = false
   role_name               = "${var.eks_cluster_auto_id}-carts-dynamo"
diff --git a/manifests/modules/fastpaths/developers/.workshop/terraform/preprovision/secrets-manager.tf b/manifests/modules/fastpaths/developers/.workshop/terraform/preprovision/secrets-manager.tf
index b43a7a891..f119c8bbb 100644
--- a/manifests/modules/fastpaths/developers/.workshop/terraform/preprovision/secrets-manager.tf
+++ b/manifests/modules/fastpaths/developers/.workshop/terraform/preprovision/secrets-manager.tf
@@ -23,7 +23,7 @@ resource "helm_release" "secrets_store_csi_driver_provider_aws" {
   repository = "https://aws.github.io/secrets-store-csi-driver-provider-aws"
   chart      = "secrets-store-csi-driver-provider-aws"
   namespace  = "kube-system"
-  version    = "2.1.1"
+  version    = "3.1.0"
   provider   = helm.auto_mode
 
   set {
@@ -42,7 +42,7 @@ resource "helm_release" "external_secrets" {
   repository = "https://charts.external-secrets.io"
   chart      = "external-secrets"
   namespace  = "external-secrets"
-  version    = "0.14.4"
+  version    = "2.5.0"
   provider   = helm.auto_mode
 
   create_namespace = true
diff --git a/manifests/modules/fastpaths/developers/.workshop/terraform/providers.tf b/manifests/modules/fastpaths/developers/.workshop/terraform/providers.tf
index 3fb059625..d2a2bed70 100644
--- a/manifests/modules/fastpaths/developers/.workshop/terraform/providers.tf
+++ b/manifests/modules/fastpaths/developers/.workshop/terraform/providers.tf
@@ -2,12 +2,12 @@ terraform {
   required_providers {
     helm = {
       source                = "hashicorp/helm"
-      version               = "2.17.0"
+      version               = "3.1.2"
       configuration_aliases = [helm.auto_mode]
     }
     kubernetes = {
       source                = "hashicorp/kubernetes"
-      version               = "2.38.0"
+      version               = "3.1.0"
       configuration_aliases = [kubernetes.auto_mode]
     }
   }
diff --git a/manifests/modules/fundamentals/storage/ebs/.workshop/terraform/main.tf b/manifests/modules/fundamentals/storage/ebs/.workshop/terraform/main.tf
index fe7c4b7ef..485d7e952 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.6.0"
 
   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 f20de0c3e..f83517caf 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.6.0"
 
   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 c58753bf1..70f9f5d42 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.6.0"
 
   # 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.6.0"
   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 25200007f..b8b53b291 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.6.0"
 
   # Create prefixes
   role_name_prefix   = "${var.addon_context.eks_cluster_id}-s3-csi-"
diff --git a/manifests/modules/networking/eks-hybrid-nodes/.workshop/terraform/main.tf b/manifests/modules/networking/eks-hybrid-nodes/.workshop/terraform/main.tf
index e818c1dce..65ecc7802 100644
--- a/manifests/modules/networking/eks-hybrid-nodes/.workshop/terraform/main.tf
+++ b/manifests/modules/networking/eks-hybrid-nodes/.workshop/terraform/main.tf
@@ -108,7 +108,7 @@ resource "aws_route_table_association" "remote_public" {
 
 module "key_pair" {
   source  = "terraform-aws-modules/key-pair/aws"
-  version = "2.1.1"
+  version = "3.0.0"
 
   key_name           = "hybrid-node"
   create_private_key = true
diff --git a/manifests/modules/networking/securitygroups-for-pods/.workshop/terraform/preprovision/main.tf b/manifests/modules/networking/securitygroups-for-pods/.workshop/terraform/preprovision/main.tf
index 88e3176de..e498110ce 100644
--- a/manifests/modules/networking/securitygroups-for-pods/.workshop/terraform/preprovision/main.tf
+++ b/manifests/modules/networking/securitygroups-for-pods/.workshop/terraform/preprovision/main.tf
@@ -19,7 +19,7 @@ data "aws_subnets" "private_sg_rds" {
 
 module "catalog_mysql" {
   source  = "terraform-aws-modules/rds/aws"
-  version = "6.13.1"
+  version = "7.2.0"
 
   identifier = "${var.eks_cluster_id}-catalog"
 
diff --git a/manifests/modules/networking/vpc-lattice/.workshop/terraform/main.tf b/manifests/modules/networking/vpc-lattice/.workshop/terraform/main.tf
index 227177f8a..1f1530e18 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.6.0"
   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 f6740dd14..c5320d604 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.6.0"
   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 f6414f48b..3ca7906ff 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.6.0"
 
   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 1f3853747..bab7bef7f 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.6.0"
 
   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.6.0"
 
   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 d1f237e0f..f0076471d 100644
--- a/manifests/modules/security/eks-pod-identity/.workshop/terraform/main.tf
+++ b/manifests/modules/security/eks-pod-identity/.workshop/terraform/main.tf
@@ -93,7 +93,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.6.0"
   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 4a47cf04c..47fad985d 100644
--- a/manifests/modules/security/irsa/.workshop/terraform/main.tf
+++ b/manifests/modules/security/irsa/.workshop/terraform/main.tf
@@ -93,7 +93,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.6.0"
   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 90265764f..eac604280 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.6.0"
 
   role_name_prefix   = "${var.eks_cluster_id}-secrets-"
   policy_name_prefix = "${var.eks_cluster_id}-secrets-"