diff --git a/go.mod b/go.mod
index 9e6a5e12..dfc42a63 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.23.0
 
 require (
 	github.com/google/uuid v1.6.0
-	github.com/kubewarden/kubewarden-controller v1.21.0-rc1
+	github.com/kubewarden/kubewarden-controller v1.21.0-rc2
 	github.com/rs/zerolog v1.33.0
 	github.com/spf13/cobra v1.8.1
 	github.com/stretchr/testify v1.10.0
diff --git a/go.sum b/go.sum
index 2231c33a..990ac717 100644
--- a/go.sum
+++ b/go.sum
@@ -308,8 +308,8 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kubewarden/kubewarden-controller v1.21.0-rc1 h1:/7Dn2HrQfg4CJz3NXAHyr1IYxfnzzkNc4lPkiMoFMVc=
-github.com/kubewarden/kubewarden-controller v1.21.0-rc1/go.mod h1:Xz3rPz5jMG9DlL7Zq5c02dFngFF17vcLA44wQyh+WKg=
+github.com/kubewarden/kubewarden-controller v1.21.0-rc2 h1:VpB/mwqdy6QqZO+Bq+utnreXnsm6wZ28YhEt//AFNO8=
+github.com/kubewarden/kubewarden-controller v1.21.0-rc2/go.mod h1:47+r8om1JzGK/BhfLQJnS4+Pgw3xJMF8O2b44l9sgzg=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
@@ -805,8 +805,6 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0=
 sigs.k8s.io/controller-runtime v0.6.3/go.mod h1:WlZNXcM0++oyaQt4B7C2lEE5JYRs8vJUzRP4N4JpdAY=
-sigs.k8s.io/controller-runtime v0.20.0 h1:jjkMo29xEXH+02Md9qaVXfEIaMESSpy3TBWPrsfQkQs=
-sigs.k8s.io/controller-runtime v0.20.0/go.mod h1:BrP3w158MwvB3ZbNpaAcIKkHQ7YGpYnzpoSTZ8E14WU=
 sigs.k8s.io/controller-runtime v0.20.1 h1:JbGMAG/X94NeM3xvjenVUaBjy6Ui4Ogd/J5ZtjZnHaE=
 sigs.k8s.io/controller-runtime v0.20.1/go.mod h1:BrP3w158MwvB3ZbNpaAcIKkHQ7YGpYnzpoSTZ8E14WU=
 sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
diff --git a/internal/testutils/testutils.go b/internal/testutils/testutils.go
index da353f94..0c6767e9 100644
--- a/internal/testutils/testutils.go
+++ b/internal/testutils/testutils.go
@@ -267,10 +267,12 @@ func (factory *AdmissionPolicyGroupFactory) Build() *policiesv1.AdmissionPolicyG
 		},
 		Spec: policiesv1.AdmissionPolicyGroupSpec{
 			PolicyGroupSpec: policiesv1.PolicyGroupSpec{
-				ObjectSelector:  factory.objectSelector,
-				PolicyServer:    "default",
-				Rules:           factory.rules,
-				BackgroundAudit: factory.backgroundAudit,
+				GroupSpec: policiesv1.GroupSpec{
+					ObjectSelector:  factory.objectSelector,
+					PolicyServer:    "default",
+					Rules:           factory.rules,
+					BackgroundAudit: factory.backgroundAudit,
+				},
 			},
 		},
 		Status: policiesv1.PolicyStatus{
@@ -444,11 +446,13 @@ func (factory *ClusterAdmissionPolicyGroupFactory) Build() *policiesv1.ClusterAd
 		},
 		Spec: policiesv1.ClusterAdmissionPolicyGroupSpec{
 			NamespaceSelector: factory.namespaceSelector,
-			PolicyGroupSpec: policiesv1.PolicyGroupSpec{
-				ObjectSelector:  factory.objectSelector,
-				PolicyServer:    "default",
-				Rules:           factory.rules,
-				BackgroundAudit: factory.backgroundAudit,
+			ClusterPolicyGroupSpec: policiesv1.ClusterPolicyGroupSpec{
+				GroupSpec: policiesv1.GroupSpec{
+					ObjectSelector:  factory.objectSelector,
+					PolicyServer:    "default",
+					Rules:           factory.rules,
+					BackgroundAudit: factory.backgroundAudit,
+				},
 			},
 		},
 		Status: policiesv1.PolicyStatus{