diff --git a/Makefile b/Makefile
index ce32a4cc0..1f7b0f17e 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ GOBIN=$(shell go env GOBIN)
 endif
 
 # Dependencies to fetch through `go`
-CONTROLLER_GEN_PKG?=sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.2
+CONTROLLER_GEN_PKG?=sigs.k8s.io/controller-tools/cmd/controller-gen@v0.12.0
 CONTROLLER_GEN=$(GOBIN)/controller-gen
 KUSTOMIZE_PKG?=sigs.k8s.io/kustomize/kustomize/v4@v4.5.2
 KUSTOMIZE=$(GOBIN)/kustomize
diff --git a/config/crd/bases/apps.foundationdb.org_foundationdbbackups.yaml b/config/crd/bases/apps.foundationdb.org_foundationdbbackups.yaml
index 34be290c6..24c00e86e 100644
--- a/config/crd/bases/apps.foundationdb.org_foundationdbbackups.yaml
+++ b/config/crd/bases/apps.foundationdb.org_foundationdbbackups.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: foundationdbbackups.apps.foundationdb.org
 spec:
   group: apps.foundationdb.org
diff --git a/config/crd/bases/apps.foundationdb.org_foundationdbclusters.yaml b/config/crd/bases/apps.foundationdb.org_foundationdbclusters.yaml
index bdabf8862..d5ead81e6 100644
--- a/config/crd/bases/apps.foundationdb.org_foundationdbclusters.yaml
+++ b/config/crd/bases/apps.foundationdb.org_foundationdbclusters.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: foundationdbclusters.apps.foundationdb.org
 spec:
   group: apps.foundationdb.org
diff --git a/config/crd/bases/apps.foundationdb.org_foundationdbrestores.yaml b/config/crd/bases/apps.foundationdb.org_foundationdbrestores.yaml
index fb194d712..4ae0e386d 100644
--- a/config/crd/bases/apps.foundationdb.org_foundationdbrestores.yaml
+++ b/config/crd/bases/apps.foundationdb.org_foundationdbrestores.yaml
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: foundationdbrestores.apps.foundationdb.org
 spec:
   group: apps.foundationdb.org
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
index 957aeb28b..07ab36bbb 100644
--- a/config/rbac/role.yaml
+++ b/config/rbac/role.yaml
@@ -2,7 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: manager-role
 rules:
 - apiGroups:
diff --git a/config/samples/deployment.yaml b/config/samples/deployment.yaml
index 61d727c59..ae5de276c 100644
--- a/config/samples/deployment.yaml
+++ b/config/samples/deployment.yaml
@@ -6,7 +6,6 @@ metadata:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: fdb-kubernetes-operator-manager-clusterrole
 rules:
 - apiGroups:
@@ -19,9 +18,8 @@ rules:
   - watch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
+kind: Role
 metadata:
-  creationTimestamp: null
   name: fdb-kubernetes-operator-manager-role
 rules:
 - apiGroups: