diff --git a/config/certmanager/certificate.yaml b/config/certmanager/certificate.yaml
index 16e98cfb4..941616487 100644
--- a/config/certmanager/certificate.yaml
+++ b/config/certmanager/certificate.yaml
@@ -30,7 +30,7 @@ spec:
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  name: hook-server-serving-cert  # this name should match the one appeared in kustomizeconfig.yaml
+  name: hook-server-server-cert  # this name should match the one appeared in kustomizeconfig.yaml
   namespace: system
 spec:
   dnsNames:
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
index 32902819a..dfe88ed35 100644
--- a/config/default/kustomization.yaml
+++ b/config/default/kustomization.yaml
@@ -34,7 +34,7 @@ vars:
     kind: Certificate
     group: cert-manager.io
     version: v1
-    name: hook-server-serving-cert  # this name should match the one in certificate.yaml
+    name: hook-server-server-cert  # this name should match the one in certificate.yaml
   fieldref:
     fieldpath: metadata.namespace
 - name: CERTIFICATE_NAME
@@ -48,7 +48,7 @@ vars:
     kind: Certificate
     group: cert-manager.io
     version: v1
-    name: hook-server-serving-cert  # this name should match the one in certificate.yaml
+    name: hook-server-server-cert  # this name should match the one in certificate.yaml
 - name: SERVICE_NAMESPACE  # namespace of the service
   objref:
     kind: Service
diff --git a/config/hookserver/extensionconfig.yaml b/config/hookserver/extensionconfig.yaml
index 15304c653..d33cee05b 100644
--- a/config/hookserver/extensionconfig.yaml
+++ b/config/hookserver/extensionconfig.yaml
@@ -10,4 +10,4 @@ spec:
       name: hook-server-svc
       namespace: system # Note: this assumes the test extension get deployed in the default namespace defined in its own runtime-extensions-components.yaml
       port: 443
-  namespaceSelector: {}
\ No newline at end of file
+  namespaceSelector: {}