diff --git a/.github/workflows/build_and_test_x86.yaml b/.github/workflows/build_and_test_x86.yaml
index 48c22b81acd..c02ea162f7d 100644
--- a/.github/workflows/build_and_test_x86.yaml
+++ b/.github/workflows/build_and_test_x86.yaml
@@ -27,8 +27,6 @@ jobs:
           ref: "${{ github.event.pull_request.head.sha }}"
       - run: |
           git fetch --prune --unshallow
-      - name: Log in to registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
diff --git a/Makefile b/Makefile
index 2103840462f..63ba2659e1d 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,10 @@ push-toolkit:
 
 .PHONY: pull-toolkit
 pull-toolkit:
-	$(DOCKER) pull $(TOOLKIT_REPO):$(VERSION)
+	for retry in 1 2 3 ; do \
+		$(DOCKER) pull $(TOOLKIT_REPO):$(VERSION) && exit 0; \
+		sleep 3; \
+	done
 
 .PHONY: build-cli
 build-cli: