diff --git a/api/bases/keystone.openstack.org_keystoneapis.yaml b/api/bases/keystone.openstack.org_keystoneapis.yaml
index f4bf6952..8800c228 100644
--- a/api/bases/keystone.openstack.org_keystoneapis.yaml
+++ b/api/bases/keystone.openstack.org_keystoneapis.yaml
@@ -84,10 +84,6 @@ spec:
                   files. Those get added to the service config dir in /etc/<service>
                   . TODO: -> implement'
                 type: object
-              enableFederation:
-                default: false
-                description: Enablement of Federation configuration
-                type: boolean
               enableSecureRBAC:
                 default: true
                 description: EnableSecureRBAC - Enable Consistent and Secure RBAC
@@ -524,7 +520,6 @@ spec:
             required:
             - containerImage
             - databaseInstance
-            - enableFederation
             - memcachedInstance
             - rabbitMqClusterName
             - secret
diff --git a/api/v1beta1/keystoneapi_types.go b/api/v1beta1/keystoneapi_types.go
index 734decd6..0d03ed45 100644
--- a/api/v1beta1/keystoneapi_types.go
+++ b/api/v1beta1/keystoneapi_types.go
@@ -187,7 +187,7 @@ type KeystoneAPISpecCore struct {
 
 	// +kubebuilder:validation:Optional
 	// +OIDCFederation - parameters to configure keystone for OIDC federation
-	OIDCFederation KeystoneFederationSpec `json:"oidcFederation,omitempty"`
+	OIDCFederation *KeystoneFederationSpec `json:"oidcFederation,omitempty"`
 }
 
 // APIOverrideSpec to override the generated manifest of several child resources.
diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
index 4465414d..f9ce9672 100644
--- a/api/v1beta1/zz_generated.deepcopy.go
+++ b/api/v1beta1/zz_generated.deepcopy.go
@@ -205,7 +205,11 @@ func (in *KeystoneAPISpecCore) DeepCopyInto(out *KeystoneAPISpecCore) {
 	}
 	in.Override.DeepCopyInto(&out.Override)
 	in.TLS.DeepCopyInto(&out.TLS)
-	out.OIDCFederation = in.OIDCFederation
+	if in.OIDCFederation != nil {
+		in, out := &in.OIDCFederation, &out.OIDCFederation
+		*out = new(KeystoneFederationSpec)
+		**out = **in
+	}
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KeystoneAPISpecCore.
diff --git a/config/crd/bases/keystone.openstack.org_keystoneapis.yaml b/config/crd/bases/keystone.openstack.org_keystoneapis.yaml
index f4bf6952..8800c228 100644
--- a/config/crd/bases/keystone.openstack.org_keystoneapis.yaml
+++ b/config/crd/bases/keystone.openstack.org_keystoneapis.yaml
@@ -84,10 +84,6 @@ spec:
                   files. Those get added to the service config dir in /etc/<service>
                   . TODO: -> implement'
                 type: object
-              enableFederation:
-                default: false
-                description: Enablement of Federation configuration
-                type: boolean
               enableSecureRBAC:
                 default: true
                 description: EnableSecureRBAC - Enable Consistent and Secure RBAC
@@ -524,7 +520,6 @@ spec:
             required:
             - containerImage
             - databaseInstance
-            - enableFederation
             - memcachedInstance
             - rabbitMqClusterName
             - secret
diff --git a/controllers/keystoneapi_controller.go b/controllers/keystoneapi_controller.go
index 19374483..b3ff3516 100644
--- a/controllers/keystoneapi_controller.go
+++ b/controllers/keystoneapi_controller.go
@@ -1188,9 +1188,6 @@ func (r *KeystoneAPIReconciler) generateServiceConfigMaps(
 	dbSecret := db.GetSecret()
 
 	enableFederation := false
-	if &instance.Spec.OIDCFederation != nil {
-		enableFederation = true
-	}
 
 	templateParameters := map[string]interface{}{
 		"memcachedServers": mc.GetMemcachedServerListString(),