diff --git a/deploy/docker/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml
index 0e0b005095..08bf0f203e 100644
--- a/deploy/docker/clickhouse-setup/docker-compose.yaml
+++ b/deploy/docker/clickhouse-setup/docker-compose.yaml
@@ -20,7 +20,7 @@ services:
         retries: 3
 
   query-service:
-    image: signoz/query-service:0.3.5
+    image: signoz/query-service:0.3.6
     container_name: query-service
 
     ports:
@@ -36,7 +36,7 @@ services:
         condition: service_healthy
     
   frontend:
-    image: signoz/frontend:0.3.5
+    image: signoz/frontend:0.3.6
     container_name: frontend
 
     depends_on:
@@ -50,7 +50,7 @@ services:
 
 
   otel-collector:
-    image: signoz/otelcol:latest
+    image: signoz/otelcol:0.3.6
     command: ["--config=/etc/otel-collector-config.yaml", "--mem-ballast-size-mib=683"]
     volumes:
       - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml
diff --git a/deploy/docker/druid-kafka-setup/docker-compose-tiny.yaml b/deploy/docker/druid-kafka-setup/docker-compose-tiny.yaml
index 1df568e1ed..87ff11d5a1 100644
--- a/deploy/docker/druid-kafka-setup/docker-compose-tiny.yaml
+++ b/deploy/docker/druid-kafka-setup/docker-compose-tiny.yaml
@@ -147,7 +147,7 @@ services:
       retries: 5
 
   flatten-processor:
-    image: signoz/flattener-processor:0.3.5
+    image: signoz/flattener-processor:0.3.6
     container_name: flattener-processor
 
     depends_on:
@@ -163,7 +163,7 @@ services:
     
 
   query-service:
-    image: signoz.docker.scarf.sh/signoz/query-service:0.3.5
+    image: signoz.docker.scarf.sh/signoz/query-service:0.3.6
     container_name: query-service
 
     depends_on:
@@ -182,7 +182,7 @@ services:
         condition: service_healthy
     
   frontend:
-    image: signoz/frontend:0.3.5
+    image: signoz/frontend:0.3.6
     container_name: frontend
 
     depends_on:
diff --git a/deploy/docker/druid-kafka-setup/docker-compose.yaml b/deploy/docker/druid-kafka-setup/docker-compose.yaml
index 4e9168fa05..3a6120577e 100644
--- a/deploy/docker/druid-kafka-setup/docker-compose.yaml
+++ b/deploy/docker/druid-kafka-setup/docker-compose.yaml
@@ -142,7 +142,7 @@ services:
       retries: 5
 
   flatten-processor:
-    image: signoz/flattener-processor:0.3.5
+    image: signoz/flattener-processor:0.3.6
     container_name: flattener-processor
 
     depends_on:
@@ -158,7 +158,7 @@ services:
     
 
   query-service:
-    image: signoz.docker.scarf.sh/signoz/query-service:0.3.5
+    image: signoz.docker.scarf.sh/signoz/query-service:0.3.6
     container_name: query-service
 
     depends_on:
@@ -177,7 +177,7 @@ services:
         condition: service_healthy
     
   frontend:
-    image: signoz/frontend:0.3.5
+    image: signoz/frontend:0.3.6
     container_name: frontend
 
     depends_on:
diff --git a/deploy/kubernetes/platform/Chart.lock b/deploy/kubernetes/platform/Chart.lock
index 2c7070dc27..09a4a30ea0 100644
--- a/deploy/kubernetes/platform/Chart.lock
+++ b/deploy/kubernetes/platform/Chart.lock
@@ -10,12 +10,12 @@ dependencies:
   version: 0.2.18
 - name: flattener-processor
   repository: file://./signoz-charts/flattener-processor
-  version: 0.3.5
+  version: 0.3.6
 - name: query-service
   repository: file://./signoz-charts/query-service
-  version: 0.3.5
+  version: 0.3.6
 - name: frontend
   repository: file://./signoz-charts/frontend
-  version: 0.3.5
-digest: sha256:c2083da617d4c61f5c56e26c0648b40a3f61ebba52c464005717b9da33a7db93
-generated: "2021-08-20T12:45:02.903711+05:30"
+  version: 0.3.6
+digest: sha256:b160e903c630a90644683c512eb8ba018e18d2c08051e255edd3749cb9cc7228
+generated: "2021-08-23T12:06:37.231066+05:30"
diff --git a/deploy/kubernetes/platform/Chart.yaml b/deploy/kubernetes/platform/Chart.yaml
index 00daca8f99..29bee67bbd 100644
--- a/deploy/kubernetes/platform/Chart.yaml
+++ b/deploy/kubernetes/platform/Chart.yaml
@@ -34,10 +34,10 @@ dependencies:
     version: 0.2.18
   - name: flattener-processor
     repository: "file://./signoz-charts/flattener-processor"
-    version: 0.3.5
+    version: 0.3.6
   - name: query-service
     repository: "file://./signoz-charts/query-service"
-    version: 0.3.5
+    version: 0.3.6
   - name: frontend
     repository: "file://./signoz-charts/frontend"
-    version: 0.3.5
\ No newline at end of file
+    version: 0.3.6
\ No newline at end of file
diff --git a/deploy/kubernetes/platform/signoz-charts/flattener-processor/Chart.yaml b/deploy/kubernetes/platform/signoz-charts/flattener-processor/Chart.yaml
index f49711e363..8b21653f16 100644
--- a/deploy/kubernetes/platform/signoz-charts/flattener-processor/Chart.yaml
+++ b/deploy/kubernetes/platform/signoz-charts/flattener-processor/Chart.yaml
@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.3.5
+version: 0.3.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 0.3.5
+appVersion: 0.3.6
diff --git a/deploy/kubernetes/platform/signoz-charts/frontend/Chart.yaml b/deploy/kubernetes/platform/signoz-charts/frontend/Chart.yaml
index abb4cc6044..6f42297444 100644
--- a/deploy/kubernetes/platform/signoz-charts/frontend/Chart.yaml
+++ b/deploy/kubernetes/platform/signoz-charts/frontend/Chart.yaml
@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.3.5
+version: 0.3.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 0.3.5
+appVersion: 0.3.6
diff --git a/deploy/kubernetes/platform/signoz-charts/query-service/Chart.yaml b/deploy/kubernetes/platform/signoz-charts/query-service/Chart.yaml
index ce1dd96b04..73d48fb948 100644
--- a/deploy/kubernetes/platform/signoz-charts/query-service/Chart.yaml
+++ b/deploy/kubernetes/platform/signoz-charts/query-service/Chart.yaml
@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.3.5
+version: 0.3.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 0.3.5
+appVersion: 0.3.6