diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..dcd7df6
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,5 @@
+---
+- project:
+    name: infrawatch/smart-gateway-operator
+    templates:
+      - stf-crc-jobs
diff --git a/deploy/olm-catalog/smart-gateway-operator/manifests/smart-gateway-operator.clusterserviceversion.yaml b/deploy/olm-catalog/smart-gateway-operator/manifests/smart-gateway-operator.clusterserviceversion.yaml
index 08a8254..17f2848 100644
--- a/deploy/olm-catalog/smart-gateway-operator/manifests/smart-gateway-operator.clusterserviceversion.yaml
+++ b/deploy/olm-catalog/smart-gateway-operator/manifests/smart-gateway-operator.clusterserviceversion.yaml
@@ -72,7 +72,7 @@ metadata:
     features.operators.openshift.io/cnf: "false"
     features.operators.openshift.io/cni: "false"
     features.operators.openshift.io/csi: "false"
-    features.operators.openshift.io/disconnected: "false"
+    features.operators.openshift.io/disconnected: "true"
     features.operators.openshift.io/fips-compliant: "false"
     features.operators.openshift.io/proxy-aware: "false"
     features.operators.openshift.io/tls-profiles: "false"
@@ -185,14 +185,6 @@ spec:
           - update
           - patch
           - watch
-        - apiGroups:
-          - ""
-          resources:
-          - namespaces
-          verbs:
-          - get
-          - list
-          - watch
         - apiGroups:
           - rbac.authorization.k8s.io
           resources:
@@ -341,14 +333,6 @@ spec:
           - rolebindings
           verbs:
           - create
-        - apiGroups:
-          - ""
-          resources:
-          - namespaces
-          verbs:
-          - get
-          - list
-          - watch
         - apiGroups:
           - rbac.authorization.k8s.io
           resources:
diff --git a/deploy/role.yaml b/deploy/role.yaml
index cbfdab4..a9c29a5 100644
--- a/deploy/role.yaml
+++ b/deploy/role.yaml
@@ -48,14 +48,6 @@ rules:
   - update
   - patch
   - watch
-- apiGroups:
-  - ""
-  resources:
-  - namespaces
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - rbac.authorization.k8s.io
   resources:
@@ -159,14 +151,6 @@ rules:
   - rolebindings
   verbs:
   - create
-- apiGroups:
-  - ""
-  resources:
-  - namespaces
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - rbac.authorization.k8s.io
   resources:
diff --git a/roles/smartgateway/templates/deployment.yaml.j2 b/roles/smartgateway/templates/deployment.yaml.j2
index 25c6c0e..fa8f702 100644
--- a/roles/smartgateway/templates/deployment.yaml.j2
+++ b/roles/smartgateway/templates/deployment.yaml.j2
@@ -36,7 +36,7 @@ spec:
         - -cookie-secret-file=/etc/proxy/secrets/session_secret
         - -openshift-service-account={{ service_account_name }}
         - -upstream=http://localhost:8081/
-        - '-openshift-delegate-urls={"/": {"resource": "namespaces", "verb": "get"}}'
+        - '-openshift-delegate-urls={"/": {"namespace": "{{ ansible_operator_meta.namespace }}", "resource": "smartgateways", "group": "smartgateway.infra.watch", "verb": "get"}}'
         ports:
         - containerPort: 8083
           name: https