diff --git a/bundle/manifests/lvm-operator.clusterserviceversion.yaml b/bundle/manifests/lvm-operator.clusterserviceversion.yaml
index b4f3b9cb4..2b4dcac69 100644
--- a/bundle/manifests/lvm-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/lvm-operator.clusterserviceversion.yaml
@@ -285,7 +285,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.name
-                image: quay.io/nibalach/lvm-operator:e2e
+                image: quay.io/ocs-dev/lvm-operator:latest
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -310,7 +310,7 @@ spec:
                   allowPrivilegeEscalation: false
               - command:
                 - /metricsexporter
-                image: quay.io/nibalach/lvm-operator:e2e
+                image: quay.io/ocs-dev/lvm-operator:latest
                 name: metricsexporter
                 resources: {}
               securityContext:
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
index 9dfa92b46..a82482514 100644
--- a/config/default/kustomization.yaml
+++ b/config/default/kustomization.yaml
@@ -1,5 +1,5 @@
 # Adds namespace to all resources.
-namespace: lvm-operator-system
+namespace: openshift-storage
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named
diff --git a/config/default/manager_custom_env.yaml b/config/default/manager_custom_env.yaml
new file mode 100644
index 000000000..e495e8548
--- /dev/null
+++ b/config/default/manager_custom_env.yaml
@@ -0,0 +1,21 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: controller-manager
+  namespace: system
+spec:
+  template:
+    spec:
+      containers:
+      - name: manager
+        env:
+        - name: TOPOLVM_CSI_IMAGE
+          value: quay.io/topolvm/topolvm:0.11.0
+        - name: CSI_LIVENESSPROBE_IMAGE
+          value: k8s.gcr.io/sig-storage/livenessprobe:v2.5.0
+        - name: CSI_PROVISIONER_IMAGE
+          value: k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0
+        - name: CSI_REGISTRAR_IMAGE
+          value: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0
+        - name: CSI_RESIZER_IMAGE
+          value: k8s.gcr.io/sig-storage/csi-resizer:v1.3.0
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 4fe5ccaa3..f60c3c633 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -3,3 +3,10 @@ resources:
 
 generatorOptions:
   disableNameSuffixHash: true
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+images:
+- name: controller
+  newName: quay.io/ocs-dev/lvm-operator
+  newTag: latest
+namePrefix: lvm-operator-
diff --git a/config/manifests/bases/lvm-operator.clusterserviceversion.yaml b/config/manifests/bases/lvm-operator.clusterserviceversion.yaml
new file mode 100644
index 000000000..6d75cbaa5
--- /dev/null
+++ b/config/manifests/bases/lvm-operator.clusterserviceversion.yaml
@@ -0,0 +1,49 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: ClusterServiceVersion
+metadata:
+  annotations:
+    alm-examples: '[]'
+    capabilities: Basic Install
+  name: lvm-operator.v0.0.0
+  namespace: placeholder
+spec:
+  apiservicedefinitions: {}
+  customresourcedefinitions:
+    owned:
+    - description: LVMCluster is the Schema for the lvmclusters API
+      displayName: LVMCluster
+      kind: LVMCluster
+      name: lvmclusters.lvm.topolvm.io
+      version: v1alpha1
+  description: The ODF LVM Operator manages local storage using LVM.
+  displayName: ODF LVM Operator
+  icon:
+  - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxOTIgMTQ1Ij48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2UwMDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlJlZEhhdC1Mb2dvLUhhdC1Db2xvcjwvdGl0bGU+PHBhdGggZD0iTTE1Ny43Nyw2Mi42MWExNCwxNCwwLDAsMSwuMzEsMy40MmMwLDE0Ljg4LTE4LjEsMTcuNDYtMzAuNjEsMTcuNDZDNzguODMsODMuNDksNDIuNTMsNTMuMjYsNDIuNTMsNDRhNi40Myw2LjQzLDAsMCwxLC4yMi0xLjk0bC0zLjY2LDkuMDZhMTguNDUsMTguNDUsMCwwLDAtMS41MSw3LjMzYzAsMTguMTEsNDEsNDUuNDgsODcuNzQsNDUuNDgsMjAuNjksMCwzNi40My03Ljc2LDM2LjQzLTIxLjc3LDAtMS4wOCwwLTEuOTQtMS43My0xMC4xM1oiLz48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0xMjcuNDcsODMuNDljMTIuNTEsMCwzMC42MS0yLjU4LDMwLjYxLTE3LjQ2YTE0LDE0LDAsMCwwLS4zMS0zLjQybC03LjQ1LTMyLjM2Yy0xLjcyLTcuMTItMy4yMy0xMC4zNS0xNS43My0xNi42QzEyNC44OSw4LjY5LDEwMy43Ni41LDk3LjUxLjUsOTEuNjkuNSw5MCw4LDgzLjA2LDhjLTYuNjgsMC0xMS42NC01LjYtMTcuODktNS42LTYsMC05LjkxLDQuMDktMTIuOTMsMTIuNSwwLDAtOC40MSwyMy43Mi05LjQ5LDI3LjE2QTYuNDMsNi40MywwLDAsMCw0Mi41Myw0NGMwLDkuMjIsMzYuMywzOS40NSw4NC45NCwzOS40NU0xNjAsNzIuMDdjMS43Myw4LjE5LDEuNzMsOS4wNSwxLjczLDEwLjEzLDAsMTQtMTUuNzQsMjEuNzctMzYuNDMsMjEuNzdDNzguNTQsMTA0LDM3LjU4LDc2LjYsMzcuNTgsNTguNDlhMTguNDUsMTguNDUsMCwwLDEsMS41MS03LjMzQzIyLjI3LDUyLC41LDU1LC41LDc0LjIyYzAsMzEuNDgsNzQuNTksNzAuMjgsMTMzLjY1LDcwLjI4LDQ1LjI4LDAsNTYuNy0yMC40OCw1Ni43LTM2LjY1LDAtMTIuNzItMTEtMjcuMTYtMzAuODMtMzUuNzgiLz48L3N2Zz4=
+    mediatype: image/svg+xml
+  install:
+    spec:
+      deployments: null
+    strategy: ""
+  installModes:
+  - supported: true
+    type: OwnNamespace
+  - supported: true
+    type: SingleNamespace
+  - supported: false
+    type: MultiNamespace
+  - supported: false
+    type: AllNamespaces
+  keywords:
+  - local storage
+  - operator
+  - LVM
+  links:
+  - name: Lvm Operator
+    url: https://lvm-operator.domain
+  maintainers:
+  - email: ocs-support@redhat.com
+    name: Red Hat Support
+  maturity: alpha
+  provider:
+    name: Red Hat
+  version: 0.0.0