diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e6a8591..1ea2b95 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -28,9 +28,12 @@ jobs:
       - name: Refresh module hashsums
         run: make tidy
       - name: Build
-        run: make build
+        run: |
+          docker login ghcr.io -u snskArora --password $AUTH
+          make build
         env:
           VERSION: latest
+          AUTH: ${{ steps.generate_token.outputs.token }}
 
       - name: Generate token
         id: generate_token
@@ -43,7 +46,6 @@ jobs:
         run: make push
         env:
           VERSION: latest
-          AUTH: ${{ steps.generate_token.outputs.token }}
 
       - name: Test
         run: make test
diff --git a/Makefile b/Makefile
index f57fda3..77e0527 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,6 @@ push:
 		echo "VERSION is required"; \
 		exit 1; \
 	fi
-	@echo $(AUTH) | docker login ghcr.io -u snskarora --password-stdin
 	docker push $(IMAGE_REPO):$(VERSION)
 
 .PHONY: test