diff --git a/examples/manifests/etcdcluster-with-external-certificates.yaml b/examples/manifests/etcdcluster-with-external-certificates.yaml
index 7471b6aa..9cec35b3 100644
--- a/examples/manifests/etcdcluster-with-external-certificates.yaml
+++ b/examples/manifests/etcdcluster-with-external-certificates.yaml
@@ -44,7 +44,7 @@ spec:
   secretName: ca-peer-secret
   privateKey:
     algorithm: RSA
-    size: 4096
+    size: 2048
   issuerRef:
     name: selfsigned-issuer
     kind: Issuer
@@ -70,7 +70,7 @@ spec:
   secretName: ca-server-secret
   privateKey:
     algorithm: RSA
-    size: 4096
+    size: 2048
   issuerRef:
     name: selfsigned-issuer
     kind: Issuer
@@ -96,7 +96,7 @@ spec:
   secretName: ca-client-secret
   privateKey:
     algorithm: RSA
-    size: 4096
+    size: 2048
   issuerRef:
     name: selfsigned-issuer
     kind: Issuer
@@ -162,7 +162,7 @@ spec:
   privateKey:
     rotationPolicy: Always
     algorithm: RSA
-    size: 4096
+    size: 2048
   issuerRef:
     name: ca-issuer-server
 ---
@@ -197,7 +197,7 @@ spec:
   privateKey:
     rotationPolicy: Always
     algorithm: RSA
-    size: 4096
+    size: 2048
   issuerRef:
     name: ca-issuer-peer
 ---
@@ -216,7 +216,7 @@ spec:
   privateKey:
     rotationPolicy: Always
     algorithm: RSA
-    size: 4096
+    size: 2048
   issuerRef:
     name: ca-issuer-client
     kind: Issuer
diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
index ebcb4530..49d14875 100644
--- a/test/e2e/e2e_test.go
+++ b/test/e2e/e2e_test.go
@@ -222,6 +222,17 @@ allowVolumeExpansion: true
 				ExpectWithOffset(1, err).NotTo(HaveOccurred())
 			})
 
+			Eventually(func() error {
+				cmd := exec.Command("kubectl", "wait",
+					"certificate/client-certificate",
+					"--for", "condition=Ready",
+					"--namespace", namespace,
+					"--timeout", "5m",
+				)
+				_, err = utils.Run(cmd)
+				return err
+			}, time.Second*20, time.Second*2).Should(Succeed(), "wait for client cert ready")
+
 			Eventually(func() error {
 				cmd := exec.Command("kubectl", "wait",
 					"statefulset/test",