diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4dd9bd9164..5c44d9cf0b 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -108,3 +108,13 @@ jobs:
           CLUSTER_NAME: webhook
           IMAGE_REPO: cnrancher/webhook
           IMAGE_TAG: "${{ env.IMAGE_TAG }}"
+
+      - name: Dump logs
+        if: failure()
+        run: |
+          kubectl get pods -n cattle-system -l app=rancher-webhook -o wide || true
+          kubectl describe pods -n cattle-system -l app=rancher-webhook || true
+          kubectl logs -n cattle-system -l app=rancher-webhook --all-containers=true --tail=-1 --timestamps=true || true
+          echo "Dumping webhook configurations:"
+          kubectl get mutatingwebhookconfiguration rancher.cattle.io -o yaml || true
+          kubectl get validatingwebhookconfiguration rancher.cattle.io -o yaml || true
diff --git a/Makefile b/Makefile
index 5efe3feb92..e3d17e3871 100644
--- a/Makefile
+++ b/Makefile
@@ -73,12 +73,12 @@ image: build
 		--build-arg COMMIT=$${COMMIT} \
 		--build-arg RD_ONLY_GH_TOKEN=$${OAUTH_TOKEN} \
 		--platform=$(PLATFORM) \
-		-t rancher/webhook:$${TAG} \
+		-t cnrancher/webhook:$${TAG} \
 		--load \
 		. && \
 	mkdir -p dist && \
 	chmod a+rwx dist && \
-	docker save -o dist/rancher-webhook-image.tar rancher/webhook:$${TAG} && \
+	docker save -o dist/rancher-webhook-image.tar cnrancher/webhook:$${TAG} && \
 	echo IMAGE_TAG=$${TAG} > dist/image_tag'
 
 #push-image is used by the publish-image github action