diff --git a/hyperconverged/kustomization.yaml b/hyperconverged/kustomization.yaml
deleted file mode 100644
index d8f2a54..0000000
--- a/hyperconverged/kustomization.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-bases:
-  - base
-resources:
-  - namespace.yaml
diff --git a/kubevirt/catalog_source.yaml b/kubevirt/catalog_source.yaml
new file mode 100644
index 0000000..a1db9ca
--- /dev/null
+++ b/kubevirt/catalog_source.yaml
@@ -0,0 +1,11 @@
+---
+apiVersion: operators.coreos.com/v1alpha1
+kind: CatalogSource
+metadata:
+  name: hco-unstable-catalog-source
+  namespace: openshift-marketplace
+spec:
+  sourceType: grpc
+  image: quay.io/kubevirt/hyperconverged-cluster-index:1.5.0-unstable
+  displayName: Kubevirt Hyperconverged Cluster Operator
+  publisher: Kubevirt Project
diff --git a/hyperconverged/base/hco_cr.yaml b/kubevirt/hco_cr.yaml
similarity index 100%
rename from hyperconverged/base/hco_cr.yaml
rename to kubevirt/hco_cr.yaml
diff --git a/hyperconverged/base/kustomization.yaml b/kubevirt/kustomization.yaml
similarity index 79%
rename from hyperconverged/base/kustomization.yaml
rename to kubevirt/kustomization.yaml
index cef378b..08259a3 100644
--- a/hyperconverged/base/kustomization.yaml
+++ b/kubevirt/kustomization.yaml
@@ -1,8 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: kubevirt-hyperconverged
 
 resources:
+  - catalog_source.yaml
   - operator_group.yaml
   - subscription.yaml
   - hco_cr.yaml
diff --git a/hyperconverged/namespace.yaml b/kubevirt/namespace.yaml
similarity index 100%
rename from hyperconverged/namespace.yaml
rename to kubevirt/namespace.yaml
diff --git a/hyperconverged/base/operator_group.yaml b/kubevirt/operator_group.yaml
similarity index 75%
rename from hyperconverged/base/operator_group.yaml
rename to kubevirt/operator_group.yaml
index 7d3e737..3e641cc 100644
--- a/hyperconverged/base/operator_group.yaml
+++ b/kubevirt/operator_group.yaml
@@ -2,4 +2,5 @@ apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
   name: kubevirt-hyperconverged-group
+  namespace: kubevirt-hyperconverged
 spec: {}
diff --git a/hyperconverged/base/subscription.yaml b/kubevirt/subscription.yaml
similarity index 76%
rename from hyperconverged/base/subscription.yaml
rename to kubevirt/subscription.yaml
index e6f1eb5..63397da 100644
--- a/hyperconverged/base/subscription.yaml
+++ b/kubevirt/subscription.yaml
@@ -2,9 +2,10 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
   name: hco-operatorhub
+  namespace: kubevirt-hyperconverged
 spec:
   source: kubevirt-hyperconverged
-  sourceNamespace: kubevirt-hyperconverged
+  sourceNamespace: openshift-marketplace
   name: community-kubevirt-hyperconverged
   startingCSV: kubevirt-hyperconverged-operator.v1.5.0
   channel: "1.5.0"