diff --git a/_run-terraform.sh b/_run-terraform.sh
index 094efe8..fc7a146 100755
--- a/_run-terraform.sh
+++ b/_run-terraform.sh
@@ -71,17 +71,11 @@ case "$(echo $cloud_provider)" in
         }
 
         # Trick to get the resource group of the cluster (get it from instanciated Kubernetes nodes)
-        data \"kubernetes_nodes\" \"selected\" {
-          metadata {
-            labels = {
-              \"cosmotech.com/tier\" = \"db\"
-            }
-          }
-        }
+        data \"kubernetes_nodes\" \"all_nodes\" {}
 
         data \"azurerm_public_ip\" \"lb_ip\" {
           name                  = \"$cluster_name-lb-ip\"
-          resource_group_name   = [for node in data.kubernetes_nodes.selected.nodes : node.metadata.0.labels].0[\"kubernetes.azure.com/cluster\"]
+          resource_group_name   = [for node in data.kubernetes_nodes.all_nodes.nodes : node.metadata.0.labels].0[\"kubernetes.azure.com/cluster\"]
         }
 
         data \"azurerm_client_config\" \"current\" {}
diff --git a/terraform.tfvars b/terraform.tfvars
index ef0b939..05601dc 100644
--- a/terraform.tfvars
+++ b/terraform.tfvars
@@ -3,9 +3,9 @@ cloud_provider        = "azure"
 cluster_region        = "westeurope"
 cluster_name          = "aks-dev-devops"
 domain_zone           = "azure.platform.cosmotech.com"
-certificate_email     = "platform@cosmotech.com"
-azure_subscription_id = "xxxxxxxx_xxxx_xxxx_xxxx_xxxxxxxxxxxx"
-azure_entra_tenant_id = "xxxxxxxx_xxxx_xxxx_xxxx_xxxxxxxxxxxx"
+certificate_email     = "platform@cosmotech.com" # This email can be any email, it will just be used as the contact email for Let's encrypt
+azure_subscription_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+azure_entra_tenant_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
 
 
 ## VARIABLES EXAMPLE FOR GCP
diff --git a/variables.tf b/variables.tf
index 90625a3..c7d0799 100644
--- a/variables.tf
+++ b/variables.tf
@@ -20,7 +20,7 @@ locals {
     } :
     var.cloud_provider == "azure" ? {
       # "service.beta.kubernetes.io/azure-load-balancer-resource-group"            = data.terraform_remote_state.terraform_cluster.outputs.node_resource_group
-      "service.beta.kubernetes.io/azure-load-balancer-resource-group"            = [for node in data.kubernetes_nodes.selected.nodes : node.metadata.0.labels].0["kubernetes.azure.com/cluster"]
+      "service.beta.kubernetes.io/azure-load-balancer-resource-group"            = [for node in data.kubernetes_nodes.all_nodes.nodes : node.metadata.0.labels].0["kubernetes.azure.com/cluster"]
       "service.beta.kubernetes.io/azure-load-balancer-health-probe-request-path" = "/healthz"
     } :
     {}