diff --git a/docs/dictionary/en-custom.txt b/docs/dictionary/en-custom.txt
index c3ad93607..b0eba327d 100644
--- a/docs/dictionary/en-custom.txt
+++ b/docs/dictionary/en-custom.txt
@@ -583,6 +583,7 @@ rsa
 rsync
 runtime
 RHCOS
+RHSSO
 scansettingbinding
 scap
 scp
diff --git a/roles/federation/README.md b/roles/federation/README.md
index ea28a9882..1b1ce2d40 100644
--- a/roles/federation/README.md
+++ b/roles/federation/README.md
@@ -28,6 +28,7 @@ This role supports testing all OIDC authentication methods available in keystone
 
 | Variable | Default | Description |
 |----------|---------|-------------|
+| `cifmw_federation_operator_namespace` | `keycloak-operators` | Kubernetes namespace for the RHSSO operator |
 | `cifmw_federation_keycloak_namespace` | `openstack` | Kubernetes namespace for Keycloak |
 | `cifmw_federation_run_osp_cmd_namespace` | `openstack` | Kubernetes namespace for openstackclient |
 | `cifmw_federation_domain` | - | Base domain for service URLs |
diff --git a/roles/federation/defaults/main.yml b/roles/federation/defaults/main.yml
index d0d07293c..5437dfcdf 100644
--- a/roles/federation/defaults/main.yml
+++ b/roles/federation/defaults/main.yml
@@ -12,7 +12,7 @@
 # Basic namespace and domain settings for the federation deployment
 
 # Kubernetes namespaces
-cifmw_federation_operator_namespace: openstack-operators
+cifmw_federation_operator_namespace: keycloak-operators
 cifmw_federation_keycloak_namespace: openstack
 cifmw_federation_run_osp_cmd_namespace: openstack
 
diff --git a/roles/federation/tasks/run_keycloak_setup.yml b/roles/federation/tasks/run_keycloak_setup.yml
index 73e9bf87d..f945c3617 100644
--- a/roles/federation/tasks/run_keycloak_setup.yml
+++ b/roles/federation/tasks/run_keycloak_setup.yml
@@ -28,13 +28,20 @@
     mode: "0640"
   when: cifmw_federation_deploy_type == "crc"
 
-- name: Create namespace
+- name: Create keycloak namespace
   kubernetes.core.k8s:
     name: "{{ cifmw_federation_keycloak_namespace }}"
     api_version: v1
     kind: Namespace
     state: present
 
+- name: Create operator namespace
+  kubernetes.core.k8s:
+    name: "{{ cifmw_federation_operator_namespace }}"
+    api_version: v1
+    kind: Namespace
+    state: present
+
 - name: Read federation rhsso operator template
   ansible.builtin.template:
     src: rhsso-operator-olm.yaml.j2