diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index bae9d82a..b10ab361 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -13,7 +13,7 @@ jobs:
 
       - uses: actions/setup-go@v6
         with:
-          go-version: "1.24.5"
+          go-version: "1.26.0"
 
       - name: Cache Go modules
         uses: actions/cache@v5
diff --git a/Makefile b/Makefile
index 98b9b266..e4f0d962 100644
--- a/Makefile
+++ b/Makefile
@@ -176,7 +176,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint-$(GOLANGCI_LINT_VERSION)
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v5.3.0
-CONTROLLER_TOOLS_VERSION ?= v0.14.0
+CONTROLLER_TOOLS_VERSION ?= v0.20.1
 ENVTEST_VERSION ?= release-0.17
 GOLANGCI_LINT_VERSION ?= v1.57.2
 
diff --git a/config/crd/bases/postgresql.lunar.tech_postgresqldatabases.yaml b/config/crd/bases/postgresql.lunar.tech_postgresqldatabases.yaml
index b406b5f8..d82858d4 100644
--- a/config/crd/bases/postgresql.lunar.tech_postgresqldatabases.yaml
+++ b/config/crd/bases/postgresql.lunar.tech_postgresqldatabases.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.20.1
   name: postgresqldatabases.postgresql.lunar.tech
 spec:
   group: postgresql.lunar.tech
@@ -128,7 +128,6 @@ spec:
                   granted to this user to allow access to the resources it may have created
                   before this user was enabled.
 
-
                   This option is here to support legacy applications sharing database
                   instances and should never be used for new databases.
                 type: boolean
diff --git a/config/crd/bases/postgresql.lunar.tech_postgresqlhostcredentials.yaml b/config/crd/bases/postgresql.lunar.tech_postgresqlhostcredentials.yaml
index ebe0e172..09177482 100644
--- a/config/crd/bases/postgresql.lunar.tech_postgresqlhostcredentials.yaml
+++ b/config/crd/bases/postgresql.lunar.tech_postgresqlhostcredentials.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.20.1
   name: postgresqlhostcredentials.postgresql.lunar.tech
 spec:
   group: postgresql.lunar.tech
diff --git a/config/crd/bases/postgresql.lunar.tech_postgresqlserviceusers.yaml b/config/crd/bases/postgresql.lunar.tech_postgresqlserviceusers.yaml
index fc314296..fa5149c0 100644
--- a/config/crd/bases/postgresql.lunar.tech_postgresqlserviceusers.yaml
+++ b/config/crd/bases/postgresql.lunar.tech_postgresqlserviceusers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.20.1
   name: postgresqlserviceusers.postgresql.lunar.tech
 spec:
   group: postgresql.lunar.tech
diff --git a/config/crd/bases/postgresql.lunar.tech_postgresqlusers.yaml b/config/crd/bases/postgresql.lunar.tech_postgresqlusers.yaml
index 8188e82a..88e41331 100644
--- a/config/crd/bases/postgresql.lunar.tech_postgresqlusers.yaml
+++ b/config/crd/bases/postgresql.lunar.tech_postgresqlusers.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.20.1
   name: postgresqlusers.postgresql.lunar.tech
 spec:
   group: postgresql.lunar.tech
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
index 212e47b2..76062af1 100644
--- a/config/rbac/role.yaml
+++ b/config/rbac/role.yaml
@@ -16,6 +16,8 @@ rules:
   - postgresql.lunar.tech
   resources:
   - postgresqldatabases
+  - postgresqlserviceusers
+  - postgresqlusers
   verbs:
   - create
   - delete
@@ -28,6 +30,9 @@ rules:
   - postgresql.lunar.tech
   resources:
   - postgresqldatabases/status
+  - postgresqlhostcredentials/status
+  - postgresqlserviceusers/status
+  - postgresqlusers/status
   verbs:
   - get
   - patch
@@ -44,65 +49,7 @@ rules:
   - postgresql.lunar.tech
   resources:
   - postgresqlhostcredentials/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - postgresql.lunar.tech
-  resources:
-  - postgresqlhostcredentials/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - postgresql.lunar.tech
-  resources:
-  - postgresqlserviceusers
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - postgresql.lunar.tech
-  resources:
   - postgresqlserviceusers/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - postgresql.lunar.tech
-  resources:
-  - postgresqlserviceusers/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - postgresql.lunar.tech
-  resources:
-  - postgresqlusers
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - postgresql.lunar.tech
-  resources:
   - postgresqlusers/finalizers
   verbs:
   - update
-- apiGroups:
-  - postgresql.lunar.tech
-  resources:
-  - postgresqlusers/status
-  verbs:
-  - get
-  - patch
-  - update