diff --git a/charts/clickhouse/.helmignore b/charts/clickhouse/.helmignore
new file mode 100644
index 00000000..0e8a0eb3
--- /dev/null
+++ b/charts/clickhouse/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/clickhouse/values.yaml b/charts/clickhouse/values.yaml
index 13f382ca..75797c60 100644
--- a/charts/clickhouse/values.yaml
+++ b/charts/clickhouse/values.yaml
@@ -152,14 +152,16 @@ tolerations: []
 affinity: {}
 # -- node selector for settings for clickhouse pod
 nodeSelector: {}
-# -- Clickhouse resource requests/limits. See more at http://kubernetes.io/docs/user-guide/compute-resources/
+# -- Configure resource requests and limits. Update according to your own use
+# case as these values might be too low for a typical deployment.
+# ref: http://kubernetes.io/docs/user-guide/compute-resources/
 resources: {}
-#   limits:
-#     cpu: 1000m
-#     memory: 16Gi
-#   requests:
-#     cpu: 4000m
-#     memory: 16Gi
+  #   requests:
+  #     cpu: 1000m
+  #     memory: 4Gi
+  #   limits:
+  #     cpu: 4000m
+  #     memory: 16Gi
 
 # -- Security context for Clickhouse node
 securityContext:
diff --git a/charts/k8s-infra/values.yaml b/charts/k8s-infra/values.yaml
index 8923443a..508cd9d9 100644
--- a/charts/k8s-infra/values.yaml
+++ b/charts/k8s-infra/values.yaml
@@ -258,11 +258,11 @@ otelAgent:
   # @default -- See `values.yaml` for defaults
   resources:
     requests:
-      cpu: 200m
-      memory: 200Mi
-    limits:
-      cpu: 1000m
-      memory: 1Gi
+      cpu: 100m
+      memory: 100Mi
+    # limits:
+    #   cpu: 1000m
+    #   memory: 1Gi
 
   # -- OtelAgent node selector
   nodeSelector: {}
@@ -612,11 +612,11 @@ otelDeployment:
   # @default -- See `values.yaml` for defaults
   resources:
     requests:
-      cpu: 200m
-      memory: 200Mi
-    limits:
-      cpu: 1000m
-      memory: 1Gi
+      cpu: 100m
+      memory: 100Mi
+    # limits:
+    #   cpu: 1000m
+    #   memory: 1Gi
 
   # -- OtelDeployment node selector
   nodeSelector: {}
diff --git a/charts/signoz/Chart.lock b/charts/signoz/Chart.lock
index 25b00491..8ab844b3 100644
--- a/charts/signoz/Chart.lock
+++ b/charts/signoz/Chart.lock
@@ -1,6 +1,9 @@
 dependencies:
 - name: clickhouse
   repository: https://signoz.github.io/charts
-  version: 23.5.2
-digest: sha256:aec8ee51c6dd2d62a194294bb8a21b7a7bd94ae08ec5908dcf9588ba782500c5
-generated: "2022-09-05T14:39:27.092108478+05:30"
+  version: 23.5.3
+- name: k8s-infra
+  repository: https://signoz.github.io/charts
+  version: 0.1.1
+digest: sha256:93b7e038ab092cef0258fb896ed099851332693b872ebba846d6026d571ca392
+generated: "2022-09-15T21:42:03.603868236+05:30"
diff --git a/charts/signoz/Chart.yaml b/charts/signoz/Chart.yaml
index 5aeb7187..68e4d538 100644
--- a/charts/signoz/Chart.yaml
+++ b/charts/signoz/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: signoz
-version: 0.3.3
-appVersion: "0.11.0"
+version: 0.4.0
+appVersion: "0.11.1"
 description: SigNoz Observability Platform Helm Chart
 type: application
 home: https://signoz.io/
@@ -13,15 +13,19 @@ keywords:
   - monitoring
   - distributed tracing
 sources:
-  - https://github.com/signoz/charts/
+  - https://github.com/signoz/charts
   - https://github.com/signoz/signoz
   - https://github.com/signoz/alertmanager
-  - https://github.com/signoz/opentelemetry-collector-contrib
+  - https://github.com/signoz/signoz-otel-collector
 dependencies:
   - name: clickhouse
     repository: "https://signoz.github.io/charts"
     condition: clickhouse.enabled
-    version: 23.5.2
+    version: 23.5.3
+  - name: k8s-infra
+    repository: "https://signoz.github.io/charts"
+    condition: k8s-infra.enabled
+    version: 0.1.1
 maintainers:
   - name: SigNoz
     email: hello@signoz.io
diff --git a/charts/signoz/README.md b/charts/signoz/README.md
index 3868b367..055cfd40 100644
--- a/charts/signoz/README.md
+++ b/charts/signoz/README.md
@@ -71,7 +71,7 @@ The following table lists the configurable parameters of the `signoz` chart and
 | `queryService.name`                      | Query Service component name                                            | `query-service`                   |
 | `queryService.image.registry`            | Query Service image registry name                                       | `docker.io`                       |
 | `queryService.image.repository`          | Container image name                                                    | `signoz/query-service`            |
-| `queryService.image.tag`                 | Container image tag                                                     | `0.11.0`                          |
+| `queryService.image.tag`                 | Container image tag                                                     | `0.11.1`                          |
 | `queryService.image.pullPolicy`          | Container pull policy                                                   | `IfNotPresent`                    |
 | `queryService.replicaCount`              | Number of query-service nodes                                           | `1`                               |
 | `queryService.initContainers.init.enabled`      | Query Service initContainer enabled                              | `true`                            |
@@ -103,7 +103,7 @@ The following table lists the configurable parameters of the `signoz` chart and
 | `frontend.name`                          | Frontend component name                                                 | `frontend`                        |
 | `frontend.image.registry`                | Frontend image registry name                                            | `docker.io`                       |
 | `frontend.image.repository`              | Container image name                                                    | `signoz/frontend`                 |
-| `frontend.image.tag`                     | Container image tag                                                     | `0.11.0`                          |
+| `frontend.image.tag`                     | Container image tag                                                     | `0.11.1`                          |
 | `frontend.image.pullPolicy`              | Container pull policy                                                   | `IfNotPresent`                    |
 | `frontend.replicaCount`                  | Number of query-service nodes                                           | `1`                               |
 | `frontend.initContainers.init.enabled`   | Frontend initContainer enabled                                          | `true`                            |
@@ -173,7 +173,7 @@ The following table lists the configurable parameters of the `signoz` chart and
 | `otelCollector.name`                     | Otel Collector component name                                           | `otel-collector`                  |
 | `otelCollector.image.registry`           | Otel Collector image registry name                                      | `docker.io`                       |
 | `otelCollector.image.repository`         | Container image name                                                    | `signoz/signoz-otel-collector`    |
-| `otelCollector.image.tag`                | Container image tag                                                     | `0.55.0`                          |
+| `otelCollector.image.tag`                | Container image tag                                                     | `0.55.1`                          |
 | `otelCollector.image.pullPolicy`         | Container pull policy                                                   | `IfNotPresent`                    |
 | `otelCollector.replicaCount`             | Number of otel-collector nodes                                          | `1`                               |
 | `otelCollector.service.type`             | Otel Collector service type                                             | `ClusterIP`                       |
@@ -208,7 +208,7 @@ The following table lists the configurable parameters of the `signoz` chart and
 | `otelCollectorMetrics.name`              | Otel Collector Metrics component name                                   | `otel-collector-metrics`          |
 | `otelCollectorMetrics.image.registry`    | Otel Collector Metrics image registry name                              | `docker.io`                       |
 | `otelCollectorMetrics.image.repository`  | Container image name                                                    | `signoz/signoz-otel-collector`    |
-| `otelCollectorMetrics.image.tag`         | Container image tag                                                     | `0.55.0`                          |
+| `otelCollectorMetrics.image.tag`         | Container image tag                                                     | `0.55.1`                          |
 | `otelCollectorMetrics.image.pullPolicy`  | Container pull policy                                                   | `IfNotPresent`                    |
 | `otelCollectorMetrics.replicaCount`      | Number of otel-collector-metrics nodes                                  | `1`                               |
 | `otelCollectorMetrics.service.type`         | Otel Collector service type                                          | `ClusterIP`                       |
diff --git a/charts/signoz/charts/clickhouse-23.5.2.tgz b/charts/signoz/charts/clickhouse-23.5.2.tgz
deleted file mode 100644
index 214d3bca..00000000
Binary files a/charts/signoz/charts/clickhouse-23.5.2.tgz and /dev/null differ
diff --git a/charts/signoz/charts/clickhouse-23.5.3.tgz b/charts/signoz/charts/clickhouse-23.5.3.tgz
new file mode 100644
index 00000000..c1916c3c
Binary files /dev/null and b/charts/signoz/charts/clickhouse-23.5.3.tgz differ
diff --git a/charts/signoz/charts/k8s-infra-0.1.1.tgz b/charts/signoz/charts/k8s-infra-0.1.1.tgz
new file mode 100644
index 00000000..f70c6561
Binary files /dev/null and b/charts/signoz/charts/k8s-infra-0.1.1.tgz differ
diff --git a/charts/signoz/templates/_helpers.tpl b/charts/signoz/templates/_helpers.tpl
index 8bbeb300..28247cff 100644
--- a/charts/signoz/templates/_helpers.tpl
+++ b/charts/signoz/templates/_helpers.tpl
@@ -503,6 +503,7 @@ nodePort: null
 {{- end -}}
 
 {{/*
+Return structured list of ports config.
 */}}
 {{- define "otelCollector.portsConfig" -}}
 {{- $serviceType := deepCopy .service.type -}}
diff --git a/charts/signoz/templates/frontend/config.yaml b/charts/signoz/templates/frontend/configmap.yaml
similarity index 100%
rename from charts/signoz/templates/frontend/config.yaml
rename to charts/signoz/templates/frontend/configmap.yaml
diff --git a/charts/signoz/templates/frontend/deployment.yaml b/charts/signoz/templates/frontend/deployment.yaml
index 99c23441..a9956c9a 100644
--- a/charts/signoz/templates/frontend/deployment.yaml
+++ b/charts/signoz/templates/frontend/deployment.yaml
@@ -14,7 +14,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/frontend/config.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/frontend/configmap.yaml") . | sha256sum }}
       labels:
         {{- include "frontend.selectorLabels" . | nindent 8 }}
     spec:
diff --git a/charts/signoz/templates/otel-collector-metrics/config.yaml b/charts/signoz/templates/otel-collector-metrics/configmap.yaml
similarity index 100%
rename from charts/signoz/templates/otel-collector-metrics/config.yaml
rename to charts/signoz/templates/otel-collector-metrics/configmap.yaml
diff --git a/charts/signoz/templates/otel-collector-metrics/deployment.yaml b/charts/signoz/templates/otel-collector-metrics/deployment.yaml
index 2b088b34..eea36d8d 100644
--- a/charts/signoz/templates/otel-collector-metrics/deployment.yaml
+++ b/charts/signoz/templates/otel-collector-metrics/deployment.yaml
@@ -21,7 +21,7 @@ spec:
         {{- if .Values.otelCollectorMetrics.podAnnotations -}}
           {{- toYaml .Values.otelCollectorMetrics.podAnnotations | nindent 8 -}}
         {{- end }}
-        checksum/config: {{ include (print $.Template.BasePath "/otel-collector-metrics/config.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/otel-collector-metrics/configmap.yaml") . | sha256sum }}
       labels:
         {{- include "otelCollectorMetrics.selectorLabels" . | nindent 8 }}
     spec:
diff --git a/charts/signoz/templates/otel-collector-metrics/service.yaml b/charts/signoz/templates/otel-collector-metrics/service.yaml
index f08b4e1b..6400afeb 100644
--- a/charts/signoz/templates/otel-collector-metrics/service.yaml
+++ b/charts/signoz/templates/otel-collector-metrics/service.yaml
@@ -5,10 +5,10 @@ metadata:
   labels:
     {{- include "otelCollectorMetrics.labels" . | nindent 4 }}
 {{- with .Values.otelCollectorMetrics }}
-{{- if .annotations }}
+  {{- if .service.annotations }}
   annotations:
-    {{- toYaml .annotations | nindent 4 }}
-{{- end }}
+    {{- toYaml .service.annotations | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .service.type }}
   ports:
diff --git a/charts/signoz/templates/otel-collector/config.yaml b/charts/signoz/templates/otel-collector/configmap.yaml
similarity index 100%
rename from charts/signoz/templates/otel-collector/config.yaml
rename to charts/signoz/templates/otel-collector/configmap.yaml
diff --git a/charts/signoz/templates/otel-collector/deployment.yaml b/charts/signoz/templates/otel-collector/deployment.yaml
index 9ec1320d..2b1bed8c 100644
--- a/charts/signoz/templates/otel-collector/deployment.yaml
+++ b/charts/signoz/templates/otel-collector/deployment.yaml
@@ -23,7 +23,7 @@ spec:
         {{- if .Values.otelCollector.podAnnotations -}}
           {{- toYaml .Values.otelCollector.podAnnotations | nindent 8 -}}
         {{- end }}
-        checksum/config: {{ include (print $.Template.BasePath "/otel-collector/config.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/otel-collector/configmap.yaml") . | sha256sum }}
       labels:
         {{- include "otelCollector.selectorLabels" . | nindent 8 }}
     spec:
diff --git a/charts/signoz/templates/query-service/configmap.yaml b/charts/signoz/templates/query-service/configmap.yaml
index 4abf6f4c..620af0d6 100644
--- a/charts/signoz/templates/query-service/configmap.yaml
+++ b/charts/signoz/templates/query-service/configmap.yaml
@@ -25,8 +25,7 @@ data:
 
     # A scrape configuration containing exactly one endpoint to scrape:
     # Here it's Prometheus itself.
-    scrape_configs:
-      
+    scrape_configs: []
 
     remote_read:
       - url: tcp://{{ include "clickhouse.metricsUrl" . }}
diff --git a/charts/signoz/values.yaml b/charts/signoz/values.yaml
index 0dde74d2..11a6af77 100644
--- a/charts/signoz/values.yaml
+++ b/charts/signoz/values.yaml
@@ -1,4 +1,4 @@
----
+# Global override values
 global:
   image:
     # -- Overrides the Docker registry globally for all images
@@ -6,6 +6,9 @@ global:
   # -- Overrides the storage class for all PVC with persistence enabled.
   storageClass: null
 
+# -- SigNoz chart name override
+nameOverride: ""
+
 # -- SigNoz chart full name override
 fullnameOverride: ""
 
@@ -13,6 +16,7 @@ fullnameOverride: ""
 clusterDomain: cluster.local
 
 # Clickhouse default values
+# For complete list of configurations, check `values.yaml` of `clickhouse` chart.
 # @ignored
 clickhouse:
   # -- Cloud service being deployed on (example: `aws`, `azure`, `gcp`, `hcloud`, `other`).
@@ -95,12 +99,12 @@ clickhouse:
   # case as these values might be too low for a typical deployment.
   # ref: http://kubernetes.io/docs/user-guide/compute-resources/
   resources: {}
+  #   requests:
+  #     cpu: 1000m
+  #     memory: 4Gi
   #   limits:
   #     cpu: 4000m
   #     memory: 16Gi
-  #   requests:
-  #     cpu: 1000m
-  #     memory: 5Gi
 
   # -- Security context for Clickhouse node
   securityContext:
@@ -267,6 +271,18 @@ clickhouse:
     # -- Clickhouse Operator node selector
     nodeSelector: {}
 
+    # Clickhouse logging config
+    logger:
+      # -- Logging level. Acceptable values: trace, debug, information, warning, error.
+      level: information
+      # -- Size of the file. Applies to log and errorlog. Once the file reaches size,
+      # ClickHouse archives and renames it, and creates a new log file in its place.
+      size: 1000M
+      # -- The number of archived log files that ClickHouse stores.
+      count: 10
+      # -- Whether to send log and errorlog to the console instead of file. To enable, set to 1 or true.
+      console: 1
+
     # -- Metrics Exporter config.
     metricsExporter:
       # -- name of the component
@@ -329,7 +345,7 @@ queryService:
   image:
     registry: docker.io
     repository: signoz/query-service
-    tag: 0.11.0
+    tag: 0.11.1
     pullPolicy: IfNotPresent
   imagePullSecrets: []
   serviceAccount:
@@ -412,11 +428,11 @@ queryService:
   # ref: http://kubernetes.io/docs/user-guide/compute-resources/
   resources:
     requests:
-      cpu: 200m
-      memory: 300Mi
-    limits:
-      cpu: 750m
-      memory: 1000Mi
+      cpu: 100m
+      memory: 100Mi
+    # limits:
+    #   cpu: 750m
+    #   memory: 1000Mi
 
   nodeSelector: {}
 
@@ -452,7 +468,7 @@ frontend:
   image:
     registry: docker.io
     repository: signoz/frontend
-    tag: 0.11.0
+    tag: 0.11.1
     pullPolicy: IfNotPresent
   imagePullSecrets: []
   serviceAccount:
@@ -476,7 +492,7 @@ frontend:
         delay: 5
         endpoint: /api/v1/version
         waitMessage: "waiting for query-service"
-        doneMessage: "clickhouse ready, starting frontend now"
+        doneMessage: "query-service ready, starting frontend now"
 
   autoscaling:
     enabled: false
@@ -572,9 +588,9 @@ frontend:
     requests:
       cpu: 100m
       memory: 100Mi
-    limits:
-      cpu: 200m
-      memory: 200Mi
+    # limits:
+    #   cpu: 200m
+    #   memory: 200Mi
 
   nodeSelector: {}
 
@@ -631,7 +647,7 @@ alertmanager:
         delay: 5
         endpoint: /api/v1/version
         waitMessage: "waiting for query-service"
-        doneMessage: "clickhouse ready, starting alertmanager now"
+        doneMessage: "query-service ready, starting alertmanager now"
 
   podSecurityContext:
     fsGroup: 65534
@@ -696,9 +712,9 @@ alertmanager:
     requests:
       cpu: 100m
       memory: 100Mi
-    limits:
-      cpu: 200m
-      memory: 200Mi
+    # limits:
+    #   cpu: 200m
+    #   memory: 200Mi
 
   nodeSelector: {}
 
@@ -822,7 +838,7 @@ otelCollector:
   image:
     registry: docker.io
     repository: signoz/signoz-otel-collector
-    tag: 0.55.0
+    tag: 0.55.1
     pullPolicy: Always
   imagePullSecrets: []
 
@@ -1061,11 +1077,11 @@ otelCollector:
   # ref: http://kubernetes.io/docs/user-guide/compute-resources/
   resources:
     requests:
-      cpu: 200m
-      memory: 400Mi
-    limits:
-      cpu: 1000m
-      memory: 2Gi
+      cpu: 100m
+      memory: 100Mi
+    # limits:
+    #   cpu: 1000m
+    #   memory: 2Gi
 
   nodeSelector: {}
 
@@ -1272,7 +1288,7 @@ otelCollectorMetrics:
   image:
     registry: docker.io
     repository: signoz/signoz-otel-collector
-    tag: 0.55.0
+    tag: 0.55.1
     pullPolicy: Always
   imagePullSecrets: []
 
@@ -1435,11 +1451,11 @@ otelCollectorMetrics:
   # ref: http://kubernetes.io/docs/user-guide/compute-resources/
   resources:
     requests:
-      cpu: 200m
-      memory: 400Mi
-    limits:
-      cpu: 1000m
-      memory: 2Gi
+      cpu: 100m
+      memory: 100Mi
+    # limits:
+    #   cpu: 1000m
+    #   memory: 2Gi
 
   nodeSelector: {}
 
@@ -1558,3 +1574,93 @@ otelCollectorMetrics:
           receivers: [prometheus]
           processors: [batch]
           exporters: [clickhousemetricswrite]
+
+# Default values for k8s-infra.
+# For complete list of configurations, check `values.yaml` of `k8s-infra` chart.
+# @ignored
+k8s-infra:
+  # -- Whether to enable K8s infra monitoring
+  enabled: true
+
+  # -- Endpoint/IP Address of the SigNoz.
+  otelCollectorEndpoint: my-release-signoz-otel-collector.platform.svc.cluster.local:4317
+
+  # Default values for OtelAgent
+  otelAgent:
+    name: "otel-agent"
+    image:
+      registry: docker.io
+      repository: otel/opentelemetry-collector-contrib
+      tag: 0.55.0
+      pullPolicy: IfNotPresent
+    imagePullSecrets: []
+
+    # OpenTelemetry Collector executable
+    command:
+      # -- OtelAgent command name
+      name: /otelcol-contrib
+      # -- OtelAgent command extra arguments
+      extraArgs: []
+
+    configMap:
+      # -- Specifies whether a configMap should be created (true by default)
+      create: true
+
+    # OtelAgent service
+    service:
+      # -- Annotations to use by service associated to OtelAgent
+      annotations: {}
+      # -- Service Type: LoadBalancer (allows external access) or NodePort (more secure, no extra cost)
+      type: ClusterIP
+
+    # -- Configure resource requests and limits. Update according to your own use
+    # case as these values might not be suitable for your workload.
+    # ref: http://kubernetes.io/docs/user-guide/compute-resources/
+    # @default -- See `values.yaml` for defaults
+    resources:
+      requests:
+        cpu: 100m
+        memory: 100Mi
+      # limits:
+      #   cpu: 1000m
+      #   memory: 1Gi
+
+  # Default values for OtelDeployment
+  otelDeployment:
+    name: "otel-deployment"
+    image:
+      registry: docker.io
+      repository: otel/opentelemetry-collector-contrib
+      tag: 0.55.0
+      pullPolicy: IfNotPresent
+    imagePullSecrets: []
+
+    # OpenTelemetry Collector executable
+    command:
+      # -- OtelDeployment command name
+      name: /otelcol-contrib
+      # -- OtelDeployment command extra arguments
+      extraArgs: []
+
+    configMap:
+      # -- Specifies whether a configMap should be created (true by default)
+      create: true
+
+    # OtelDeployment service
+    service:
+      # -- Annotations to use by service associated to OtelDeployment
+      annotations: {}
+      # -- Service Type: LoadBalancer (allows external access) or NodePort (more secure, no extra cost)
+      type: ClusterIP
+
+    # -- Configure resource requests and limits. Update according to your own use
+    # case as these values might not be suitable for your workload.
+    # ref: http://kubernetes.io/docs/user-guide/compute-resources/
+    # @default -- See `values.yaml` for defaults
+    resources:
+      requests:
+        cpu: 100m
+        memory: 100Mi
+      # limits:
+      #   cpu: 1000m
+      #   memory: 1Gi