diff --git a/.prow.yaml b/.prow.yaml
index ab08cbe1..3162c8f3 100644
--- a/.prow.yaml
+++ b/.prow.yaml
@@ -91,8 +91,8 @@ presubmits:
             - hack/ci/run-e2e-tests.sh
           resources:
             requests:
-              memory: 4Gi
-              cpu: 2
+              memory: 8Gi
+              cpu: 4
           # docker-in-docker needs privileged mode
           securityContext:
             privileged: true
@@ -114,8 +114,8 @@ presubmits:
               value: main
           resources:
             requests:
-              memory: 4Gi
-              cpu: 2
+              memory: 8Gi
+              cpu: 4
           # docker-in-docker needs privileged mode
           securityContext:
             privileged: true
diff --git a/hack/ci/run-e2e-tests.sh b/hack/ci/run-e2e-tests.sh
index cee06abf..c50fa9f3 100755
--- a/hack/ci/run-e2e-tests.sh
+++ b/hack/ci/run-e2e-tests.sh
@@ -33,7 +33,7 @@ if [ -n "${KCP_TAG:-}" ]; then
     rm -rf "$tmpdir"
 
     # kcp's containers are tagged with the first 8 characters of the Git hash
-    KCP_TAG="${KCP_TAG:0:8}"
+    KCP_TAG="${KCP_TAG:0:9}"
   fi
 
   echo "kcp image tag.......: $KCP_TAG"
diff --git a/test/utils/wait.go b/test/utils/wait.go
index 2f387182..b79b22c0 100644
--- a/test/utils/wait.go
+++ b/test/utils/wait.go
@@ -43,7 +43,7 @@ func WaitForPods(t *testing.T, ctx context.Context, client ctrlruntimeclient.Cli
 		}
 
 		for _, pod := range pods.Items {
-			if !podIsReady(pod) {
+			if !podIsReady(t, pod) {
 				return false, nil
 			}
 		}
@@ -57,12 +57,14 @@ func WaitForPods(t *testing.T, ctx context.Context, client ctrlruntimeclient.Cli
 	t.Log("Pods are ready.")
 }
 
-func podIsReady(pod corev1.Pod) bool {
+func podIsReady(t *testing.T, pod corev1.Pod) bool {
 	for _, cond := range pod.Status.Conditions {
 		if cond.Type == corev1.PodReady {
 			return cond.Status == corev1.ConditionTrue
 		}
 	}
+	t.Logf("Pod %s/%s does not have PodReady condition", pod.Namespace, pod.Name)
+	t.Logf("Pod conditions: %+v", pod.Status.Conditions)
 
 	return false
 }
@@ -73,6 +75,9 @@ func WaitForObject(t *testing.T, ctx context.Context, client ctrlruntimeclient.C
 
 	err := wait.PollUntilContextTimeout(ctx, 500*time.Millisecond, 3*time.Minute, false, func(ctx context.Context) (done bool, err error) {
 		err = client.Get(ctx, key, obj)
+		if err != nil {
+			t.Logf("Waiting for %T to be available: %v", obj, err)
+		}
 		return err == nil, nil
 	})
 	if err != nil {