diff --git a/ansible/roles/common/templates/conf/filter/00-record_transformer.conf.j2 b/ansible/roles/common/templates/conf/filter/00-record_transformer.conf.j2
index 00c417392d3d895b9ad0233eac82e3d5cc3f2c5f..12b9b566c910e66395003561820a825a2ae828b7 100644
--- a/ansible/roles/common/templates/conf/filter/00-record_transformer.conf.j2
+++ b/ansible/roles/common/templates/conf/filter/00-record_transformer.conf.j2
@@ -10,6 +10,7 @@
 <filter infra.*>
     @type record_transformer
     <record>
+        Hostname ${hostname}
         programname ${tag_parts[1]}
     </record>
 </filter>
diff --git a/ansible/roles/common/templates/conf/input/01-syslog.conf.j2 b/ansible/roles/common/templates/conf/input/01-syslog.conf.j2
index 762d48f9776e192fb389ce02ef99a6044c910826..847c0c451db07adb56aff5a917e81a1b295273a6 100644
--- a/ansible/roles/common/templates/conf/input/01-syslog.conf.j2
+++ b/ansible/roles/common/templates/conf/input/01-syslog.conf.j2
@@ -4,5 +4,6 @@
   bind {{ api_interface_address }}
   tag syslog
   priority_key log_level
+  source_hostname_key Hostname
   format /^(?<Payload>.*)$/
 </source>