diff --git a/lab/_envcommon/default-versions.hcl b/lab/_envcommon/default-versions.hcl
index 5a5ad93..20a615f 100644
--- a/lab/_envcommon/default-versions.hcl
+++ b/lab/_envcommon/default-versions.hcl
@@ -6,10 +6,32 @@ locals {
   #####################
   cluster_version            = "1.32"
   custom_service_eks_account = "${local.release_version}"
-  eks_module_version         = "20.35.0"
+  eks_module_version         = "20.36.0"
   istio_ingress_version      = "${local.release_version}"
   release_version            = "mcmCluster" # "main"
 
+  module_versions = {
+  "2025.22.04" = {
+    "eks-arcgis"         = false
+    "eks-cert-manager"   = "1.0.6"
+    "eks-config"         = "1.0.4"
+    "eks-dns"            = "1.0.3"
+    "eks-gatekeeper"     = "0.0.1"
+    "eks-grafana"        = "0.1.4"
+    "eks-istio"          = "1.0.6"
+    "eks-k8s-dashboard"  = "0.1.3"
+    "eks-karpenter"      = "0.1.4"
+    "eks-keycloak"       = "0.0.6"
+    "eks-kiali"          = "0.1.2"
+    "eks-loki"           = "0.1.3"
+    "eks-metrics-server" = "0.1.3"
+    "eks-otel"           = "0.0.2"
+    "eks-postgresql"     = false
+    "eks-prometheus"     = "0.1.3"
+    "eks-tempo"          = "0.1.3"
+    "eks"                = "1.0.8"
+  }
+}
 
   #####################
   # Module Enablement