diff --git a/Makefile b/Makefile
index 40f697ae09..bf2b038992 100644
--- a/Makefile
+++ b/Makefile
@@ -69,8 +69,9 @@ build-push-query-service:
 	@echo "--> Building and pushing query-service docker image"
 	@echo "------------------"
 	@cd $(QUERY_SERVICE_DIRECTORY) && \
-	docker buildx build --file Dockerfile --progress plane --no-cache --push --platform linux/arm64,linux/amd64
-	--build-arg LD_FLAGS=$(LD_FLAGS) --tag $(REPONAME)/$(QUERY_SERVICE_DOCKER_IMAGE):$(DOCKER_TAG) .
+	docker buildx build --file Dockerfile --progress plane --no-cache \
+	--push --platform linux/arm64,linux/amd64 --build-arg LD_FLAGS=$(LD_FLAGS) \
+	--tag $(REPONAME)/$(QUERY_SERVICE_DOCKER_IMAGE):$(DOCKER_TAG) .
 
 # Steps to build and push docker image of flattener
 .PHONY: build-flattener-amd64  build-push-flattener
@@ -89,7 +90,8 @@ build-push-flattener:
 	@echo "--> Building and pushing flattener docker image"
 	@echo "------------------"
 	@cd $(FLATTENER_DIRECTORY) && \
-	docker buildx build --file Dockerfile --progress plane --no-cache --push --platform linux/arm64,linux/amd64
+	docker buildx build --file Dockerfile --progress plane \
+	--no-cache --push --platform linux/arm64,linux/amd64 \
 	--tag $(REPONAME)/$(FLATTERNER_DOCKER_IMAGE):$(DOCKER_TAG) .
 
 dev-setup:
diff --git a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml
index f00a6d3ca0..18e11f17f4 100644
--- a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml
+++ b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml
@@ -29,7 +29,7 @@ services:
         condition: on-failure
 
   query-service:
-    image: signoz/query-service:0.7.1
+    image: signoz/query-service:0.7.2
     command: ["-config=/root/config/prometheus.yml"]
     ports:
       - "8080:8080"
@@ -51,7 +51,7 @@ services:
     - clickhouse
 
   frontend:
-    image: signoz/frontend:0.7.1
+    image: signoz/frontend:0.7.2
     depends_on:
       - query-service
     ports:
diff --git a/deploy/docker/clickhouse-setup/docker-compose.arm.yaml b/deploy/docker/clickhouse-setup/docker-compose.arm.yaml
index c6616a10bb..eeca2a87c2 100644
--- a/deploy/docker/clickhouse-setup/docker-compose.arm.yaml
+++ b/deploy/docker/clickhouse-setup/docker-compose.arm.yaml
@@ -24,7 +24,7 @@ services:
       - '--storage.path=/data'
 
   query-service:
-    image: signoz/query-service:0.7.1
+    image: signoz/query-service:0.7.2
     container_name: query-service
     command: ["-config=/root/config/prometheus.yml"]
     volumes:
@@ -44,7 +44,7 @@ services:
         condition: service_healthy
 
   frontend:
-    image: signoz/frontend:0.7.1
+    image: signoz/frontend:0.7.2
     container_name: frontend
     depends_on:
       - query-service
diff --git a/deploy/docker/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml
index 94f579bc84..b360cfe715 100644
--- a/deploy/docker/clickhouse-setup/docker-compose.yaml
+++ b/deploy/docker/clickhouse-setup/docker-compose.yaml
@@ -27,7 +27,7 @@ services:
 
 
   query-service:
-    image: signoz/query-service:0.7.1
+    image: signoz/query-service:0.7.2
     container_name: query-service
     command: ["-config=/root/config/prometheus.yml"]
     volumes:
@@ -47,7 +47,7 @@ services:
         condition: service_healthy
 
   frontend:
-    image: signoz/frontend:0.7.1
+    image: signoz/frontend:0.7.2
     container_name: frontend
     depends_on:
       - query-service
diff --git a/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml b/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml
index defed773e8..d231ab656b 100644
--- a/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml
+++ b/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml
@@ -23,13 +23,15 @@ services:
       - '--storage.path=/data'
 
   query-service:
-    image: signoz/query-service:0.7.1
+    image: signoz/query-service:latest
     container_name: query-service
     command: ["-config=/root/config/prometheus.yml"]
     volumes:
       - ./prometheus.yml:/root/config/prometheus.yml
       - ../dashboards:/root/config/dashboards
       - ./data/signoz/:/var/lib/signoz/
+    ports:
+        - "8180:8080"
     environment:
       - ClickHouseUrl=tcp://clickhouse:9000
       - STORAGE=clickhouse
@@ -39,16 +41,6 @@ services:
       clickhouse:
         condition: service_healthy
 
-  frontend:
-    image: signoz/frontend:0.7.1
-    container_name: frontend
-    depends_on:
-      - query-service
-    ports:
-      - "3301:3301"
-    volumes:
-      - ../common/nginx-config.conf:/etc/nginx/conf.d/default.conf
-
   otel-collector:
     image: signoz/otelcontribcol:0.43.0
     command: ["--config=/etc/otel-collector-config.yaml"]