diff --git a/config/cp-shared/operators/templates/060-catalogsource.yaml b/config/cp-shared/operators/templates/060-catalogsource.yaml
index 47f2d86c..58f428f3 100644
--- a/config/cp-shared/operators/templates/060-catalogsource.yaml
+++ b/config/cp-shared/operators/templates/060-catalogsource.yaml
@@ -1,8 +1,8 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
-  name: ibm-operator-catalog
-  namespace: openshift-marketplace
+  name: {{.Values.spec.catalogName}}
+  namespace: {{.Values.spec.catalogNamespace}}
   annotations:
     argocd.argoproj.io/sync-wave: "60"
 spec:
diff --git a/config/cp-shared/operators/values.yaml b/config/cp-shared/operators/values.yaml
index 00b62d4c..37d8c5f1 100644
--- a/config/cp-shared/operators/values.yaml
+++ b/config/cp-shared/operators/values.yaml
@@ -1,7 +1,5 @@
 ---
-metadata:
-  argocd_namespace: openshift-gitops
-serviceaccount:
-  argocd_application_controller: openshift-gitops-argocd-application-controller
 spec:
   imageCatalog: icr.io/cpopen/ibm-operator-catalog:latest
+  catalogNamespace: openshift-marketplace
+  catalogName: ibm-operator-catalog