diff --git a/logstash/config/logstash.yml b/logstash/config/logstash.yml
index 4d6ca384..8b137891 100644
--- a/logstash/config/logstash.yml
+++ b/logstash/config/logstash.yml
@@ -1,8 +1 @@
-# This file has been generated by `generate_logstash_config_files.py`
-# file, placed in `src/setup/logstash_setup`
-# -------------------------------------------------------------------
-http.host: "0.0.0.0"
-xpack.monitoring.elasticsearch.hosts: [ "http://elasticsearch:9200" ]
-xpack.monitoring.enabled: true
-xpack.monitoring.elasticsearch.username: elastic
-xpack.monitoring.elasticsearch.password: changeme
\ No newline at end of file
+
diff --git a/src/setup/es_setup/generate_elasticsearch_indices.py b/src/setup/es_setup/generate_elasticsearch_indices.py
index bd6248ce..5416982e 100755
--- a/src/setup/es_setup/generate_elasticsearch_indices.py
+++ b/src/setup/es_setup/generate_elasticsearch_indices.py
@@ -27,7 +27,7 @@ def main():
     es_client = ElasticsearchSingleton().client
     global_fields = {"name", "plain", "html"}
     entities = {
-        router.es_index: list(router.match_fields ^ global_fields) for router in router_list
+        router.es_index: list(router.indexed_fields ^ global_fields) for router in router_list
     }
     for es_index, fields in entities.items():
         mapping = generate_mapping(fields)
diff --git a/src/setup/logstash_setup/generate_logstash_config_files.py b/src/setup/logstash_setup/generate_logstash_config_files.py
index 8d114977..5818a371 100755
--- a/src/setup/logstash_setup/generate_logstash_config_files.py
+++ b/src/setup/logstash_setup/generate_logstash_config_files.py
@@ -30,8 +30,8 @@
 pipeline_sql_path = BASE_PATH / "pipeline" / "sql"
 DB_USER = "root"
 DB_PASS = os.environ["MYSQL_ROOT_PASSWORD"]
-ES_PASS = os.environ["ES_USER"]
-ES_USER = os.environ["ES_PASSWORD"]
+ES_USER = os.environ["ES_USER"]
+ES_PASS = os.environ["ES_PASSWORD"]
 GLOBAL_FIELDS = {"name", "plain", "html"}
 
 
@@ -45,7 +45,7 @@ def main():
     for path in (CONFIG_PATH, PIPELINE_CONFIG_PATH, pipeline_sql_path):
         path.mkdir(parents=True, exist_ok=True)
     entities = {
-        router.es_index: list(router.match_fields ^ GLOBAL_FIELDS) for router in router_list
+        router.es_index: list(router.indexed_fields ^ GLOBAL_FIELDS) for router in router_list
     }
     render_parameters = {
         "file": os.path.basename(__file__),