diff --git a/site-modules/profile/templates/logstash/filter.conf.erb b/site-modules/profile/templates/logstash/filter.conf.erb
index 23808166..8d54473c 100644
--- a/site-modules/profile/templates/logstash/filter.conf.erb
+++ b/site-modules/profile/templates/logstash/filter.conf.erb
@@ -1,48 +1,53 @@
 filter {
   if [fields][apache_log_type] == "access_log" {
     grok {
       match => { "message" => "%{COMBINEDAPACHELOG}( %{NUMBER:duration_ms})?" }
     }
     date {
       match => [ "timestamp" , "dd/MMM/yyyy:HH:mm:ss Z" ]
     }
     mutate {
       add_field => {
         "[@metadata][target_index]" => "apache_logs-%{+YYYY.MM.dd}"
       }
       convert => {
         "response" => "integer"
         "duration_ms" => "integer"
         "bytes" => "integer"
       }
     }
   } else if "swh-worker@" in [systemd_unit] {
     # Temporary rule to delete after complete migration to 7.15
     mutate {
       add_field => {
         "[@metadata][target_index]" => "swh_workers-%{+YYYY.MM.dd}"
       }
     }
   } else if "swh-worker@" in [systemd][unit] {
     mutate {
       add_field => {
         "[@metadata][target_index]" => "swh_workers-%{[@metadata][version]}-%{+YYYY.MM.dd}"
       }
     }
   } else {
+    if [syslog][facility] !~ /^\d+$/ {
+      mutate {
+        rename => { "[syslog][facility]" => "[syslog][facility_name]" }
+      }
+    }
     if [@metadata][version] {
       mutate {
         add_field => {
           "[@metadata][target_index]" => "systemlogs-%{[@metadata][version]}-%{+YYYY.MM.dd}"
         }
       }
     } else {
       # Temporary rule to delete after complete migration to 7.15
       mutate {
         add_field => {
           "[@metadata][target_index]" => "systemlogs-%{+YYYY.MM.dd}"
         }
       }
     }
   }
 }