diff --git a/modules/infra/airflow/values.yaml b/modules/infra/airflow/values.yaml
index 3880629..26efcde 100644
--- a/modules/infra/airflow/values.yaml
+++ b/modules/infra/airflow/values.yaml
@@ -1786,12 +1786,12 @@ serviceAccount:
   ## if a Kubernetes ServiceAccount is created
   ## - if `false`, you must create the service account outside this chart with name: `serviceAccount.name`
   ##
-  create: true
+  create: false
 
   ## the name of the ServiceAccount
   ## - by default the name is generated using the `airflow.serviceAccountName` template in `_helpers/common.tpl`
   ##
-  name: ""
+  name: airflow-worker
 
   ## annotations for the ServiceAccount
   ##
diff --git a/modules/infra/kafka/gateway.yaml b/modules/infra/kafka/gateway.yaml
new file mode 100644
index 0000000..3c0bae6
--- /dev/null
+++ b/modules/infra/kafka/gateway.yaml
@@ -0,0 +1,16 @@
+apiVersion: networking.istio.io/v1beta1
+kind: VirtualService
+metadata:
+  name: kafka-ui-vs
+  namespace: kafka
+spec:
+  hosts:
+  - kafka-ui.goboolean.io
+  gateways:
+  - istio-system/istio-ingressgateway
+  http:
+  - route:
+    - destination:
+        host: kafka-ui.kafka.svc.cluster.local
+        port:
+          number: 80
diff --git a/modules/infra/kafka/kafka-ui-values.yaml b/modules/infra/kafka/kafka-ui-values.yaml
new file mode 100644
index 0000000..d933102
--- /dev/null
+++ b/modules/infra/kafka/kafka-ui-values.yaml
@@ -0,0 +1,11 @@
+yamlApplicationConfig:
+  kafka:
+    clusters:
+      - name: yaml
+        bootstrapServers:  kafka.kafka.svc.cluster.local:9092
+  auth:
+    type: disabled
+  management:
+    health:
+      ldap:
+        enabled: false
diff --git a/modules/infra/kafka/main.tf b/modules/infra/kafka/main.tf
index 67c239c..fe4801e 100644
--- a/modules/infra/kafka/main.tf
+++ b/modules/infra/kafka/main.tf
@@ -23,3 +23,18 @@ resource "helm_release" "prometheus-kafka-exporter" {
 
   depends_on = [helm_release.kafka]
 }
+
+resource "helm_release" "kafka-ui" {
+  name             = "kafka-ui"
+  chart            = "kafka-ui"
+  namespace        = "kafka"
+  repository       = "https://provectus.github.io/kafka-ui-charts"
+  version          = "0.7.6"
+
+  values = [file("${path.module}/kafka-ui-values.yaml")]
+}
+
+resource "kubernetes_manifest" "kafka-ui-gateway" {
+  manifest = yamldecode(file("${path.module}/gateway.yaml"))
+  depends_on = [helm_release.kafka-ui]
+}