diff --git a/.envrc b/.envrc
index bc409121..6e96ed56 100644
--- a/.envrc
+++ b/.envrc
@@ -43,25 +43,33 @@ export DOCKER_BUILDKIT=1
 #   CHART__WEB_IMAGE__REPOSITORY
 #   CHART__WEB_IMAGE__TAG
 #   CHART__WEB_IMAGE__PULL_POLICY
-#   CHART__FRONTEND__WEB__REPLICA_COUNT
+#   CHART__INGRESS_ANNOTATIONS__ALB__INGRESS__KUBERNETES__IO/LISTEN-PORTS
+#   CHART__INGRESS_ANNOTATIONS__ALB__INGRESS__KUBERNETES__IO/SSL-REDIRECT
+#   CHART__INGRESS_ANNOTATIONS__ALB__INGRESS__KUBERNETES__IO/SCHEME
+#   CHART__INGRESS_ANNOTATIONS__ALB__INGRESS__KUBERNETES__IO/TARGET-TYPE
+#   CHART__INGRESS_ANNOTATIONS__ALB__INGRESS__KUBERNETES__IO/TARGET-GROUP-ATTRIBUTES
+#   CHART__INGRESS_ANNOTATIONS__ALB__INGRESS__KUBERNETES__IO/HEALTHCHECK-PATH
+#   CHART__INGRESS_ANNOTATIONS__ALB__INGRESS__KUBERNETES__IO/LOAD-BALANCER-ATTRIBUTES
+#   CHART__WEB__REPLICA_COUNT
 #   CHART__WSGI__SCALING__MIN_REPLICAS
 #   CHART__WSGI__SCALING__MAX_REPLICAS
+#   CHART__WSGI__SCALING__CPU_UTIL_PERCENT
+#   CHART__WSGI__SCALING__MEM_UTIL_PERCENT
 #   CHART__ASGI__SCALING__MIN_REPLICAS
 #   CHART__ASGI__SCALING__MAX_REPLICAS
+#   CHART__ASGI__SCALING__CPU_UTIL_PERCENT
+#   CHART__ASGI__SCALING__MEM_UTIL_PERCENT
 #   CHART__CELERY_BEAT__REPLICA_COUNT
 #   CHART__CELERY__CELERY__QUEUES
 #   CHART__CELERY__CELERY__SCALING__MIN_REPLICAS
 #   CHART__CELERY__CELERY__SCALING__MAX_REPLICAS
+#   CHART__CELERY__CELERY__SCALING__CPU_UTIL_PERCENT
+#   CHART__CELERY__CELERY__SCALING__MEM_UTIL_PERCENT
 #   CHART__CELERY__SIGNAL__QUEUES
 #   CHART__CELERY__SIGNAL__SCALING__MIN_REPLICAS
 #   CHART__CELERY__SIGNAL__SCALING__MAX_REPLICAS
-#   CHART__INGRESS_ANNOTATIONS__ALB__INGRESS__KUBERNETES__IO/LISTEN-PORTS
-#   CHART__INGRESS_ANNOTATIONS__ALB__INGRESS__KUBERNETES__IO/SSL-REDIRECT
-#   CHART__INGRESS_ANNOTATIONS__ALB__INGRESS__KUBERNETES__IO/SCHEME
-#   CHART__INGRESS_ANNOTATIONS__ALB__INGRESS__KUBERNETES__IO/TARGET-TYPE
-#   CHART__INGRESS_ANNOTATIONS__ALB__INGRESS__KUBERNETES__IO/TARGET-GROUP-ATTRIBUTES
-#   CHART__INGRESS_ANNOTATIONS__ALB__INGRESS__KUBERNETES__IO/HEALTHCHECK-PATH
-#   CHART__INGRESS_ANNOTATIONS__ALB__INGRESS__KUBERNETES__IO/LOAD-BALANCER-ATTRIBUTES
+#   CHART__CELERY__SIGNAL__SCALING__CPU_UTIL_PERCENT
+#   CHART__CELERY__SIGNAL__SCALING__MEM_UTIL_PERCENT
 #   API_STACK__EKS__CORE_DNS_VERSION
 #   API_STACK__EKS__KUBE_PROXY_VERSION
 #   API_STACK__EKS__VPC_CNI_VERSION
@@ -80,6 +88,7 @@ export DOCKER_BUILDKIT=1
 #   API_STACK__DATABASE__CLOUDWATCH_LOGS_RETENTION_DAYS
 #   API_STACK__DATABASE__DELETION_PROTECTION
 #   API_STACK__DATABASE__BACKUP_RETENTION_DAYS
+#   API_STACK__DATABASE__BASTION_ALLOW_LIST
 #   API_STACK__NETWORK__MAX_AZS
 #   API_STACK__NETWORK__NAT_GATEWAYS
 #   API_STACK__NETWORK__CREATE_ISOLATED_SUBNET