diff --git a/tests/kustomize/kustomization.yaml b/tests/kustomize/kustomization.yaml
index 894e8a89..4f33a832 100644
--- a/tests/kustomize/kustomization.yaml
+++ b/tests/kustomize/kustomization.yaml
@@ -6,100 +6,97 @@ kind: Kustomization
 resources:
 - ../../config/deployments/default
 
+
+
 replacements:
-- source: # Uncomment the following block if you have any webhook
+- source:
+    fieldPath: .metadata.name
     kind: Service
-    version: v1
     name: webhook-service
-    fieldPath: .metadata.name # Name of the service
+    version: v1
   targets:
-    - select:
-        kind: Certificate
-        group: cert-manager.io
-        version: v1
-      fieldPaths:
-        - .spec.dnsNames.0
-        - .spec.dnsNames.1
-      options:
-        delimiter: '.'
-        index: 0
-        create: true
+  - fieldPaths:
+    - .spec.dnsNames.0
+    - .spec.dnsNames.1
+    options:
+      create: true
+      delimiter: .
+    select:
+      group: cert-manager.io
+      kind: Certificate
+      version: v1
 - source:
+    fieldPath: .metadata.namespace
     kind: Service
-    version: v1
     name: webhook-service
-    fieldPath: .metadata.namespace # Namespace of the service
+    version: v1
   targets:
-    - select:
-        kind: Certificate
-        group: cert-manager.io
-        version: v1
-      fieldPaths:
-        - .spec.dnsNames.0
-        - .spec.dnsNames.1
-      options:
-        delimiter: '.'
-        index: 1
-        create: true
-
-- source: # Uncomment the following block if you have a ValidatingWebhook (--programmatic-validation)
-    kind: Certificate
+  - fieldPaths:
+    - .spec.dnsNames.0
+    - .spec.dnsNames.1
+    options:
+      create: true
+      delimiter: .
+      index: 1
+    select:
+      group: cert-manager.io
+      kind: Certificate
+      version: v1
+- source:
+    fieldPath: .metadata.namespace
     group: cert-manager.io
+    kind: Certificate
+    name: serving-cert
     version: v1
-    name: serving-cert # This name should match the one in certificate.yaml
-    fieldPath: .metadata.namespace # Namespace of the certificate CR
   targets:
-    - select:
-        kind: ValidatingWebhookConfiguration
-      fieldPaths:
-        - .metadata.annotations.[cert-manager.io/inject-ca-from]
-      options:
-        delimiter: '/'
-        index: 0
-        create: true
+  - fieldPaths:
+    - .metadata.annotations.[cert-manager.io/inject-ca-from]
+    options:
+      create: true
+      delimiter: /
+    select:
+      kind: ValidatingWebhookConfiguration
 - source:
-    kind: Certificate
+    fieldPath: .metadata.name
     group: cert-manager.io
+    kind: Certificate
+    name: serving-cert
     version: v1
-    name: serving-cert # This name should match the one in certificate.yaml
-    fieldPath: .metadata.name
   targets:
-    - select:
-        kind: ValidatingWebhookConfiguration
-      fieldPaths:
-        - .metadata.annotations.[cert-manager.io/inject-ca-from]
-      options:
-        delimiter: '/'
-        index: 1
-        create: true
-
-- source: # Uncomment the following block if you have a DefaultingWebhook (--defaulting )
-    kind: Certificate
+  - fieldPaths:
+    - .metadata.annotations.[cert-manager.io/inject-ca-from]
+    options:
+      create: true
+      delimiter: /
+      index: 1
+    select:
+      kind: ValidatingWebhookConfiguration
+- source:
+    fieldPath: .metadata.namespace
     group: cert-manager.io
+    kind: Certificate
+    name: serving-cert
     version: v1
-    name: serving-cert # This name should match the one in certificate.yaml
-    fieldPath: .metadata.namespace # Namespace of the certificate CR
   targets:
-    - select:
-        kind: MutatingWebhookConfiguration
-      fieldPaths:
-        - .metadata.annotations.[cert-manager.io/inject-ca-from]
-      options:
-        delimiter: '/'
-        index: 0
-        create: true
+  - fieldPaths:
+    - .metadata.annotations.[cert-manager.io/inject-ca-from]
+    options:
+      create: true
+      delimiter: /
+    select:
+      kind: MutatingWebhookConfiguration
 - source:
-    kind: Certificate
+    fieldPath: .metadata.name
     group: cert-manager.io
+    kind: Certificate
+    name: serving-cert
     version: v1
-    name: serving-cert # This name should match the one in certificate.yaml
-    fieldPath: .metadata.name
   targets:
-    - select:
-        kind: MutatingWebhookConfiguration
-      fieldPaths:
-        - .metadata.annotations.[cert-manager.io/inject-ca-from]
-      options:
-        delimiter: '/'
-        index: 1
-        create: true
+  - fieldPaths:
+    - .metadata.annotations.[cert-manager.io/inject-ca-from]
+    options:
+      create: true
+      delimiter: /
+      index: 1
+    select:
+      kind: MutatingWebhookConfiguration