diff --git a/ecs/states-inventory-system/event-generator/event_generator.py b/ecs/states-inventory-system/event-generator/event_generator.py
deleted file mode 100644
index f676f0176d444..0000000000000
--- a/ecs/states-inventory-system/event-generator/event_generator.py
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/python3
-
-import datetime
-import random
-import json
-import requests
-import warnings
-import logging
-
-# Constants and Configuration
-LOG_FILE = 'generate_data.log'
-GENERATED_DATA_FILE = 'generatedData.json'
-DATE_FORMAT = "%Y-%m-%dT%H:%M:%S.%fZ"
-
-# Configure logging
-logging.basicConfig(filename=LOG_FILE, level=logging.INFO)
-
-# Suppress warnings
-warnings.filterwarnings("ignore")
-
-
-def generate_random_date():
-    start_date = datetime.datetime.now()
-    end_date = start_date - datetime.timedelta(days=10)
-    random_date = start_date + (end_date - start_date) * random.random()
-    return random_date.strftime(DATE_FORMAT)
-
-
-def generate_random_agent():
-    agent = {
-        'id': f'agent{random.randint(0, 99)}',
-        'name': f'Agent{random.randint(0, 99)}',
-        'type': random.choice(['filebeat', 'windows', 'linux', 'macos']),
-        'version': f'v{random.randint(0, 9)}-stable',
-        'is_connected': random.choice([True, False]),
-        'last_login': generate_random_date(),
-        'groups': [f'group{random.randint(0, 99)}', f'group{random.randint(0, 99)}'],
-        'key': f'key{random.randint(0, 999)}'
-    }
-    return agent
-
-
-def generate_random_host():
-    family = random.choice(['debian', 'ubuntu', 'macos', 'ios', 'android', 'RHEL'])
-    version = f'{random.randint(0, 99)}.{random.randint(0, 99)}'
-    host = {
-        'ip': f'{random.randint(1, 255)}.{random.randint(1, 255)}.{random.randint(1, 255)}.{random.randint(1, 255)}',
-        'os': {
-            'full': f'{family} {version}',
-        }
-    }
-    return host
-
-
-def generate_random_data(number):
-    data = []
-    for _ in range(number):
-        event_data = {
-            'agent': generate_random_agent(),
-            'host': generate_random_host(),
-        }
-        data.append(event_data)
-    return data
-
-
-def inject_events(ip, port, index, username, password, data):
-    url = f'https://{ip}:{port}/{index}/_doc'
-    session = requests.Session()
-    session.auth = (username, password)
-    session.verify = False
-    headers = {'Content-Type': 'application/json'}
-
-    try:
-        for event_data in data:
-            response = session.post(url, json=event_data, headers=headers)
-            if response.status_code != 201:
-                logging.error(f'Error: {response.status_code}')
-                logging.error(response.text)
-                break
-        logging.info('Data injection completed successfully.')
-    except Exception as e:
-        logging.error(f'Error: {str(e)}')
-
-
-def main():
-    try:
-        number = int(input("How many events do you want to generate? "))
-    except ValueError:
-        logging.error("Invalid input. Please enter a valid number.")
-        return
-
-    logging.info(f"Generating {number} events...")
-    data = generate_random_data(number)
-
-    with open(GENERATED_DATA_FILE, 'a') as outfile:
-        for event_data in data:
-            json.dump(event_data, outfile)
-            outfile.write('\n')
-
-    logging.info('Data generation completed.')
-
-    inject = input(
-        "Do you want to inject the generated data into your indexer? (y/n) ").strip().lower()
-    if inject == 'y':
-        ip = input("Enter the IP of your Indexer: ")
-        port = input("Enter the port of your Indexer: ")
-        index = input("Enter the index name: ")
-        username = input("Username: ")
-        password = input("Password: ")
-        inject_events(ip, port, index, username, password, data)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/ecs/states-inventory-system/fields/subset.yml b/ecs/states-inventory-system/fields/subset.yml
index 1186c2a7476ac..fe9be3affb7af 100644
--- a/ecs/states-inventory-system/fields/subset.yml
+++ b/ecs/states-inventory-system/fields/subset.yml
@@ -5,19 +5,19 @@ fields:
     fields:
       tags: []
       "@timestamp": {}
-    agent:
-      fields:
-        id: {}
-        groups: {}
-    host:
-      fields:
-        architecture: {}
-        hostname: {}
-        name: {}
-        os:
-          fields:
-            kernel: {}
-            full: {}
-            platform: {}
-            version: {}
-            type: {}
+  agent:
+    fields:
+      id: {}
+      groups: {}
+  host:
+    fields:
+      architecture: {}
+      hostname: {}
+      name: {}
+      os:
+        fields:
+          kernel: {}
+          full: {}
+          platform: {}
+          version: {}
+          type: {}
diff --git a/ecs/states-inventory-system/fields/template-settings-legacy.json b/ecs/states-inventory-system/fields/template-settings-legacy.json
index 04007e4bed32b..2d12dcaac3ce6 100644
--- a/ecs/states-inventory-system/fields/template-settings-legacy.json
+++ b/ecs/states-inventory-system/fields/template-settings-legacy.json
@@ -3,7 +3,6 @@
   "order": 1,
   "settings": {
     "index": {
-      "hidden": true,
       "number_of_shards": "1",
       "number_of_replicas": "0",
       "refresh_interval": "5s",