diff --git a/configs/etc/kubehound-dd.yaml b/configs/etc/kubehound-dd.yaml
deleted file mode 100644
index d37fccfbe..000000000
--- a/configs/etc/kubehound-dd.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Default Datadog KubeHound configuration
-# NOTE: this is optimized for large clusters in the Datadog environment
-#
-
-# K8s collector configuration
-collector:
-  # Type of collector to use
-  type: live-k8s-api-collector
-
-  # Live collector configuration
-  live:
-    # Rate limit of requests/second to the Kubernetes API
-    rate_limit_per_second: 150
-
-    # Number of pages to buffer
-    page_buffer_size: 50
-
-# General storage configuration
-storage:
-  # Number of connection retries before declaring an error
-  retry: 5
-
-  # Delay between connection retries
-  retry_delay: 10s
-
-# Store database configuration
-mongodb:
-  # Connection URL to the mongo DB instance
-  url: "mongodb://localhost:27017"
-
-  # Timeout on requests to the mongo DB instance
-  connection_timeout: 30s
-
-# Graph database configuration
-janusgraph:
-  # Connection URL to the JanusGraph DB instance
-  url: "ws://localhost:8182/gremlin"
-
-  # Timeout on requests to the JanusGraph DB instance
-  connection_timeout: 30s
-
-# Datadog telemetry configuration
-telemetry:
-  # Whether to enable Datadog telemetry (default false)
-  enabled: true
-
-  # Default tags to add to all telemetry (free form key-value map)
-  tags:
-    team: ase
-
-  # Statsd configuration for metics support
-  statsd:
-    # URL to send statsd data to the Datadog agent
-    url: "127.0.0.1:8225"
-
-  # Tracer configuration for APM support
-  tracer:
-    # URL to send tracer data to the Datadog agent
-    url: "127.0.0.1:8226"
-
-# Graph builder configuration
-builder:
-  # Vertex builder configuration
-  vertex:
-    # Batch size for vertex inserts
-    batch_size: 500
-
-  # Edge builder configuration
-  edge:
-    worker_pool_size: 5
-
-    # Batch size for edge inserts
-    batch_size: 1000
-    
-    # Cluster impact batch size for edge inserts
-    batch_size_cluster_impact: 10
-
-    # Enable for large clusters to prevent number of edges growing exponentially
-    large_cluster_optimizations: true
diff --git a/configs/etc/kubehound-ingestor.yaml b/configs/etc/kubehound-ingestor.yaml
deleted file mode 100644
index 32a749c5c..000000000
--- a/configs/etc/kubehound-ingestor.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Default KubeHound configuration
-# NOTE: this is optimized for smaller clusters of 1-2k pods
-#
-
-# General storage configuration
-storage:
-  # Number of connection retries before declaring an error
-  retry: 5
-
-  # Delay between connection retries
-  retry_delay: 10s
-
-# Store database configuration
-mongodb:
-  # Connection URL to the mongo DB instance
-  url: "mongodb://localhost:27017"
-
-  # Timeout on requests to the mongo DB instance
-  connection_timeout: 30s
-
-# Graph database configuration
-janusgraph:
-  # Connection URL to the JanusGraph DB instance
-  url: "ws://localhost:8182/gremlin"
-
-  # Timeout on requests to the JanusGraph DB instance
-  connection_timeout: 30s
-
-# Graph builder configuration
-builder:
-  # Vertex builder configuration
-  vertex:
-    # Batch size for vertex inserts
-    batch_size: 500
-
-  # Edge builder configuration
-  edge:
-    worker_pool_size: 2
-
-    # Batch size for edge inserts
-    batch_size: 500
-    
-    # Cluster impact batch size for edge inserts
-    batch_size_cluster_impact: 10
-    
-    # Enable for large clusters to prevent number of edges growing exponentially
-    large_cluster_optimizations: true
-
-# Ingestor configuration (for KHaaS)
-ingestor:
-  blob:
-    bucket: "" # (i.e.: s3://<your_bucket>)
-    region: "" # (i.e.: us-west-2)
-  temp_dir: "/tmp/kubehound"
-  archive_name: "archive.tar.gz"
-  max_archive_size: 2147483648 # 2GB
-  api: # GRPC endpoint for the ingestor
-    endpoint: "127.0.0.1:9000"
-    insecure: true
\ No newline at end of file
diff --git a/configs/etc/kubehound-reference.yaml b/configs/etc/kubehound-reference.yaml
index a4a511da0..f2132d7d7 100644
--- a/configs/etc/kubehound-reference.yaml
+++ b/configs/etc/kubehound-reference.yaml
@@ -128,11 +128,14 @@ builder:
 # Ingestor configuration (for KHaaS)
 # ingestor:
 #   blob:
-#    bucket: "" # (i.e.: s3://your-bucket)
-#    region: "" # (i.e.: us-east-1)
+#     # (i.e.: s3://<your-bucket>)
+#     bucket: ""
+#     # (i.e.: us-east-1)
+#     region: "" 
 #   temp_dir: "/tmp/kubehound"
 #   archive_name: "archive.tar.gz"
-#  max_archive_size: 2147483648 # 2GB
-#   api: # GRPC endpoint for the ingestor
+#   max_archive_size: 2147483648 # 2GB
+#   # GRPC endpoint for the ingestor
+#   api: 
 #     endpoint: "127.0.0.1:9000"
-#     insecure: true
\ No newline at end of file
+#     insecure: true
diff --git a/configs/etc/kubehound.yaml b/configs/etc/kubehound.yaml
index fc7a25677..b36c66c79 100644
--- a/configs/etc/kubehound.yaml
+++ b/configs/etc/kubehound.yaml
@@ -56,3 +56,18 @@ builder:
     
     # Enable for large clusters to prevent number of edges growing exponentially
     large_cluster_optimizations: true
+
+# Ingestor configuration (for KHaaS)
+ingestor:
+  blob:
+    # (i.e.: s3://<your-bucket>)
+    bucket: ""
+    # (i.e.: us-east-1)
+    region: "" 
+  temp_dir: "/tmp/kubehound"
+  archive_name: "archive.tar.gz"
+  max_archive_size: 2147483648 # 2GB
+  # GRPC endpoint for the ingestor
+  api: 
+    endpoint: "127.0.0.1:9000"
+    insecure: true