diff --git a/.github/workflows/automatic.yml b/.github/workflows/automatic.yml
index 68ff24d..c255fe9 100644
--- a/.github/workflows/automatic.yml
+++ b/.github/workflows/automatic.yml
@@ -78,7 +78,7 @@ jobs:
         id: plan
         run: |
           set -o pipefail -ex
-          terraform plan -compact-warnings -no-color -input=false -lock-timeout=5m -out tfplan 2>&1 \
+          terraform plan -compact-warnings -no-color -input=false -lock=false -out tfplan 2>&1 \
             | tee terraform_log
           terraform show -json tfplan > tfplan.json
 
@@ -154,7 +154,7 @@ jobs:
         id: plan-cost
         run: |
           set -o pipefail -ex
-          terraform plan -compact-warnings -no-color -input=false -lock-timeout=5m -out tfplan-cost 2>&1
+          terraform plan -compact-warnings -no-color -input=false -lock=false -out tfplan-cost 2>&1
           terraform show -json tfplan-cost > tfplan-cost.json
 
       - uses: overmindtech/cost-signals-action@v1
diff --git a/modules/scenarios/main.tf b/modules/scenarios/main.tf
index 01ab60f..4392922 100644
--- a/modules/scenarios/main.tf
+++ b/modules/scenarios/main.tf
@@ -20,8 +20,8 @@ module "vpc" {
   # we expect this to be fixed over the coming weeks, as of 23/6/2025
   version = "< 6.0"
 
-  name = "workloads-${var.example_env}"
-  cidr = "10.0.0.0/16"
+  name = "workloads-ultra-clean-test"
+  cidr = "172.16.0.0/16"
 
   default_security_group_egress = [
     {
@@ -66,7 +66,7 @@ module "vpc" {
   }
 }
 
-# Memory optimization demo scenario
+# Memory optimization demo scenario - ENABLED with clean defaults
 module "memory_optimization" {
   source = "./memory-optimization"
   
@@ -78,10 +78,10 @@ module "memory_optimization" {
   vpc_id = module.vpc.vpc_id
   subnet_ids = module.vpc.public_subnets
   
-  # Demo configuration
-  name_prefix = "scenarios-memory-demo"
-  container_memory = var.memory_optimization_container_memory
-  number_of_containers = var.memory_optimization_container_count
+  # Demo configuration - using clean defaults
+  name_prefix = "scenarios-clean-test"
+  container_memory = 2048  # Clean default, no memory reduction
+  number_of_containers = 1
   
   # Context for the demo
   days_until_black_friday = var.days_until_black_friday