diff --git a/blueprints/02-at-scale/README.md b/blueprints/02-at-scale/README.md
index 28ac79b..a7bf8c5 100644
--- a/blueprints/02-at-scale/README.md
+++ b/blueprints/02-at-scale/README.md
@@ -40,8 +40,8 @@ Once you have familiarized yourself with the [Getting Started blueprint](../01-g
 |------|-------------|
 | acm_certificate_arn | ACM certificate ARN |
 | aws_backup_efs_protected_resource | AWS Backup Protected Resource descriction for EFS Drive. |
-| cbcd_helm | Helm configuration for CloudBees CI Add-on. It is accesible only via state files. |
-| cbcd_namespace | Namespace for CloudBees CI Add-on. |
+| cbcd_helm | Helm configuration for CloudBees CD Add-on. It is accesible only via state files. |
+| cbcd_namespace | Namespace for CloudBees CD Add-on. |
 | cbcd_password | command to get the admin password of Cloudbees CD |
 | cbcd_url | URL of the CloudBees CD Operations Center for CloudBees CD Add-on. |
 | efs_access_points | EFS Access Points. |
diff --git a/blueprints/02-at-scale/img/at-scale.k8s.drawio.svg b/blueprints/02-at-scale/img/at-scale.k8s.drawio.svg
index 93a4216..428f1c0 100644
--- a/blueprints/02-at-scale/img/at-scale.k8s.drawio.svg
+++ b/blueprints/02-at-scale/img/at-scale.k8s.drawio.svg
@@ -301,18 +301,15 @@
                style="box-sizing: border-box; font-size: 0px; text-align: left;">
               <xhtml:div
                  style="display: inline-block; font-size: 15px; font-family: Helvetica; color: rgb(102, 102, 102); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><xhtml:i>
-                                    cbci
+                                    cbcd
                                 </xhtml:i>
 
 
                                 (Services)
                                 <xhtml:br />
 <xhtml:i>
-                                    cbci-agents
+                                    cbcd-agents
                                 </xhtml:i>
-
-
-                                (Builds)
                             </xhtml:div>
             </xhtml:div>
           </xhtml:div>
@@ -1256,7 +1253,7 @@
                 <xhtml:font
                    style="background-color: rgb(77, 153, 0); font-size: 14px;"
                    color="#ffffff">
-                                    /cbci
+                                    /cbcd
                                 </xhtml:font>
               </xhtml:div>
             </xhtml:div>
diff --git a/blueprints/02-at-scale/k8s/cbcd-values.yml b/blueprints/02-at-scale/k8s/cbcd-values.yml
index fd45c06..495d62d 100644
--- a/blueprints/02-at-scale/k8s/cbcd-values.yml
+++ b/blueprints/02-at-scale/k8s/cbcd-values.yml
@@ -4,6 +4,10 @@
 #https://docs.cloudbees.com/docs/cloudbees-cd/latest/install-k8s/configuration#cloudbees_helm_charts
 #https://github.com/cloudbees/cloudbees-examples/blob/master/cloudbees-cd/kubernetes/cloudbees-cd-prod-multizone.yaml
 
+server:
+  autoscaling:
+    enabled: true
+
 ##---------------------------------------------
 ## Database configuration section
 ##---------------------------------------------
diff --git a/blueprints/02-at-scale/outputs.tf b/blueprints/02-at-scale/outputs.tf
index 3392c20..0ff1633 100644
--- a/blueprints/02-at-scale/outputs.tf
+++ b/blueprints/02-at-scale/outputs.tf
@@ -9,13 +9,13 @@ output "kubeconfig_add" {
 }
 
 output "cbcd_helm" {
-  description = "Helm configuration for CloudBees CI Add-on. It is accesible only via state files."
+  description = "Helm configuration for CloudBees CD Add-on. It is accesible only via state files."
   value       = module.eks_blueprints_addon_cbcd.merged_helm_config
   sensitive   = true
 }
 
 output "cbcd_namespace" {
-  description = "Namespace for CloudBees CI Add-on."
+  description = "Namespace for CloudBees CD Add-on."
   value       = module.eks_blueprints_addon_cbcd.cbcd_namespace
 }
 output "cbcd_url" {