diff --git a/examples/deploy/terraform/infra.tfvars b/examples/deploy/terraform/infra.tfvars
index deef1a0e..4bf6dc02 100644
--- a/examples/deploy/terraform/infra.tfvars
+++ b/examples/deploy/terraform/infra.tfvars
@@ -1,103 +1,36 @@
-additional_node_groups = {}
-bastion                = null
-default_node_groups    = null
-deploy_id              = null
-domino_cur = {
-  provision_cost_usage_report = false
-}
-eks = {
-  cluster_addons     = null
-  creation_role_name = null
-  custom_role_maps   = null
-  identity_providers = null
-  k8s_version        = null
-  kubeconfig = {
-    extra_args = null
-    path       = null
-  }
-  master_role_names = null
-  nodes_master      = false
-  public_access = {
-    cidrs   = null
-    enabled = null
-  }
-  service_ipv4_cidr  = null
-  ssm_log_group_name = null
-  vpc_cni            = null
-}
-ignore_tags = []
-kms         = null
-network = {
-  cidrs = {
-    pod = "100.64.0.0/16"
-    vpc = "10.0.0.0/16"
-  }
-  network_bits = {
-    pod     = 19
-    private = 19
-    public  = 27
-  }
-  use_pod_cidr = true
-  vpc = {
-    id = null
-    subnets = {
-      pod     = []
-      private = []
-      public  = []
+deploy_id        = "miguel-test-dp"
+region           = "us-west-2"
+ssh_pvt_key_path = "/Users/miguel.harmant/src/dominodatalab/terraform-aws-eks/tests/domino.pem"
+
+default_node_groups = null
+additional_node_groups = {
+  dataplane = {
+    instance_types        = ["m6i.2xlarge"]
+    min_per_az            = 0
+    max_per_az            = 10
+    desired_per_az        = 1
+    availability_zone_ids = ["usw2-az1", "usw2-az2"]
+    labels = {
+      "dominodatalab.com/node-pool" = "dataplane"
     }
-  }
-}
-region           = null
-ssh_pvt_key_path = null
-storage = {
-  costs_enabled = true
-  ecr = {
-    force_destroy_on_deletion = true
-  }
-  efs = {
-    access_point_path = "/domino"
-    backup_vault = {
-      backup = {
-        cold_storage_after = 35
-        delete_after       = 125
-        schedule           = "0 12 * * ? *"
-      }
-      create        = true
-      force_destroy = true
-    }
-  }
-  enable_remote_backup = false
-  filesystem_type      = "efs"
-  netapp = {
-    automatic_backup_retention_days   = 90
-    daily_automatic_backup_start_time = "00:00"
-    deployment_type                   = "SINGLE_AZ_1"
-    migrate_from_efs = {
-      datasync = {
-        enabled  = true
-        schedule = "cron(0 * * * ? *)"
-      }
-      enabled = true
-    }
-    storage_capacity = 1024
-    storage_capacity_autosizing = {
-      enabled                    = false
-      notification_email_address = ""
-      percent_capacity_increase  = 30
-      threshold                  = 70
-    }
-    throughput_capacity = 128
     volume = {
-      create                     = true
-      junction_path              = "/domino"
-      name_suffix                = "domino_shared_storage"
-      size_in_megabytes          = 1099511
-      storage_efficiency_enabled = true
+      size = 100
+      type = "gp3"
     }
   }
-  s3 = {
-    force_destroy_on_deletion = true
-  }
 }
-tags              = null
-use_fips_endpoint = false
+
+bastion = {
+  enabled = false
+}
+
+storage = {
+  s3              = { "create" : false }
+  ecr             = { "create" : false }
+  filesystem_type = "none"
+}
+
+kms = {
+  enabled = false
+}
+tags = null
diff --git a/examples/deploy/terraform/infra/outputs.tf b/examples/deploy/terraform/infra/outputs.tf
index 2abf30fe..6863cd17 100644
--- a/examples/deploy/terraform/infra/outputs.tf
+++ b/examples/deploy/terraform/infra/outputs.tf
@@ -21,13 +21,13 @@ output "domino_config_values" {
       }
     }
     internal_docker_registry = {
-      s3_override = {
+      s3_override = var.storage.s3.create ? {
         region         = var.region
         bucket         = module.infra.storage.s3.buckets.registry.bucket_name
         sse_kms_key_id = module.infra.kms.key_arn
-      }
+      } : null
     }
-    external_docker_registry = module.infra.storage.ecr.container_registry
+    external_docker_registry = var.storage.ecr.create ? module.infra.storage.ecr.container_registry : null
     storage_classes = {
       block = {
         parameters = {
@@ -35,29 +35,29 @@ output "domino_config_values" {
         }
       }
       shared = {
-        efs = {
+        efs = var.storage.filesystem_type != "none" ? {
           region          = var.region
           filesystem_id   = module.infra.storage.efs.file_system.id
           access_point_id = module.infra.storage.efs.access_point.id
-        }
+        } : null
       }
       blob_storage = {
-        projects = {
+        projects = var.storage.s3.create ? {
           region         = var.region
           bucket         = module.infra.storage.s3.buckets.blobs.bucket_name
           sse_kms_key_id = module.infra.kms.key_arn
-        }
-        logs = {
+        } : null
+        logs = var.storage.s3.create ? {
           region         = var.region
           bucket         = module.infra.storage.s3.buckets.logs.bucket_name
           sse_kms_key_id = module.infra.kms.key_arn
 
-        }
-        backups = {
+        } : null
+        backups = var.storage.s3.create ? {
           region         = var.region
           bucket         = module.infra.storage.s3.buckets.backups.bucket_name
           sse_kms_key_id = module.infra.kms.key_arn
-        }
+        } : null
         monitoring = {
           region = var.region
           bucket = module.infra.storage.s3.buckets.monitoring.bucket_name