diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index d38abc6c2e..1b436a32bb 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -61,7 +61,7 @@ jobs:
       - name: Build  query-service image
         shell: bash
         run: |
-          make build-flattener-amd64
+          make build-query-service-amd64
 
   build-flattener:
     runs-on: ubuntu-latest
@@ -74,4 +74,4 @@ jobs:
       - name: Build flattener docker image
         shell: bash
         run: |
-          make build-query-service-amd64
+          make build-flattener-amd64
diff --git a/Makefile b/Makefile
index 1f2d65709a..085045e339 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,8 @@ REPONAME ?= signoz
 DOCKER_TAG ?= latest
 
 FRONTEND_DOCKER_IMAGE ?= frontend
-FLATTERNER_DOCKER_IMAGE ?= query-service
-QUERY_SERVICE_DOCKER_IMAGE ?= flattener-processor
+QUERY_SERVICE_DOCKER_IMAGE ?= query-service
+FLATTERNER_DOCKER_IMAGE ?= flattener-processor
 
 all: build-push-frontend build-push-query-service build-push-flattener
 # Steps to build and push docker image of frontend