diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
index 4ff64cf..8dde391 100644
--- a/config/default/kustomization.yaml
+++ b/config/default/kustomization.yaml
@@ -6,7 +6,7 @@ namespace: statefulset-resize-controller-system
 # "wordpress" becomes "alices-wordpress".
 # Note that it should also match with the prefix (text before '-') of the namespace
 # field above.
-namePrefix: statefulset-resize-controller-
+namePrefix: statefulset-resize-
 
 # Labels to add to all resources and selectors.
 #commonLabels:
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 2bcd3ee..cc05bda 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -1,4 +1,5 @@
 resources:
+- namespace.yaml
 - manager.yaml
 
 generatorOptions:
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 79adfe7..527eade 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -1,10 +1,3 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    control-plane: controller-manager
-  name: system
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -25,9 +18,7 @@ spec:
       securityContext:
         runAsNonRoot: true
       containers:
-      - command:
-        - /manager
-        args:
+      - args:
         - --leader-elect
         image: controller:latest
         name: manager
diff --git a/config/manager/namespace.yaml b/config/manager/namespace.yaml
new file mode 100644
index 0000000..8b55c3c
--- /dev/null
+++ b/config/manager/namespace.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  labels:
+    control-plane: controller-manager
+  name: system
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
index 4c50815..deef486 100644
--- a/config/rbac/role.yaml
+++ b/config/rbac/role.yaml
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   creationTimestamp: null
-  name: manager-role
+  name: controller-manager
 rules:
 - apiGroups:
   - apps
@@ -55,7 +55,7 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - persistentvolumeclaim
+  - persistentvolumeclaims
   verbs:
   - create
   - delete
diff --git a/config/rbac/role_binding.yaml b/config/rbac/role_binding.yaml
index 2070ede..35ff614 100644
--- a/config/rbac/role_binding.yaml
+++ b/config/rbac/role_binding.yaml
@@ -5,7 +5,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: manager-role
+  name: controller-manager
 subjects:
 - kind: ServiceAccount
   name: controller-manager
diff --git a/controllers/controller.go b/controllers/controller.go
index 3ab1b3e..621cfe0 100644
--- a/controllers/controller.go
+++ b/controllers/controller.go
@@ -25,7 +25,7 @@ type StatefulSetReconciler struct {
 //+kubebuilder:rbac:groups=apps,resources=statefulsets,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=apps,resources=statefulsets/status,verbs=get;update;patch
 //+kubebuilder:rbac:groups=apps,resources=statefulsets/finalizers,verbs=update
-//+kubebuilder:rbac:groups=core,resources=persistentvolumeclaim,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=core,resources=persistentvolumeclaims,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=batch,resources=jobs,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=batch,resources=jobs/status,verbs=get;update;patch
 
diff --git a/main.go b/main.go
index 367456e..6f42dfc 100644
--- a/main.go
+++ b/main.go
@@ -21,7 +21,7 @@ import (
 )
 
 //go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./..."
-//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen crd:trivialVersions=true rbac:roleName=manager-role paths="./..."
+//go:generate go run sigs.k8s.io/controller-tools/cmd/controller-gen crd:trivialVersions=true rbac:roleName=controller-manager paths="./..."
 
 var (
 	scheme   = runtime.NewScheme()