diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
index fc78955f..9b927669 100644
--- a/.github/workflows/build-container.yml
+++ b/.github/workflows/build-container.yml
@@ -35,15 +35,13 @@ jobs:
         with:
           go-version: ${{ env.GO_VER }}
 
-      - name: Login to the ${{ env.CONTAINER_REGISTRY }} Container Registry
-        run: podman login quay.io -u ${QUAY_USER} -p ${QUAY_TOKEN}
-        env:
-          QUAY_USER: ${{ secrets.QUAY_USER }}
-          QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}
-
       - name: Build and Push multi-arch Image
         id: push
         run: |
+          make build
+          podman login quay.io -u ${QUAY_USER} -p ${QUAY_TOKEN}
           make gha-push
         env:
-          GO_VER: ${{ env.GO_VER }}
\ No newline at end of file
+          GO_VER: ${{ env.GO_VER }}
+          QUAY_USER: ${{ secrets.QUAY_USER }}
+          QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }} 
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 0bc428e5..426c1e10 100644
--- a/Makefile
+++ b/Makefile
@@ -39,13 +39,13 @@ container-build: build
 		--build-arg RHEL_VERSION=$(RHEL_VERSION) \
 		-t $(CONTAINER_NS)/$(BIN) ./containers
 
-gha-build:
+gha-build: build
 	@echo "Building the container image for GHA"
 	$(CONTAINER_BUILD) -f containers/Containerfile \
 		--build-arg RHEL_VERSION=$(RHEL_VERSION) --platform=linux/amd64,linux/arm64,linux/ppc64le,linux/s390x \
 		-t $(CONTAINER_NS) ./containers --manifest=$(CONTAINER_NS)-manifest:latest
 
-gha-push: build gha-build
+gha-push:
 	@echo "Pushing Container Images & manifest"
 	$(CONTAINER) manifest push $(CONTAINER_NS)-manifest:latest $(CONTAINER_NS)