diff --git a/deploy/asapo_services/asap3.tfvars b/deploy/asapo_services/asap3.tfvars
index 1070bcc4026d94dd2223a0bbaae0951dacc22fa1..991b42e2f3eedffdf04d0221183ea1512c79880d 100644
--- a/deploy/asapo_services/asap3.tfvars
+++ b/deploy/asapo_services/asap3.tfvars
@@ -21,6 +21,7 @@ receiver_dataserver_cache_size = 30 #gb
 receiver_receive_to_disk_threshold = 50 # mb
 receiver_dataserver_nthreads = 8
 receiver_network_modes = "tcp"
+receiver_kafka_enabled = true
 
 grafana_total_memory_size = 2000
 influxdb_total_memory_size = 2000
diff --git a/deploy/asapo_services/scripts/asapo-receivers.nmd.tpl b/deploy/asapo_services/scripts/asapo-receivers.nmd.tpl
index fee0524f40eb4267b631c6bc1a6961dc4fc81c4e..5a48f8a93b24ba5f884fe670d284fc98fc538113 100644
--- a/deploy/asapo_services/scripts/asapo-receivers.nmd.tpl
+++ b/deploy/asapo_services/scripts/asapo-receivers.nmd.tpl
@@ -100,6 +100,8 @@ job "asapo-receivers" {
         receiver_network_modes = "${receiver_network_modes}"
         perf_monitor = "${perf_monitor}"
         receiver_expose_metrics = "${receiver_expose_metrics}"
+        receiver_kafka_enabled = "${receiver_kafka_enabled}"
+        receiver_kafka_metadata_broker_list = "${receiver_kafka_metadata_broker_list}"
       }
 
       template {
diff --git a/deploy/asapo_services/scripts/receiver.json.tpl b/deploy/asapo_services/scripts/receiver.json.tpl
index da0b30cd3d668b0a1eed5b0fed60033237c1961e..3183e72ab7ef371dc799f48ceab967af43531f6a 100644
--- a/deploy/asapo_services/scripts/receiver.json.tpl
+++ b/deploy/asapo_services/scripts/receiver.json.tpl
@@ -24,5 +24,14 @@
   },
   "Tag": "{{ env "attr.unique.hostname" }}",
   "ReceiveToDiskThresholdMB": {{ env "NOMAD_META_receiver_receive_to_disk_threshold" }},
-  "LogLevel": "{{ keyOrDefault "receiver_log_level" "info" }}"
+  "LogLevel": "{{ keyOrDefault "receiver_log_level" "info" }}",
+  "Kafka": {
+    "Enabled": {{ env "NOMAD_META_receiver_kafka_enabled" }},
+    "KafkaClient": {
+      "metadata.broker.list": "{{ env "NOMAD_META_receiver_kafka_metadata_broker_list" }}"
+    },
+    "KafkaTopics": {
+      "asapo": {}
+    }
+  }
 }
diff --git a/deploy/asapo_services/scripts/templates.tf b/deploy/asapo_services/scripts/templates.tf
index 5cc67dc9e132bd0f6149d4abb34fdca2440362df..664505890ed9e00007731886657d2dc5532932dc 100644
--- a/deploy/asapo_services/scripts/templates.tf
+++ b/deploy/asapo_services/scripts/templates.tf
@@ -56,6 +56,8 @@ data "template_file" "asapo_receivers" {
     force_pull_images = "${var.force_pull_images}"
     perf_monitor = "${var.perf_monitor}"
     receiver_expose_metrics = "${var.receiver_expose_metrics}"
+    receiver_kafka_enabled = "${var.receiver_kafka_enabled}"
+    receiver_kafka_metadata_broker_list = "${var.receiver_kafka_metadata_broker_list}"
   }
 }
 
diff --git a/deploy/asapo_services/scripts/vars.tf b/deploy/asapo_services/scripts/vars.tf
index c7d16e5f1c2200764cf6f3b0ea26d2a35fd96423..13068f32a322ec22e78a8342b98719fdd2071fac 100644
--- a/deploy/asapo_services/scripts/vars.tf
+++ b/deploy/asapo_services/scripts/vars.tf
@@ -58,6 +58,10 @@ variable "receiver_network_modes" {}
 
 variable "receiver_expose_metrics" {}
 
+variable "receiver_kafka_enabled" {}
+
+variable "receiver_kafka_metadata_broker_list" {}
+
 variable "grafana_total_memory_size" {}
 
 variable "influxdb_total_memory_size" {}
@@ -111,4 +115,4 @@ variable "n_brokers" {}
 
 variable "n_fts" {}
 
-variable "ldap_uri" {}
\ No newline at end of file
+variable "ldap_uri" {}
diff --git a/tests/automatic/settings/receiver_tcp.json.tpl.lin.in b/tests/automatic/settings/receiver_tcp.json.tpl.lin.in
index 498d9fdcc33c7344ca12d7d13fb36a90b26bd4ee..ebaa3aea27f523d7c06d0d61d9c72825e054da98 100644
--- a/tests/automatic/settings/receiver_tcp.json.tpl.lin.in
+++ b/tests/automatic/settings/receiver_tcp.json.tpl.lin.in
@@ -24,5 +24,8 @@
   "ListenPort": {{ env "NOMAD_PORT_recv" }},
   "Tag": "{{ env "NOMAD_ADDR_recv" }}",
   "ReceiveToDiskThresholdMB":50,
-  "LogLevel" : "debug"
+  "LogLevel" : "debug",
+  "Kafka" : {
+    "Enabled" : false
+  }
   }
diff --git a/tests/automatic/settings/receiver_tcp.json.tpl.win.in b/tests/automatic/settings/receiver_tcp.json.tpl.win.in
index 446ebcbf270af898204cbf7e2d93e2e45d864ecb..1c08e1b8448bf8fa79092889266ca74c69d925c6 100644
--- a/tests/automatic/settings/receiver_tcp.json.tpl.win.in
+++ b/tests/automatic/settings/receiver_tcp.json.tpl.win.in
@@ -24,5 +24,8 @@
   },
   "Tag": "{{ env "NOMAD_ADDR_recv" }}",
   "ReceiveToDiskThresholdMB":50,
-  "LogLevel" : "debug"
+  "LogLevel" : "debug",
+  "Kafka" : {
+    "Enabled" : false
+  }
 }