diff --git a/ci.jenkins.io-kubernetes-agents.tf b/ci.jenkins.io-kubernetes-agents.tf
index 033f9547..82d3e953 100644
--- a/ci.jenkins.io-kubernetes-agents.tf
+++ b/ci.jenkins.io-kubernetes-agents.tf
@@ -54,8 +54,9 @@ resource "azurerm_kubernetes_cluster" "cijenkinsio_agents_1" {
     os_disk_size_gb      = 150 # Ref. Cache storage size athttps://learn.microsoft.com/fr-fr/azure/virtual-machines/dasv5-dadsv5-series#dadsv5-series (depends on the instance size)
     orchestrator_version = local.kubernetes_versions["cijenkinsio_agents_1"]
     kubelet_disk_type    = "OS"
-    enable_auto_scaling  = false
-    node_count           = 3 # 3 nodes for HA as per AKS best practises
+    enable_auto_scaling  = true
+    min_count            = 2 # for best practises
+    max_count            = 3 # for upgrade
     vnet_subnet_id       = data.azurerm_subnet.ci_jenkins_io_kubernetes_sponsorship.id
     tags                 = local.default_tags
     zones                = local.cijenkinsio_agents_1_compute_zones
diff --git a/infraci.jenkins.io-kubernetes-sponsored-agents.tf b/infraci.jenkins.io-kubernetes-sponsored-agents.tf
index 3c902ce9..393fd235 100644
--- a/infraci.jenkins.io-kubernetes-sponsored-agents.tf
+++ b/infraci.jenkins.io-kubernetes-sponsored-agents.tf
@@ -53,8 +53,9 @@ resource "azurerm_kubernetes_cluster" "infracijenkinsio_agents_1" {
     os_disk_size_gb      = 150 # Ref. Cache storage size athttps://learn.microsoft.com/fr-fr/azure/virtual-machines/dasv5-dadsv5-series#dadsv5-series (depends on the instance size)
     orchestrator_version = local.kubernetes_versions["infracijenkinsio_agents_1"]
     kubelet_disk_type    = "OS"
-    enable_auto_scaling  = false
-    node_count           = 3 # 3 nodes for HA as per AKS best practises
+    enable_auto_scaling  = true
+    min_count            = 2 # for best practises
+    max_count            = 3 # for upgrade
     vnet_subnet_id       = data.azurerm_subnet.infraci_jenkins_io_kubernetes_agent_sponsorship.id
     tags                 = local.default_tags
     zones                = local.infracijenkinsio_agents_1_compute_zones