diff --git a/config/controller/deployment.yaml b/config/controller/deployment.yaml
index f690cbb3..d1081cda 100644
--- a/config/controller/deployment.yaml
+++ b/config/controller/deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: meows-controller
+  name: controller
   namespace: system
 spec:
   selector:
diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml
index 87d95ba2..f500ee3a 100644
--- a/config/controller/kustomization.yaml
+++ b/config/controller/kustomization.yaml
@@ -4,6 +4,8 @@ images:
 - name: quay.io/cybozu/meows-controller
   newTag: 0.2.0
 
+namePrefix: meows-
+
 commonLabels:
   app.kubernetes.io/name: meows
   app.kubernetes.io/component: controller
diff --git a/config/controller/kustomizeconfig.yaml b/config/controller/kustomizeconfig.yaml
index 4da535b2..4e4950b5 100644
--- a/config/controller/kustomizeconfig.yaml
+++ b/config/controller/kustomizeconfig.yaml
@@ -5,7 +5,15 @@ nameReference:
   - kind: Certificate
     group: cert-manager.io
     path: spec/issuerRef/name
-
+- kind: Service
+  version: v1
+  fieldSpecs:
+  - kind: MutatingWebhookConfiguration
+    group: admissionregistration.k8s.io
+    path: webhooks/clientConfig/service/name
+  - kind: ValidatingWebhookConfiguration
+    group: admissionregistration.k8s.io
+    path: webhooks/clientConfig/service/name
 
 namespace:
 - kind: MutatingWebhookConfiguration
diff --git a/kindtest/Makefile b/kindtest/Makefile
index dc577969..2a62c9b4 100644
--- a/kindtest/Makefile
+++ b/kindtest/Makefile
@@ -1,6 +1,6 @@
 CURL := curl -sSLf
 
-KUSTOMIZE_VERSION := 3.8.7
+KUSTOMIZE_VERSION := 4.1.3
 K8S_VERSION := 1.19.7
 KIND_VERSION := 0.11.1
 CERT_MANAGER_VERSION := 1.3.1