diff --git a/deployments/kafka-test/main.tf b/deployments/kafka-test/main.tf
index 4b85a5b..1c668a6 100644
--- a/deployments/kafka-test/main.tf
+++ b/deployments/kafka-test/main.tf
@@ -23,7 +23,7 @@ resource "aiven_kafka" "asyncapi-event-gateway-kafka-service" {
   service_name            = var.aiven_service_name
   maintenance_window_dow  = "friday"
   maintenance_window_time = "07:00:00"
-  termination_protection = true
+  termination_protection  = true
   kafka_user_config {
     kafka_version = "2.7"
   }
@@ -31,13 +31,14 @@ resource "aiven_kafka" "asyncapi-event-gateway-kafka-service" {
 
 # Topic for Kafka
 resource "aiven_kafka_topic" "asyncapi-event-gateway-kafka-topic" {
+  for_each     = var.aiven_kafka_topics
   project      = data.aiven_project.asyncapi-project.project
   service_name = aiven_kafka.asyncapi-event-gateway-kafka-service.service_name
-  topic_name   = var.aiven_kafka_topic_name
-  partitions   = var.aiven_kafka_topic_partitions
-  replication  = var.aiven_kafka_topic_replication
+  topic_name   = each.key
+  partitions   = var.aiven_kafka_topics_partitions
+  replication  = var.aiven_kafka_topics_replication
   config {
-    retention_ms = var.aiven_kafka_topic_retention_ms
+    retention_ms = var.aiven_kafka_topics_retention_ms
   }
 }
 
@@ -50,18 +51,20 @@ resource "aiven_service_user" "asyncapi-event-gateway-kafka-user" {
 
 # ACL for Kafka
 resource "aiven_kafka_acl" "asyncapi-event-gateway-read-acl" {
+  for_each     = aiven_kafka_topic.asyncapi-event-gateway-kafka-topic
   project      = data.aiven_project.asyncapi-project.project
   service_name = aiven_kafka.asyncapi-event-gateway-kafka-service.service_name
   username     = aiven_service_user.asyncapi-event-gateway-kafka-user.username
   permission   = "read"
-  topic        = aiven_kafka_topic.asyncapi-event-gateway-kafka-topic.topic_name
+  topic        = each.value.topic_name
 }
 
 # ACL for Kafka
 resource "aiven_kafka_acl" "asyncapi-event-gateway-write-acl" {
+  for_each     = aiven_kafka_topic.asyncapi-event-gateway-kafka-topic
   project      = data.aiven_project.asyncapi-project.project
   service_name = aiven_kafka.asyncapi-event-gateway-kafka-service.service_name
   username     = aiven_service_user.asyncapi-event-gateway-kafka-user.username
   permission   = "write"
-  topic        = aiven_kafka_topic.asyncapi-event-gateway-kafka-topic.topic_name
+  topic        = each.value.topic_name
 }
\ No newline at end of file
diff --git a/deployments/kafka-test/variables.tf b/deployments/kafka-test/variables.tf
index 87b3a22..1cb6ee0 100644
--- a/deployments/kafka-test/variables.tf
+++ b/deployments/kafka-test/variables.tf
@@ -18,19 +18,19 @@ variable "aiven_kafka_cloud_name" {
   type = string
 }
 
-variable "aiven_kafka_topic_name" {
-  type = string
+variable "aiven_kafka_topics" {
+  type = set(string)
 }
 
-variable "aiven_kafka_topic_partitions" {
+variable "aiven_kafka_topics_partitions" {
   type = number
 }
 
-variable "aiven_kafka_topic_replication" {
+variable "aiven_kafka_topics_replication" {
   type = number
 }
 
-variable "aiven_kafka_topic_retention_ms" {
+variable "aiven_kafka_topics_retention_ms" {
   type = number
 }