diff --git a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml
index 425dbde5a3..c5d8e6b630 100644
--- a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml
+++ b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml
@@ -17,19 +17,20 @@ services:
       retries: 3
 
   alertmanager:
-    image: signoz/alertmanager:0.5.0
+    image: signoz/alertmanager:0.6.0
     volumes:
-      - ./alertmanager.yml:/prometheus/alertmanager.yml
       - ./data/alertmanager:/data
     command:
-      - '--config.file=/prometheus/alertmanager.yml'
-      - '--storage.path=/data'
+      - --queryService.url=http://query-service:8080
+      - --storage.path=/data
+    depends_on:
+      - query-service
     deploy:
       restart_policy:
         condition: on-failure
 
   query-service:
-    image: signoz/query-service:0.7.3
+    image: signoz/query-service:0.7.4
     command: ["-config=/root/config/prometheus.yml"]
     ports:
       - "8080:8080"
@@ -48,10 +49,10 @@ services:
       restart_policy:
         condition: on-failure
     depends_on:
-    - clickhouse
+      - clickhouse
 
   frontend:
-    image: signoz/frontend:0.7.3
+    image: signoz/frontend:0.7.4
     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 2d5a638fd9..0540fa2868 100644
--- a/deploy/docker/clickhouse-setup/docker-compose.arm.yaml
+++ b/deploy/docker/clickhouse-setup/docker-compose.arm.yaml
@@ -15,16 +15,17 @@ services:
       retries: 3
 
   alertmanager:
-    image: signoz/alertmanager:0.5.0
+    image: signoz/alertmanager:0.6.0
     volumes:
-      - ./alertmanager.yml:/prometheus/alertmanager.yml
       - ./data/alertmanager:/data
+    depends_on:
+      - query-service
     command:
-      - '--config.file=/prometheus/alertmanager.yml'
-      - '--storage.path=/data'
+      - --queryService.url=http://query-service:8080
+      - --storage.path=/data
 
   query-service:
-    image: signoz/query-service:0.7.3
+    image: signoz/query-service:0.7.4
     container_name: query-service
     command: ["-config=/root/config/prometheus.yml"]
     volumes:
@@ -44,7 +45,7 @@ services:
         condition: service_healthy
 
   frontend:
-    image: signoz/frontend:0.7.3
+    image: signoz/frontend:0.7.4
     container_name: frontend
     depends_on:
       - query-service
@@ -66,7 +67,7 @@ services:
       # - "14268:14268"   # Jaeger receiver
       # - "55678:55678"   # OpenCensus receiver
       # - "55679:55679"   # zpages extension
-      # - "55680:55680"   # OTLP gRPC legacy port
+      # - "55680:55680"   # OTLP gRPC legacy receiver
       # - "55681:55681"   # OTLP HTTP legacy receiver
     mem_limit: 2000m
     restart: on-failure
@@ -93,7 +94,7 @@ services:
         max-file: "3"
     command: ["all"]
     environment:
-    - JAEGER_ENDPOINT=http://otel-collector:14268/api/traces
+      - JAEGER_ENDPOINT=http://otel-collector:14268/api/traces
 
   load-hotrod:
     image: "grubykarol/locust:1.2.3-python3.9-alpine3.12"
diff --git a/deploy/docker/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml
index c161d1c4d4..b9c96c7bdb 100644
--- a/deploy/docker/clickhouse-setup/docker-compose.yaml
+++ b/deploy/docker/clickhouse-setup/docker-compose.yaml
@@ -17,20 +17,17 @@ services:
   alertmanager:
     image: signoz/alertmanager:0.6.0
     volumes:
-    # we no longer need the config file as query services delivers 
-    # the required config now 
-    # - ./alertmanager.yml:/prometheus/alertmanager.yml
       - ./data/alertmanager:/data
     depends_on:
       - query-service
     command:
-      - '--queryService.url=http://query-service:8080'
-      - '--storage.path=/data'
+      - --queryService.url=http://query-service:8080
+      - --storage.path=/data
 
 # Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md`
 
   query-service:
-    image: signoz/query-service:0.7.3
+    image: signoz/query-service:0.7.4
     container_name: query-service
     command: ["-config=/root/config/prometheus.yml"]
     volumes:
@@ -43,14 +40,13 @@ services:
       - GODEBUG=netdns=go
       - TELEMETRY_ENABLED=true
       - DEPLOYMENT_TYPE=docker-standalone-amd
-
     restart: on-failure
     depends_on:
       clickhouse:
         condition: service_healthy
 
   frontend:
-    image: signoz/frontend:0.7.3
+    image: signoz/frontend:0.7.4
     container_name: frontend
     depends_on:
       - query-service
@@ -72,7 +68,7 @@ services:
       # - "14268:14268"   # Jaeger receiver
       # - "55678:55678"   # OpenCensus receiver
       # - "55679:55679"   # zpages extension
-      # - "55680:55680"   # OTLP gRPC legacy port
+      # - "55680:55680"   # OTLP gRPC legacy receiver
       # - "55681:55681"   # OTLP HTTP legacy receiver
     mem_limit: 2000m
     restart: on-failure
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 d231ab656b..0447c26a35 100644
--- a/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml
+++ b/pkg/query-service/tests/test-deploy/docker-compose.arm.yaml
@@ -5,7 +5,6 @@ services:
     image: altinity/clickhouse-server:21.12.3.32.altinitydev.arm
     volumes:
       - ./clickhouse-config.xml:/etc/clickhouse-server/config.xml
-      - ./data/clickhouse/:/var/lib/clickhouse/
     healthcheck:
       # "clickhouse", "client", "-u ${CLICKHOUSE_USER}", "--password ${CLICKHOUSE_PASSWORD}", "-q 'SELECT 1'"
       test: ["CMD", "wget", "--spider", "-q", "localhost:8123/ping"]
@@ -14,13 +13,12 @@ services:
       retries: 3
 
   alertmanager:
-    image: signoz/alertmanager:0.5.0
-    volumes:
-      - ./alertmanager.yml:/prometheus/alertmanager.yml
-      - ./data/alertmanager:/data
+    image: signoz/alertmanager:0.6.0
+    depends_on:
+      - query-service
     command:
-      - '--config.file=/prometheus/alertmanager.yml'
-      - '--storage.path=/data'
+      - --queryService.url=http://query-service:8080
+      - --storage.path=/data
 
   query-service:
     image: signoz/query-service:latest
@@ -29,9 +27,9 @@ services:
     volumes:
       - ./prometheus.yml:/root/config/prometheus.yml
       - ../dashboards:/root/config/dashboards
-      - ./data/signoz/:/var/lib/signoz/
+      - ./data:/var/lib/signoz
     ports:
-        - "8180:8080"
+      - "8180:8080"
     environment:
       - ClickHouseUrl=tcp://clickhouse:9000
       - STORAGE=clickhouse
@@ -72,7 +70,7 @@ services:
         max-file: "3"
     command: ["all"]
     environment:
-    - JAEGER_ENDPOINT=http://otel-collector:14268/api/traces
+      - JAEGER_ENDPOINT=http://otel-collector:14268/api/traces
 
   load-hotrod:
     image: "grubykarol/locust:1.2.3-python3.9-alpine3.12"
@@ -87,4 +85,4 @@ services:
       QUIET_MODE: "${QUIET_MODE:-false}"
       LOCUST_OPTS: "--headless -u 10 -r 1"
     volumes:
-      - ../common/locust-scripts:/locust
+      - ../../../../deploy/docker/common/locust-scripts:/locust
diff --git a/pkg/query-service/tests/test-deploy/docker-compose.yaml b/pkg/query-service/tests/test-deploy/docker-compose.yaml
index 2dbafff539..6edd31b63a 100644
--- a/pkg/query-service/tests/test-deploy/docker-compose.yaml
+++ b/pkg/query-service/tests/test-deploy/docker-compose.yaml
@@ -13,22 +13,25 @@ services:
       retries: 3
 
   alertmanager:
-    image: signoz/alertmanager:0.5.0
-    volumes:
-      - ./alertmanager.yml:/prometheus/alertmanager.yml
+    image: signoz/alertmanager:0.6.0
+    depends_on:
+      - query-service
     command:
-      - '--config.file=/prometheus/alertmanager.yml'
-      - '--storage.path=/data'
+      - --queryService.url=http://query-service:8080
+      - --storage.path=/data
 
 # Notes for Maintainers/Contributors who will change Line Numbers of Frontend & Query-Section. Please Update Line Numbers in `./scripts/commentLinesForSetup.sh` & `./CONTRIBUTING.md`
 
-
   query-service:
     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:/var/lib/signoz
+    ports:
+      - "8180:8080"
     environment:
       - ClickHouseUrl=tcp://clickhouse:9000
       - STORAGE=clickhouse
@@ -37,13 +40,6 @@ services:
     depends_on:
       clickhouse:
         condition: service_healthy
-    ports:
-        - "8180:8080"
-    volumes:
-      - type: bind
-        source: ./data
-        target: /var/lib/signoz
-        read_only: false
 
   otel-collector:
     image: signoz/otelcontribcol:0.43.0