diff --git a/infrastructure/quick-deploy/gcp/keda.tf b/infrastructure/quick-deploy/gcp/keda.tf
index bf2b8e5c2..7b7cd2fce 100644
--- a/infrastructure/quick-deploy/gcp/keda.tf
+++ b/infrastructure/quick-deploy/gcp/keda.tf
@@ -8,8 +8,8 @@ module "keda" {
   }
   image_pull_secrets              = var.keda.pull_secrets
   node_selector                   = var.keda.node_selector
-  helm_chart_repository           = try(coalesce(var.keda.helm_chart_repository), var.helm_charts.repository)
-  helm_chart_version              = try(coalesce(var.keda.helm_chart_version), var.helm_charts.version)
+  helm_chart_repository           = try(coalesce(var.keda.helm_chart_repository), var.helm_charts.keda.repository)
+  helm_chart_version              = try(coalesce(var.keda.helm_chart_version), var.helm_charts.keda.version)
   metrics_server_dns_policy       = var.keda.metrics_server_dns_policy
   metrics_server_use_host_network = var.keda.metrics_server_use_host_network
-}
\ No newline at end of file
+}
diff --git a/infrastructure/quick-deploy/gcp/variables.tf b/infrastructure/quick-deploy/gcp/variables.tf
index 141c71754..c951a6612 100644
--- a/infrastructure/quick-deploy/gcp/variables.tf
+++ b/infrastructure/quick-deploy/gcp/variables.tf
@@ -81,8 +81,8 @@ variable "keda" {
     node_selector                   = optional(any, {})
     metrics_server_dns_policy       = optional(string, "ClusterFirst")
     metrics_server_use_host_network = optional(bool, false)
-    helm_chart_repository           = optional(string, "https://kedacore.github.io/charts")
-    helm_chart_version              = optional(string, "2.9.4")
+    helm_chart_repository           = optional(string)
+    helm_chart_version              = optional(string)
   })
   default = {}
 }
diff --git a/versions.tfvars.json b/versions.tfvars.json
index c2d35b16a..de7c8582a 100644
--- a/versions.tfvars.json
+++ b/versions.tfvars.json
@@ -1,7 +1,7 @@
 {
   "armonik_versions": {
     "armonik":       "2.20.0",
-    "infra":         "0.5.1-pre-2-e62c928",
+    "infra":         "0.6.1-pre1-fbd66b9",
     "infra_plugins": "0.1.1",
     "core":          "0.27.2",
     "api":           "3.19.0",