diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
index 6045141..5a079fc 100644
--- a/config/default/kustomization.yaml
+++ b/config/default/kustomization.yaml
@@ -18,6 +18,8 @@ resources:
 - ../crd
 - ../rbac
 - ../manager
+- ../ns
+
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
 # crd/kustomization.yaml
 #- ../webhook
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 583c345..33efd49 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -1,15 +1,3 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    control-plane: controller-manager
-    app.kubernetes.io/name: namespace
-    app.kubernetes.io/instance: system
-    app.kubernetes.io/component: manager
-    app.kubernetes.io/created-by: rsct-operator
-    app.kubernetes.io/part-of: rsct-operator
-    app.kubernetes.io/managed-by: kustomize
-  name: system
 ---
 apiVersion: apps/v1
 kind: Deployment
diff --git a/config/manifests/bases/rsct-operator.clusterserviceversion.yaml b/config/manifests/bases/rsct-operator.clusterserviceversion.yaml
index a6cc21a..756bc6e 100644
--- a/config/manifests/bases/rsct-operator.clusterserviceversion.yaml
+++ b/config/manifests/bases/rsct-operator.clusterserviceversion.yaml
@@ -4,18 +4,23 @@ metadata:
   annotations:
     alm-examples: '[]'
     capabilities: Basic Install
+    support: IBM
+    categories: "OpenShift Optional"
+    containerImage: "ghcr.io/ocp-power-automation/rsct-operator:latest"
+    repository: "https://github.com/ocp-power-automation/rsct-operator"
+    description: Deploys RSCT daemonset on all nodes of an OpenShift cluster
   name: rsct-operator.v0.0.0
-  namespace: placeholder
+  namespace: rsct-operator-system
 spec:
   apiservicedefinitions: {}
   customresourcedefinitions:
     owned:
-    - description: RSCT is the Schema for the rscts API
+    - description: RSCT custom resource is the schema for the rscts API
       displayName: RSCT
       kind: RSCT
       name: rscts.rsct.ibm.com
       version: v1alpha1
-  description: Deploys RSCT on all nodes of an OpenShift cluster.
+  description: Deploys custom resource RSCT on all nodes of an OpenShift cluster.
   displayName: RSCT Operator for IBM Power Virtual Server
   icon:
   - base64data: ""
@@ -41,7 +46,7 @@ spec:
   - power
   links:
   - name: Rsct Operator
-    url: https://rsct-operator.domain
+    url: https://github.com/ocp-power-automation/rsct-operator
   maintainers:
   - email: mjturek@us.ibm.com
     name: Michael Turek
diff --git a/config/ns/kustomization.yaml b/config/ns/kustomization.yaml
new file mode 100644
index 0000000..27c7d16
--- /dev/null
+++ b/config/ns/kustomization.yaml
@@ -0,0 +1,2 @@
+resources:
+  - ns.yaml
diff --git a/config/ns/ns.yaml b/config/ns/ns.yaml
new file mode 100644
index 0000000..602e8cc
--- /dev/null
+++ b/config/ns/ns.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  labels:
+    control-plane: controller-manager
+    app.kubernetes.io/name: namespace
+    app.kubernetes.io/instance: system
+    app.kubernetes.io/component: manager
+    app.kubernetes.io/created-by: rsct-operator
+    app.kubernetes.io/part-of: rsct-operator
+    app.kubernetes.io/managed-by: kustomize
+    openshift.io/cluster-monitoring: "true"
+    pod-security.kubernetes.io/enforce: privileged
+    pod-security.kubernetes.io/audit: privileged
+    pod-security.kubernetes.io/warn: privileged
+  name: rsct-operator-system