diff --git a/infra/tf/k8s_infra/imagor.tf b/infra/tf/k8s_infra/imagor.tf
index 8ccd2b8fa0..ba1cfcff52 100644
--- a/infra/tf/k8s_infra/imagor.tf
+++ b/infra/tf/k8s_infra/imagor.tf
@@ -416,13 +416,11 @@ resource "kubectl_manifest" "imagor_cdn" {
 
 resource "kubectl_manifest" "imagor_preset_middlewares" {
 	depends_on = [helm_release.traefik]
-	for_each = (
-		var.imagor_enabled ? {
-			for index, preset in var.imagor_presets:
-			preset.key => preset
-		} :
-		{}
-	)
+	for_each = {
+		for index, preset in var.imagor_presets:
+		preset.key => preset
+		if var.imagor_enabled
+	}
 
 	yaml_body = yamlencode({
 		apiVersion = "traefik.io/v1alpha1"
diff --git a/infra/tf/vector/vars.tf b/infra/tf/vector/vars.tf
index e184e4910f..a5667809e2 100644
--- a/infra/tf/vector/vars.tf
+++ b/infra/tf/vector/vars.tf
@@ -3,6 +3,10 @@ variable "namespace" {
 }
 
 # MARK: ClickHouse
+variable "clickhouse_enabled" {
+	type = bool
+}
+
 variable "clickhouse_provider" {
 	type = string
 	nullable = true