diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..9e27903b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+**/overlays/*-local/
diff --git a/cluster-scope/base/operators.coreos.com/subscriptions/acm/kustomization.yaml b/cluster-scope/base/operators.coreos.com/subscriptions/acm/kustomization.yaml
index b2d134b7..f1b116fe 100644
--- a/cluster-scope/base/operators.coreos.com/subscriptions/acm/kustomization.yaml
+++ b/cluster-scope/base/operators.coreos.com/subscriptions/acm/kustomization.yaml
@@ -1,4 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: open-cluster-management
 resources:
 - subscription.yaml
diff --git a/cluster-scope/base/operators.coreos.com/subscriptions/acm/subscription.yaml b/cluster-scope/base/operators.coreos.com/subscriptions/acm/subscription.yaml
index 37f2c98f..ab7e4adf 100644
--- a/cluster-scope/base/operators.coreos.com/subscriptions/acm/subscription.yaml
+++ b/cluster-scope/base/operators.coreos.com/subscriptions/acm/subscription.yaml
@@ -2,7 +2,6 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
     name: acm
-    namespace: open-cluster-management
 spec:
     channel: release-2.5
     installPlanApproval: Automatic
diff --git a/cluster-scope/base/operators.coreos.com/subscriptions/cert-manager/kustomization.yaml b/cluster-scope/base/operators.coreos.com/subscriptions/cert-manager/kustomization.yaml
index b2d134b7..4b1e1004 100644
--- a/cluster-scope/base/operators.coreos.com/subscriptions/cert-manager/kustomization.yaml
+++ b/cluster-scope/base/operators.coreos.com/subscriptions/cert-manager/kustomization.yaml
@@ -1,4 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: openshift-operators
 resources:
 - subscription.yaml
diff --git a/cluster-scope/base/operators.coreos.com/subscriptions/cert-manager/subscription.yaml b/cluster-scope/base/operators.coreos.com/subscriptions/cert-manager/subscription.yaml
index ae7c175c..1d83e2da 100644
--- a/cluster-scope/base/operators.coreos.com/subscriptions/cert-manager/subscription.yaml
+++ b/cluster-scope/base/operators.coreos.com/subscriptions/cert-manager/subscription.yaml
@@ -1,10 +1,7 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
-    labels:
-        operators.coreos.com/ocs-operator.cert-manager: ""
     name: cert-manager
-    namespace: openshift-operators
 spec:
     channel: stable
     installPlanApproval: Automatic
diff --git a/cluster-scope/base/operators.coreos.com/subscriptions/openshift-gitops-operator/kustomization.yaml b/cluster-scope/base/operators.coreos.com/subscriptions/openshift-gitops-operator/kustomization.yaml
index 9604b066..9819363d 100644
--- a/cluster-scope/base/operators.coreos.com/subscriptions/openshift-gitops-operator/kustomization.yaml
+++ b/cluster-scope/base/operators.coreos.com/subscriptions/openshift-gitops-operator/kustomization.yaml
@@ -1,4 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: openshift-operators
 resources:
     - subscription.yaml
diff --git a/cluster-scope/base/operators.coreos.com/subscriptions/openshift-gitops-operator/subscription.yaml b/cluster-scope/base/operators.coreos.com/subscriptions/openshift-gitops-operator/subscription.yaml
index 8e896ca8..f0cbbd59 100644
--- a/cluster-scope/base/operators.coreos.com/subscriptions/openshift-gitops-operator/subscription.yaml
+++ b/cluster-scope/base/operators.coreos.com/subscriptions/openshift-gitops-operator/subscription.yaml
@@ -1,10 +1,7 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
-  labels:
-    operators.coreos.com/openshift-gitops-operator.openshift-operators: ""
   name: openshift-gitops-operator
-  namespace: openshift-operators
 spec:
   channel: stable
   installPlanApproval: Automatic
diff --git a/cluster-scope/overlays/common/kustomization.yaml b/cluster-scope/overlays/common/kustomization.yaml
index c44cbcaf..6acc3a71 100644
--- a/cluster-scope/overlays/common/kustomization.yaml
+++ b/cluster-scope/overlays/common/kustomization.yaml
@@ -3,4 +3,5 @@ kind: Kustomization
 resources:
 - machineconfigs/99-master-ssh.yaml
 - machineconfigs/99-worker-ssh.yaml
+- ../../base/operators.coreos.com/subscriptions/cert-manager
 - ../../base/operators.coreos.com/subscriptions/external-secrets-operator
diff --git a/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml
index 020b0af7..ba588e48 100644
--- a/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml
+++ b/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml
@@ -1,8 +1,9 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+commonLabels:
+  nerc.mghpcc.org/kustomized: "true"
 resources:
 - ../common
 - ../../bundles/openshift-gitops
 - ../../bundles/acm
-- ../../base/operators.coreos.com/subscriptions/cert-manager
 - clusterversion.yaml