diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 7d005a3f8..4f23e2172 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -3,43 +3,57 @@ name: Pull Request
 on:
   pull_request:
     branches:
-    - main
+      - main
 
 permissions:
   contents: read
-    
+
 jobs:
   build-website:
-    name: 'Build website'
+    name: "Build website"
     runs-on: ubuntu-latest
     steps:
-    - name: Check out code
-      uses: actions/checkout@v4
-    - name: Use Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version: 18
-    - name: Get kubectl version
-      run: |
-        source hack/lib/kubectl-version.sh
-        echo "Using kubectl ${KUBECTL_VERSION}"
-        echo "KUBECTL_VERSION=$KUBECTL_VERSION" >> $GITHUB_ENV
-    - uses: azure/setup-kubectl@v3
-      with:
-        version: '${{ env.KUBECTL_VERSION }}'
-      id: install
-    - name: Run website build
-      working-directory: website
-      run: |
-        npm install
-        npm run build
+      - name: Check out code
+        uses: actions/checkout@v4
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
+      - name: Get kubectl version
+        run: |
+          source hack/lib/kubectl-version.sh
+          echo "Using kubectl ${KUBECTL_VERSION}"
+          echo "KUBECTL_VERSION=$KUBECTL_VERSION" >> $GITHUB_ENV
+      - uses: azure/setup-kubectl@v3
+        with:
+          version: "${{ env.KUBECTL_VERSION }}"
+        id: install
+      - name: Run website build
+        working-directory: website
+        run: |
+          npm install
+          npm run build
 
   build-lab:
-    name: 'Build lab'
+    name: "Build lab"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+      - name: Make shell
+        run: |
+          make shell shell_simple_command='ls'
+
+  pre-commit:
+    name: "Pre-commit hooks"
     runs-on: ubuntu-latest
     steps:
-    - name: Check out code
-      uses: actions/checkout@v4
-    - name: Make shell
-      run: |
-        make shell shell_simple_command='ls'
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+      - name: Setup TFLint
+        uses: terraform-linters/setup-tflint@v4
+      - name: Setup terraform-docs
+        uses: jaxxstorm/action-install-gh-release@v1.10.0
+        with:
+          repo: terraform-docs/terraform-docs
+      - uses: pre-commit/action@v3.0.1
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 54266fb80..939ded7b5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,29 +1,21 @@
-repos: []
-  #- repo: https://github.com/antonbabenko/pre-commit-terraform
-  #  rev: v1.77.0
-  #  hooks:
-  #    - id: terraform_fmt
-  #    # - id: terraform_validate
-  #    - id: terraform_docs
-  #      args:
-  #        - '--args=--lockfile=false'
-  #    - id: terraform_tflint
-  #      args:
-  #        - '--args=--only=terraform_deprecated_interpolation'
-  #        - '--args=--only=terraform_deprecated_index'
-  #        - '--args=--only=terraform_unused_declarations'
-  #        - '--args=--only=terraform_comment_syntax'
-  #        - '--args=--only=terraform_documented_outputs'
-  #        - '--args=--only=terraform_documented_variables'
-  #        - '--args=--only=terraform_typed_variables'
-  #        - '--args=--only=terraform_module_pinned_source'
-  #        - '--args=--only=terraform_naming_convention'
-  #        - '--args=--only=terraform_required_version'
-  #        - '--args=--only=terraform_required_providers'
-  #        # - '--args=--only=terraform_standard_module_structure'
-  #        - '--args=--only=terraform_workspace_remote'
-  #- repo: https://github.com/pre-commit/pre-commit-hooks
-  #  rev: v4.4.0
-  #  hooks:
-  #    - id: check-merge-conflict
-  #    - id: end-of-file-fixer
+repos:
+  - repo: https://github.com/antonbabenko/pre-commit-terraform
+    rev: v1.77.0
+    hooks:
+      - id: terraform_fmt
+      #- id: terraform_validate
+      - id: terraform_docs
+        args:
+          - "--args=--lockfile=false"
+      - id: terraform_tflint
+        args:
+          - "--args=--only=terraform_deprecated_interpolation"
+          - "--args=--only=terraform_deprecated_index"
+          - "--args=--only=terraform_unused_declarations"
+          - "--args=--only=terraform_comment_syntax"
+          - "--args=--only=terraform_documented_outputs"
+          - "--args=--only=terraform_documented_variables"
+          - "--args=--only=terraform_typed_variables"
+          - "--args=--only=terraform_module_pinned_source"
+          - "--args=--only=terraform_naming_convention"
+          - "--args=--only=terraform_workspace_remote"
diff --git a/cluster/terraform/eks.tf b/cluster/terraform/eks.tf
index 2f0f2155d..b8570c15e 100644
--- a/cluster/terraform/eks.tf
+++ b/cluster/terraform/eks.tf
@@ -39,7 +39,7 @@ module "eks" {
       min_size     = 3
       max_size     = 6
       desired_size = 3
-      
+
       update_config = {
         max_unavailable_percentage = 50
       }
diff --git a/cluster/terraform/variables.tf b/cluster/terraform/variables.tf
index faefa9f12..6f2f348cb 100644
--- a/cluster/terraform/variables.tf
+++ b/cluster/terraform/variables.tf
@@ -1,6 +1,7 @@
 variable "cluster_name" {
-  type    = string
-  default = "eks-workshop"
+  description = "Name of the EKS cluster"
+  type        = string
+  default     = "eks-workshop"
 }
 
 variable "cluster_version" {
diff --git a/manifests/.workshop/terraform/base.tf b/manifests/.workshop/terraform/base.tf
index 287085492..5f8a0da92 100644
--- a/manifests/.workshop/terraform/base.tf
+++ b/manifests/.workshop/terraform/base.tf
@@ -28,13 +28,17 @@ terraform {
   }
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type    = bool
-  default = false
+  description = "Have expensive resources been created already"
+  type        = bool
+  default     = false
 }
 
 data "aws_partition" "current" {}
diff --git a/manifests/.workshop/terraform/lab/vars.tf b/manifests/.workshop/terraform/lab/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/.workshop/terraform/lab/vars.tf
+++ b/manifests/.workshop/terraform/lab/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/.workshop/terraform/outputs.tf b/manifests/.workshop/terraform/outputs.tf
index 9aa261bd9..b2734f3c4 100644
--- a/manifests/.workshop/terraform/outputs.tf
+++ b/manifests/.workshop/terraform/outputs.tf
@@ -1,3 +1,4 @@
 output "environment" {
-  value = try(module.lab.environment, "")
+  description = "Evaluated by the IDE shell"
+  value       = try(module.lab.environment, "")
 }
diff --git a/manifests/modules/aiml/inferentia/.workshop/terraform/main.tf b/manifests/modules/aiml/inferentia/.workshop/terraform/main.tf
index ed3d2d874..f9d8465af 100644
--- a/manifests/modules/aiml/inferentia/.workshop/terraform/main.tf
+++ b/manifests/modules/aiml/inferentia/.workshop/terraform/main.tf
@@ -118,7 +118,8 @@ resource "kubectl_manifest" "neuron_device_plugin" {
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export AIML_NEURON_ROLE_ARN=${module.iam_assumable_role_inference.iam_role_arn}
 export AIML_NEURON_BUCKET_NAME=${resource.aws_s3_bucket.inference.id}
 export AIML_DL_IMAGE=763104351884.dkr.ecr.${data.aws_region.current.name}.amazonaws.com/pytorch-inference-neuron:1.13.1-neuron-py310-sdk2.12.0-ubuntu20.04
diff --git a/manifests/modules/aiml/inferentia/.workshop/terraform/vars.tf b/manifests/modules/aiml/inferentia/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/aiml/inferentia/.workshop/terraform/vars.tf
+++ b/manifests/modules/aiml/inferentia/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/automation/controlplanes/ack/.workshop/terraform/main.tf b/manifests/modules/automation/controlplanes/ack/.workshop/terraform/main.tf
index 0a4a58d98..edaa6c277 100644
--- a/manifests/modules/automation/controlplanes/ack/.workshop/terraform/main.tf
+++ b/manifests/modules/automation/controlplanes/ack/.workshop/terraform/main.tf
@@ -1,7 +1,3 @@
-locals {
-  ddb_name = "ack-ddb"
-}
-
 provider "aws" {
   region = "us-east-1"
   alias  = "virginia"
@@ -73,7 +69,8 @@ module "eks_blueprints_addons" {
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export DYNAMODB_POLICY_ARN=${aws_iam_policy.carts_dynamo.arn}
 EOF
 }
diff --git a/manifests/modules/automation/controlplanes/ack/.workshop/terraform/vars.tf b/manifests/modules/automation/controlplanes/ack/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/automation/controlplanes/ack/.workshop/terraform/vars.tf
+++ b/manifests/modules/automation/controlplanes/ack/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/automation/controlplanes/crossplane/.workshop/terraform/main.tf b/manifests/modules/automation/controlplanes/crossplane/.workshop/terraform/main.tf
index d8ed25e4f..a3328fa20 100644
--- a/manifests/modules/automation/controlplanes/crossplane/.workshop/terraform/main.tf
+++ b/manifests/modules/automation/controlplanes/crossplane/.workshop/terraform/main.tf
@@ -138,7 +138,8 @@ module "eks_blueprints_addons" {
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export DYNAMODB_POLICY_ARN=${aws_iam_policy.carts_dynamo.arn}
 EOF
 }
diff --git a/manifests/modules/automation/controlplanes/crossplane/.workshop/terraform/vars.tf b/manifests/modules/automation/controlplanes/crossplane/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/automation/controlplanes/crossplane/.workshop/terraform/vars.tf
+++ b/manifests/modules/automation/controlplanes/crossplane/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/automation/gitops/argocd/.workshop/terraform/main.tf b/manifests/modules/automation/gitops/argocd/.workshop/terraform/main.tf
index 0d51898e9..5bbe4e6bf 100644
--- a/manifests/modules/automation/gitops/argocd/.workshop/terraform/main.tf
+++ b/manifests/modules/automation/gitops/argocd/.workshop/terraform/main.tf
@@ -98,7 +98,8 @@ resource "aws_iam_user_policy_attachment" "gitops_access" {
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export GITOPS_IAM_SSH_KEY_ID=${aws_iam_user_ssh_key.gitops.id}
 export GITOPS_IAM_SSH_USER=${aws_iam_user.gitops.unique_id}
 export GITOPS_REPO_URL_ARGOCD="ssh://${aws_iam_user_ssh_key.gitops.id}@git-codecommit.${data.aws_region.current.id}.amazonaws.com/v1/repos/${var.addon_context.eks_cluster_id}-argocd"
diff --git a/manifests/modules/automation/gitops/argocd/.workshop/terraform/vars.tf b/manifests/modules/automation/gitops/argocd/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/automation/gitops/argocd/.workshop/terraform/vars.tf
+++ b/manifests/modules/automation/gitops/argocd/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/automation/gitops/flux/.workshop/terraform/main.tf b/manifests/modules/automation/gitops/flux/.workshop/terraform/main.tf
index 2764a03ae..73a2d74bc 100644
--- a/manifests/modules/automation/gitops/flux/.workshop/terraform/main.tf
+++ b/manifests/modules/automation/gitops/flux/.workshop/terraform/main.tf
@@ -59,7 +59,8 @@ EOF
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export GITOPS_IAM_SSH_KEY_ID=${aws_iam_user_ssh_key.gitops.id}
 export GITOPS_IAM_SSH_USER=${aws_iam_user.gitops.unique_id}
 export IMAGE_URI_UI=${aws_ecr_repository.ecr_ui.repository_url}
@@ -260,7 +261,7 @@ resource "aws_iam_role" "codebuild_role" {
         {
           Effect   = "Allow"
           Action   = ["ecr:*"]
-          Resource = ["${aws_ecr_repository.ecr_ui.arn}"]
+          Resource = [aws_ecr_repository.ecr_ui.arn]
         },
         {
           Effect   = "Allow"
@@ -282,7 +283,7 @@ resource "aws_iam_role" "codebuild_role" {
             "s3:PutObject"
           ]
           Resource = [
-            "${aws_s3_bucket.build_artifact_bucket.arn}",
+            aws_s3_bucket.build_artifact_bucket.arn,
             "${aws_s3_bucket.build_artifact_bucket.arn}/*"
           ]
         },
diff --git a/manifests/modules/automation/gitops/flux/.workshop/terraform/vars.tf b/manifests/modules/automation/gitops/flux/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/automation/gitops/flux/.workshop/terraform/vars.tf
+++ b/manifests/modules/automation/gitops/flux/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/autoscaling/compute/cluster-autoscaler/.workshop/terraform/vars.tf b/manifests/modules/autoscaling/compute/cluster-autoscaler/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/autoscaling/compute/cluster-autoscaler/.workshop/terraform/vars.tf
+++ b/manifests/modules/autoscaling/compute/cluster-autoscaler/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/autoscaling/compute/karpenter/.workshop/terraform/main.tf b/manifests/modules/autoscaling/compute/karpenter/.workshop/terraform/main.tf
index 333ddb9f0..1fb63e972 100644
--- a/manifests/modules/autoscaling/compute/karpenter/.workshop/terraform/main.tf
+++ b/manifests/modules/autoscaling/compute/karpenter/.workshop/terraform/main.tf
@@ -32,7 +32,8 @@ module "eks_blueprints_addons" {
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export KARP_ROLE="${module.eks_blueprints_addons.karpenter.node_iam_role_name}"
 export KARP_ARN="${module.eks_blueprints_addons.karpenter.node_iam_role_arn}"
 EOF
diff --git a/manifests/modules/autoscaling/compute/karpenter/.workshop/terraform/vars.tf b/manifests/modules/autoscaling/compute/karpenter/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/autoscaling/compute/karpenter/.workshop/terraform/vars.tf
+++ b/manifests/modules/autoscaling/compute/karpenter/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/autoscaling/workloads/hpa/.workshop/terraform/vars.tf b/manifests/modules/autoscaling/workloads/hpa/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/autoscaling/workloads/hpa/.workshop/terraform/vars.tf
+++ b/manifests/modules/autoscaling/workloads/hpa/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/exposing/ingress/.workshop/terraform/vars.tf b/manifests/modules/exposing/ingress/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/exposing/ingress/.workshop/terraform/vars.tf
+++ b/manifests/modules/exposing/ingress/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/exposing/load-balancer/.workshop/terraform/vars.tf b/manifests/modules/exposing/load-balancer/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/exposing/load-balancer/.workshop/terraform/vars.tf
+++ b/manifests/modules/exposing/load-balancer/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/fundamentals/fargate/.workshop/terraform/main.tf b/manifests/modules/fundamentals/fargate/.workshop/terraform/main.tf
index 96670134e..660bdd358 100644
--- a/manifests/modules/fundamentals/fargate/.workshop/terraform/main.tf
+++ b/manifests/modules/fundamentals/fargate/.workshop/terraform/main.tf
@@ -1,10 +1,3 @@
-data "aws_vpc" "selected" {
-  tags = {
-    created-by = "eks-workshop-v2"
-    env        = var.addon_context.eks_cluster_id
-  }
-}
-
 data "aws_subnets" "private" {
   tags = {
     created-by = "eks-workshop-v2"
@@ -72,7 +65,8 @@ resource "aws_iam_role_policy_attachment" "cwlogs" {
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export FARGATE_IAM_PROFILE_ARN=${aws_iam_role.fargate.arn}
 %{for index, id in data.aws_subnets.private.ids}
 export PRIVATE_SUBNET_${index + 1}=${id}
diff --git a/manifests/modules/fundamentals/fargate/.workshop/terraform/vars.tf b/manifests/modules/fundamentals/fargate/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/fundamentals/fargate/.workshop/terraform/vars.tf
+++ b/manifests/modules/fundamentals/fargate/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/fundamentals/mng/graviton/.workshop/terraform/main.tf b/manifests/modules/fundamentals/mng/graviton/.workshop/terraform/main.tf
index 3dc0ac79c..7e0ed4793 100644
--- a/manifests/modules/fundamentals/mng/graviton/.workshop/terraform/main.tf
+++ b/manifests/modules/fundamentals/mng/graviton/.workshop/terraform/main.tf
@@ -38,7 +38,8 @@ resource "aws_iam_role" "graviton_node" {
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export GRAVITON_NODE_ROLE="${aws_iam_role.graviton_node.arn}"
 %{for index, id in data.aws_subnets.private.ids}
 export PRIMARY_SUBNET_${index + 1}=${id}
diff --git a/manifests/modules/fundamentals/mng/graviton/.workshop/terraform/vars.tf b/manifests/modules/fundamentals/mng/graviton/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/fundamentals/mng/graviton/.workshop/terraform/vars.tf
+++ b/manifests/modules/fundamentals/mng/graviton/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/fundamentals/mng/spot/.workshop/terraform/main.tf b/manifests/modules/fundamentals/mng/spot/.workshop/terraform/main.tf
index b20320ec5..697698430 100644
--- a/manifests/modules/fundamentals/mng/spot/.workshop/terraform/main.tf
+++ b/manifests/modules/fundamentals/mng/spot/.workshop/terraform/main.tf
@@ -38,7 +38,8 @@ resource "aws_iam_role" "spot_node" {
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export SPOT_NODE_ROLE="${aws_iam_role.spot_node.arn}"
 %{for index, id in data.aws_subnets.private.ids}
 export PRIMARY_SUBNET_${index + 1}=${id}
diff --git a/manifests/modules/fundamentals/mng/spot/.workshop/terraform/vars.tf b/manifests/modules/fundamentals/mng/spot/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/fundamentals/mng/spot/.workshop/terraform/vars.tf
+++ b/manifests/modules/fundamentals/mng/spot/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/fundamentals/storage/ebs/.workshop/terraform/main.tf b/manifests/modules/fundamentals/storage/ebs/.workshop/terraform/main.tf
index 506621d02..138e95f65 100644
--- a/manifests/modules/fundamentals/storage/ebs/.workshop/terraform/main.tf
+++ b/manifests/modules/fundamentals/storage/ebs/.workshop/terraform/main.tf
@@ -17,7 +17,8 @@ module "ebs_csi_driver_irsa" {
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export EBS_CSI_ADDON_ROLE="${module.ebs_csi_driver_irsa.iam_role_arn}"
 EOF
 }
diff --git a/manifests/modules/fundamentals/storage/ebs/.workshop/terraform/vars.tf b/manifests/modules/fundamentals/storage/ebs/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/fundamentals/storage/ebs/.workshop/terraform/vars.tf
+++ b/manifests/modules/fundamentals/storage/ebs/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/fundamentals/storage/efs/.workshop/terraform/main.tf b/manifests/modules/fundamentals/storage/efs/.workshop/terraform/main.tf
index e5a93ee37..bf1cbdb09 100644
--- a/manifests/modules/fundamentals/storage/efs/.workshop/terraform/main.tf
+++ b/manifests/modules/fundamentals/storage/efs/.workshop/terraform/main.tf
@@ -25,7 +25,8 @@ module "preprovision" {
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export EFS_CSI_ADDON_ROLE="${module.efs_csi_driver_irsa.iam_role_arn}"
 EOF
 }
diff --git a/manifests/modules/fundamentals/storage/efs/.workshop/terraform/preprovision/vars.tf b/manifests/modules/fundamentals/storage/efs/.workshop/terraform/preprovision/vars.tf
index e779aeb12..687fee620 100644
--- a/manifests/modules/fundamentals/storage/efs/.workshop/terraform/preprovision/vars.tf
+++ b/manifests/modules/fundamentals/storage/efs/.workshop/terraform/preprovision/vars.tf
@@ -1,7 +1,11 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
diff --git a/manifests/modules/fundamentals/storage/efs/.workshop/terraform/vars.tf b/manifests/modules/fundamentals/storage/efs/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/fundamentals/storage/efs/.workshop/terraform/vars.tf
+++ b/manifests/modules/fundamentals/storage/efs/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/main.tf b/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/main.tf
index 7b8b060e0..3f4510bf7 100644
--- a/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/main.tf
+++ b/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/main.tf
@@ -44,7 +44,7 @@ resource "aws_fsx_ontap_file_system" "fsxnassets" {
   preferred_subnet_id = data.aws_subnets.private_subnets_fsx.ids[0]
   security_group_ids  = [aws_security_group.fsxn.id]
   fsx_admin_password  = random_string.fsx_password.result
-  route_table_ids     = data.aws_route_table.private.*.id
+  route_table_ids     = [for rt in data.aws_route_table.private : rt.id]
 
   tags = merge(
     var.tags,
@@ -91,7 +91,8 @@ resource "aws_security_group_rule" "fsxn_outbound" {
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export FSXN_ID=${aws_fsx_ontap_file_system.fsxnassets.id}
 export FSXN_ADMIN_PASSWORD=${random_string.fsx_password.result}
 export FSXN_IP="${tolist(aws_fsx_ontap_file_system.fsxnassets.endpoints[0].management[0].ip_addresses)[0]}"
diff --git a/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/vars.tf b/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/vars.tf
+++ b/manifests/modules/fundamentals/storage/fsxn/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/networking/custom-networking/.workshop/terraform/main.tf b/manifests/modules/networking/custom-networking/.workshop/terraform/main.tf
index f3a214ee9..1fcbf83ad 100644
--- a/manifests/modules/networking/custom-networking/.workshop/terraform/main.tf
+++ b/manifests/modules/networking/custom-networking/.workshop/terraform/main.tf
@@ -84,18 +84,17 @@ resource "aws_iam_role" "custom_networking_node" {
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export VPC_ID=${data.aws_vpc.selected.id}
 export EKS_CLUSTER_SECURITY_GROUP_ID=${var.cluster_security_group_id}
 export CUSTOM_NETWORKING_NODE_ROLE="${aws_iam_role.custom_networking_node.arn}"
 %{for index, id in data.aws_subnets.private.ids}
 export PRIMARY_SUBNET_${index + 1}=${id}
 %{endfor}
-%{for index, id in aws_subnet.in_secondary_cidr.*.id}
-export SECONDARY_SUBNET_${index + 1}=${id}
-%{endfor}
-%{for index, az in aws_subnet.in_secondary_cidr.*.availability_zone}
-export SUBNET_AZ_${index + 1}=${az}
+%{for index, cidr in aws_subnet.in_secondary_cidr}
+export SECONDARY_SUBNET_${index + 1}=${cidr.id}
+export SUBNET_AZ_${index + 1}=${cidr.az}
 %{endfor}
 EOF
 }
diff --git a/manifests/modules/networking/custom-networking/.workshop/terraform/vars.tf b/manifests/modules/networking/custom-networking/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/networking/custom-networking/.workshop/terraform/vars.tf
+++ b/manifests/modules/networking/custom-networking/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/networking/network-policies/.workshop/terraform/vars.tf b/manifests/modules/networking/network-policies/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/networking/network-policies/.workshop/terraform/vars.tf
+++ b/manifests/modules/networking/network-policies/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/networking/securitygroups-for-pods/.workshop/terraform/main.tf b/manifests/modules/networking/securitygroups-for-pods/.workshop/terraform/main.tf
index 2255c4839..0916e9616 100644
--- a/manifests/modules/networking/securitygroups-for-pods/.workshop/terraform/main.tf
+++ b/manifests/modules/networking/securitygroups-for-pods/.workshop/terraform/main.tf
@@ -32,7 +32,8 @@ module "preprovision" {
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export VPC_ID=${data.aws_vpc.this.id}
 EOF
 }
diff --git a/manifests/modules/networking/securitygroups-for-pods/.workshop/terraform/preprovision/vars.tf b/manifests/modules/networking/securitygroups-for-pods/.workshop/terraform/preprovision/vars.tf
index e779aeb12..687fee620 100644
--- a/manifests/modules/networking/securitygroups-for-pods/.workshop/terraform/preprovision/vars.tf
+++ b/manifests/modules/networking/securitygroups-for-pods/.workshop/terraform/preprovision/vars.tf
@@ -1,7 +1,11 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
diff --git a/manifests/modules/networking/securitygroups-for-pods/.workshop/terraform/vars.tf b/manifests/modules/networking/securitygroups-for-pods/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/networking/securitygroups-for-pods/.workshop/terraform/vars.tf
+++ b/manifests/modules/networking/securitygroups-for-pods/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/networking/vpc-lattice/.workshop/terraform/main.tf b/manifests/modules/networking/vpc-lattice/.workshop/terraform/main.tf
index 2395e6c82..deb4e8d9a 100644
--- a/manifests/modules/networking/vpc-lattice/.workshop/terraform/main.tf
+++ b/manifests/modules/networking/vpc-lattice/.workshop/terraform/main.tf
@@ -66,7 +66,8 @@ data "aws_vpc" "this" {
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export VPC_ID=${data.aws_vpc.this.id}
 export LATTICE_IAM_ROLE="${module.iam_assumable_role_lattice.iam_role_arn}"
 EOF
diff --git a/manifests/modules/networking/vpc-lattice/.workshop/terraform/vars.tf b/manifests/modules/networking/vpc-lattice/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/networking/vpc-lattice/.workshop/terraform/vars.tf
+++ b/manifests/modules/networking/vpc-lattice/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/observability/container-insights/.workshop/terraform/main.tf b/manifests/modules/observability/container-insights/.workshop/terraform/main.tf
index 6791bf094..34b1f221e 100644
--- a/manifests/modules/observability/container-insights/.workshop/terraform/main.tf
+++ b/manifests/modules/observability/container-insights/.workshop/terraform/main.tf
@@ -1,6 +1,6 @@
 data "aws_partition" "current" {}
 
-module "adot-operator" {
+module "adot_operator" {
   source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.25.0//modules/kubernetes-addons/opentelemetry-operator"
 
   addon_config = {
@@ -27,12 +27,13 @@ module "iam_assumable_role_adot_ci" {
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export ADOT_IAM_ROLE_CI="${module.iam_assumable_role_adot_ci.iam_role_arn}"
 EOF
 }
 
-resource "aws_cloudwatch_dashboard" "order-metrics-ci" {
+resource "aws_cloudwatch_dashboard" "order_metrics_ci" {
   dashboard_name = "Order-Service-Metrics-1"
 
   dashboard_body = jsonencode(
diff --git a/manifests/modules/observability/container-insights/.workshop/terraform/vars.tf b/manifests/modules/observability/container-insights/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/observability/container-insights/.workshop/terraform/vars.tf
+++ b/manifests/modules/observability/container-insights/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/observability/kubecost/.workshop/terraform/vars.tf b/manifests/modules/observability/kubecost/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/observability/kubecost/.workshop/terraform/vars.tf
+++ b/manifests/modules/observability/kubecost/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/observability/logging/pods/.workshop/terraform/main.tf b/manifests/modules/observability/logging/pods/.workshop/terraform/main.tf
index cafc62dd1..9311f674e 100644
--- a/manifests/modules/observability/logging/pods/.workshop/terraform/main.tf
+++ b/manifests/modules/observability/logging/pods/.workshop/terraform/main.tf
@@ -7,7 +7,7 @@ locals {
   cw_log_group_name = "/${var.addon_context.eks_cluster_id}/worker-fluentbit-logs-${random_string.fluentbit_log_group.result}"
 }
 
-module "aws-for-fluentbit" {
+module "aws_for_fluentbit" {
   source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.32.1//modules/kubernetes-addons/aws-for-fluentbit"
 
   cw_log_group_name = local.cw_log_group_name
@@ -16,7 +16,8 @@ module "aws-for-fluentbit" {
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export CLOUDWATCH_LOG_GROUP_NAME="${local.cw_log_group_name}"
 EOF
 }
diff --git a/manifests/modules/observability/logging/pods/.workshop/terraform/vars.tf b/manifests/modules/observability/logging/pods/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/observability/logging/pods/.workshop/terraform/vars.tf
+++ b/manifests/modules/observability/logging/pods/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/observability/opensearch/.workshop/terraform/main.tf b/manifests/modules/observability/opensearch/.workshop/terraform/main.tf
index a2f8b0d8f..75070f93f 100644
--- a/manifests/modules/observability/opensearch/.workshop/terraform/main.tf
+++ b/manifests/modules/observability/opensearch/.workshop/terraform/main.tf
@@ -24,7 +24,7 @@ locals {
   cw_logs_arn_prefix   = "arn:aws:logs:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}"
   lambda_function_name = "${var.addon_context.eks_cluster_id}-control-plane-logs"
 
-  // ARNs for Lambda Extension Layer that provides caching of SSM parameter store values
+  # ARNs for Lambda Extension Layer that provides caching of SSM parameter store values
   parameter_lambda_extension_arns = {
     af-south-1     = "arn:aws:lambda:af-south-1:317013901791:layer:AWS-Parameters-and-Secrets-Lambda-Extension:11",
     ap-east-1      = "arn:aws:lambda:ap-east-1:768336418462:layer:AWS-Parameters-and-Secrets-Lambda-Extension:11",
@@ -61,17 +61,17 @@ locals {
   }
 }
 
-// Random suffix for IAM roles, policies
+# Random suffix for IAM roles, policies
 resource "random_string" "suffix" {
   length  = 6
   special = false
 }
 
-// Lambda execution role for OpenSearch exporter
+# Lambda execution role for OpenSearch exporter
 resource "aws_iam_role" "lambda_execution_role" {
   name = "${local.lambda_function_name}-Role-${random_string.suffix.result}"
 
-  // Trust relationship 
+  # Trust relationship 
   assume_role_policy = jsonencode({
     "Version" : "2012-10-17",
     "Statement" : [
@@ -86,10 +86,10 @@ resource "aws_iam_role" "lambda_execution_role" {
     ]
   })
 
-  // Attach inline policies for Lambda function to: 
-  //    Write to OpenSearch index
-  //    Get SSM parameter with OpenSearch host 
-  //    Write CloudWatch logs for this Lambda function
+  # Attach inline policies for Lambda function to: 
+  #    Write to OpenSearch index
+  #    Get SSM parameter with OpenSearch host 
+  #    Write CloudWatch logs for this Lambda function
   inline_policy {
     name = "policy-${random_string.suffix.result}"
     policy = jsonencode({
@@ -120,21 +120,21 @@ resource "aws_iam_role" "lambda_execution_role" {
   }
 }
 
-// Create ZIP file with Lambda code
+# Create ZIP file with Lambda code
 data "archive_file" "lambda" {
   type        = "zip"
   source_file = "${path.module}/lambda/logs-to-opensearch.js"
   output_path = "${path.module}/function.zip"
 }
 
-// Create Lambda function to export logs to OpenSearch
+# Create Lambda function to export logs to OpenSearch
 resource "aws_lambda_function" "eks_control_plane_logs_to_opensearch" {
   filename      = "${path.module}/function.zip"
   function_name = local.lambda_function_name
   role          = aws_iam_role.lambda_execution_role.arn
   handler       = "logs-to-opensearch.handler"
 
-  // Attach Lambda Layer for AWS Parameters and Secrets Lambda Extension ARNs
+  # Attach Lambda Layer for AWS Parameters and Secrets Lambda Extension ARNs
   layers = [local.parameter_lambda_extension_arns[data.aws_region.current.name]]
 
   source_code_hash = data.archive_file.lambda.output_base64sha256
@@ -150,11 +150,11 @@ resource "aws_lambda_function" "eks_control_plane_logs_to_opensearch" {
   }
 }
 
-// Enable CloudWatch Logs to invoke Lambda function that exports to OpenSearch. 
-// This sets up resource-based policy for Lambda.  Note that source ARN for the EKS 
-// control plane log group has not yet been created at the time of terraform apply.  
-// The logs group is created later when workshop participant (manually) run the 
-// step to enable EKS Control Plane Logs.  
+# Enable CloudWatch Logs to invoke Lambda function that exports to OpenSearch. 
+# This sets up resource-based policy for Lambda.  Note that source ARN for the EKS 
+# control plane log group has not yet been created at the time of terraform apply.  
+# The logs group is created later when workshop participant (manually) run the 
+# step to enable EKS Control Plane Logs.  
 resource "aws_lambda_permission" "allow_cloudwatch_to_invoke_lambda" {
   statement_id  = "AllowExecutionFromCloudWatch_${random_string.suffix.result}"
   action        = "lambda:InvokeFunction"
@@ -172,7 +172,8 @@ module "preprovision" {
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export LAMBDA_ARN="${aws_lambda_function.eks_control_plane_logs_to_opensearch.arn}"
 export LAMBDA_ROLE_ARN="${aws_iam_role.lambda_execution_role.arn}"
 EOF
diff --git a/manifests/modules/observability/opensearch/.workshop/terraform/preprovision/main.tf b/manifests/modules/observability/opensearch/.workshop/terraform/preprovision/main.tf
index f70024074..a6d856447 100644
--- a/manifests/modules/observability/opensearch/.workshop/terraform/preprovision/main.tf
+++ b/manifests/modules/observability/opensearch/.workshop/terraform/preprovision/main.tf
@@ -15,12 +15,12 @@ locals {
   opensearch_parameter_path = "/eksworkshop/${var.eks_cluster_id}/opensearch"
 }
 
-// Provision OpenSearch domain
+# Provision OpenSearch domain
 resource "aws_opensearch_domain" "opensearch" {
   domain_name    = var.eks_cluster_id
   engine_version = "OpenSearch_2.9"
 
-  // Specify a single instance cluster
+  # Specify a single instance cluster
   cluster_config {
     instance_count         = 1
     instance_type          = "r6g.large.search"
@@ -55,7 +55,7 @@ resource "aws_opensearch_domain" "opensearch" {
     }
   }
 
-  // Allow any IP address to access the OpenSearch domain
+  # Allow any IP address to access the OpenSearch domain
   access_policies = jsonencode(
     {
       "Version" : "2012-10-17",
@@ -71,7 +71,7 @@ resource "aws_opensearch_domain" "opensearch" {
       ]
   })
 
-  // Extend timeouts from 20m default
+  # Extend timeouts from 20m default
   timeouts {
     create = "1h"
     update = "1h"
@@ -81,7 +81,7 @@ resource "aws_opensearch_domain" "opensearch" {
   tags = var.tags
 }
 
-// Generate random master user password for OpenSearch
+# Generate random master user password for OpenSearch
 resource "random_password" "master_user" {
   length           = 16
   special          = true
@@ -92,7 +92,7 @@ resource "random_password" "master_user" {
   override_special = "@#"
 }
 
-// Store OpenSearch host in parameter store
+# Store OpenSearch host in parameter store
 resource "aws_ssm_parameter" "opensearch_host" {
   name        = "${local.opensearch_parameter_path}/host"
   description = "OpenSearch domain host endpoint"
@@ -102,7 +102,7 @@ resource "aws_ssm_parameter" "opensearch_host" {
   tags = var.tags
 }
 
-// Store OpenSearch user name in parameter store
+# Store OpenSearch user name in parameter store
 resource "aws_ssm_parameter" "opensearch_user" {
   name        = "${local.opensearch_parameter_path}/user"
   description = "OpenSearch domain user name"
@@ -112,7 +112,7 @@ resource "aws_ssm_parameter" "opensearch_user" {
   tags = var.tags
 }
 
-// Store OpenSearch password in parameter store
+# Store OpenSearch password in parameter store
 resource "aws_ssm_parameter" "opensearch_password" {
   name        = "${local.opensearch_parameter_path}/password"
   description = "OpenSearch domain password"
diff --git a/manifests/modules/observability/opensearch/.workshop/terraform/preprovision/vars.tf b/manifests/modules/observability/opensearch/.workshop/terraform/preprovision/vars.tf
index e779aeb12..687fee620 100644
--- a/manifests/modules/observability/opensearch/.workshop/terraform/preprovision/vars.tf
+++ b/manifests/modules/observability/opensearch/.workshop/terraform/preprovision/vars.tf
@@ -1,7 +1,11 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
diff --git a/manifests/modules/observability/opensearch/.workshop/terraform/vars.tf b/manifests/modules/observability/opensearch/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/observability/opensearch/.workshop/terraform/vars.tf
+++ b/manifests/modules/observability/opensearch/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/observability/oss-metrics/.workshop/terraform/main.tf b/manifests/modules/observability/oss-metrics/.workshop/terraform/main.tf
index 4b4c3201e..55a5372ad 100644
--- a/manifests/modules/observability/oss-metrics/.workshop/terraform/main.tf
+++ b/manifests/modules/observability/oss-metrics/.workshop/terraform/main.tf
@@ -1,6 +1,6 @@
 data "aws_partition" "current" {}
 
-module "aws-ebs-csi-driver" {
+module "aws_ebs_csi_driver" {
   source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.25.0//modules/kubernetes-addons/aws-ebs-csi-driver"
 
   enable_amazon_eks_aws_ebs_csi_driver = true
@@ -31,13 +31,13 @@ module "eks_blueprints_addons" {
 resource "time_sleep" "blueprints_addons_sleep" {
   depends_on = [
     module.eks_blueprints_addons,
-    module.aws-ebs-csi-driver
+    aws_ebs_csi_driver
   ]
 
   create_duration = "15s"
 }
 
-module "adot-operator" {
+module "adot_operator" {
   source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.25.0//modules/kubernetes-addons/opentelemetry-operator"
 
   depends_on = [
@@ -55,22 +55,6 @@ module "adot-operator" {
   addon_context = var.addon_context
 }
 
-#resource "aws_eks_addon" "example" {
-#  depends_on = [
-#    time_sleep.blueprints_addons_sleep
-#  ]
-#
-#  cluster_name                = var.addon_context.eks_cluster_id
-#  addon_name                  = "adot"
-#  addon_version               = "v0.88.0-eksbuild.1"
-#  resolve_conflicts_on_create = "OVERWRITE"
-#
-#  configuration_values = jsonencode({
-#    "collector": {
-#    }
-#  })
-#}
-
 resource "aws_prometheus_workspace" "this" {
   alias = var.addon_context.eks_cluster_id
 
@@ -101,9 +85,8 @@ module "eks_blueprints_kubernetes_grafana_addon" {
   source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.25.0//modules/kubernetes-addons/grafana"
 
   depends_on = [
-    module.aws-ebs-csi-driver,
     time_sleep.blueprints_addons_sleep,
-    kubernetes_config_map.order-service-metrics-dashboard
+    kubernetes_config_map.order_service_metrics_dashboard
   ]
 
   addon_context = var.addon_context
@@ -120,7 +103,7 @@ module "eks_blueprints_kubernetes_grafana_addon" {
   }
 }
 
-resource "kubernetes_config_map" "order-service-metrics-dashboard" {
+resource "kubernetes_config_map" "order_service_metrics_dashboard" {
   metadata {
     name      = "order-service-metrics-dashboard"
     namespace = kubernetes_namespace.grafana.metadata[0].name
@@ -417,7 +400,8 @@ resource "aws_iam_policy" "grafana" {
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export AMP_ENDPOINT="${aws_prometheus_workspace.this.prometheus_endpoint}"
 export ADOT_IAM_ROLE="${module.iam_assumable_role_adot.iam_role_arn}"
 EOF
diff --git a/manifests/modules/observability/oss-metrics/.workshop/terraform/vars.tf b/manifests/modules/observability/oss-metrics/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/observability/oss-metrics/.workshop/terraform/vars.tf
+++ b/manifests/modules/observability/oss-metrics/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
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 34287f839..d0bec74c8 100644
--- a/manifests/modules/security/eks-pod-identity/.workshop/terraform/main.tf
+++ b/manifests/modules/security/eks-pod-identity/.workshop/terraform/main.tf
@@ -220,7 +220,8 @@ data "aws_iam_policy_document" "cmk_dynamodb" {
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export CARTS_DYNAMODB_TABLENAME="${aws_dynamodb_table.carts.name}"
 export CARTS_IAM_ROLE="${module.iam_assumable_role_carts.iam_role_arn}"
 EOF
diff --git a/manifests/modules/security/eks-pod-identity/.workshop/terraform/vars.tf b/manifests/modules/security/eks-pod-identity/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/security/eks-pod-identity/.workshop/terraform/vars.tf
+++ b/manifests/modules/security/eks-pod-identity/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/security/irsa/.workshop/terraform/main.tf b/manifests/modules/security/irsa/.workshop/terraform/main.tf
index 6952ac868..c4ac5835d 100644
--- a/manifests/modules/security/irsa/.workshop/terraform/main.tf
+++ b/manifests/modules/security/irsa/.workshop/terraform/main.tf
@@ -219,7 +219,8 @@ data "aws_iam_policy_document" "cmk_dynamodb" {
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export CARTS_DYNAMODB_TABLENAME="${aws_dynamodb_table.carts.name}"
 export CARTS_IAM_ROLE="${module.iam_assumable_role_carts.iam_role_arn}"
 EOF
diff --git a/manifests/modules/security/irsa/.workshop/terraform/vars.tf b/manifests/modules/security/irsa/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/security/irsa/.workshop/terraform/vars.tf
+++ b/manifests/modules/security/irsa/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/security/kyverno/.workshop/terraform/main.tf b/manifests/modules/security/kyverno/.workshop/terraform/main.tf
index b1853f3a5..43953421f 100644
--- a/manifests/modules/security/kyverno/.workshop/terraform/main.tf
+++ b/manifests/modules/security/kyverno/.workshop/terraform/main.tf
@@ -10,7 +10,7 @@ module "kyverno" {
   repository       = "https://kyverno.github.io/kyverno/"
 }
 
-module "kyverno-policies" {
+module "kyverno_policies" {
   source  = "aws-ia/eks-blueprints-addon/aws"
   version = "~> 1.1"
 
@@ -28,7 +28,7 @@ module "kyverno-policies" {
   depends_on = [module.kyverno]
 }
 
-module "policy-reporter" {
+module "policy_reporter" {
   source  = "aws-ia/eks-blueprints-addon/aws"
   version = "~> 1.1"
 
diff --git a/manifests/modules/security/kyverno/.workshop/terraform/vars.tf b/manifests/modules/security/kyverno/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/security/kyverno/.workshop/terraform/vars.tf
+++ b/manifests/modules/security/kyverno/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/manifests/modules/security/secrets-manager/.workshop/terraform/main.tf b/manifests/modules/security/secrets-manager/.workshop/terraform/main.tf
index de85685c0..0410ce250 100644
--- a/manifests/modules/security/secrets-manager/.workshop/terraform/main.tf
+++ b/manifests/modules/security/secrets-manager/.workshop/terraform/main.tf
@@ -2,7 +2,7 @@ data "aws_caller_identity" "current" {}
 data "aws_partition" "current" {}
 data "aws_region" "current" {}
 
-module "secrets-store-csi-driver" {
+module "secrets_store_csi_driver" {
   source = "github.com/aws-ia/terraform-aws-eks-blueprints?ref=v4.32.1//modules/kubernetes-addons/secrets-store-csi-driver"
 
   helm_config = {
@@ -87,7 +87,8 @@ POLICY
 }
 
 output "environment" {
-  value = <<EOF
+  description = "Evaluated by the IDE shell"
+  value       = <<EOF
 export CATALOG_IAM_ROLE="${module.secrets_manager_role.iam_role_arn}"
 EOF
 }
diff --git a/manifests/modules/security/secrets-manager/.workshop/terraform/vars.tf b/manifests/modules/security/secrets-manager/.workshop/terraform/vars.tf
index 569c47683..812087dc5 100644
--- a/manifests/modules/security/secrets-manager/.workshop/terraform/vars.tf
+++ b/manifests/modules/security/secrets-manager/.workshop/terraform/vars.tf
@@ -1,23 +1,35 @@
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_id" {
-  type = string
+  description = "EKS cluster name"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "eks_cluster_version" {
-  type = string
+  description = "EKS cluster version"
+  type        = string
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "cluster_security_group_id" {
-  type = any
+  description = "EKS cluster security group ID"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "addon_context" {
-  type = any
+  description = "Addon context that can be passed directly to blueprints addon modules"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "tags" {
-  type = any
+  description = "Tags to apply to AWS resources"
+  type        = any
 }
 
+# tflint-ignore: terraform_unused_declarations
 variable "resources_precreated" {
-  type = bool
+  description = "Have expensive resources been created already"
+  type        = bool
 }
diff --git a/test/terraform/main.tf b/test/terraform/main.tf
deleted file mode 100644
index 93f024d3c..000000000
--- a/test/terraform/main.tf
+++ /dev/null
@@ -1,11 +0,0 @@
-terraform {
-  backend "s3" {}
-
-  required_version = ">= 1.3.7"
-}
-
-module "core" {
-  source = "../../terraform"
-
-  environment_suffix = var.environment_suffix
-}
diff --git a/test/terraform/outputs.tf b/test/terraform/outputs.tf
deleted file mode 100644
index 13f241c24..000000000
--- a/test/terraform/outputs.tf
+++ /dev/null
@@ -1,15 +0,0 @@
-output "eks_cluster_id" {
-  description = "Identifier for the cluster"
-  value       = module.core.eks_cluster_id
-}
-
-output "iam_role_arn" {
-  description = "IAM role ARN created for local shell"
-  value       = module.core.iam_role_arn
-}
-
-output "environment_variables" {
-  description = "Environment variables that will be injected in to the shell"
-  value       = module.core.environment_variables
-  sensitive   = true
-}
diff --git a/test/terraform/variables.tf b/test/terraform/variables.tf
deleted file mode 100644
index bcd0029ab..000000000
--- a/test/terraform/variables.tf
+++ /dev/null
@@ -1,5 +0,0 @@
-variable "environment_suffix" {
-  type        = string
-  description = "Suffix for the workshop environment name"
-  default     = ""
-}