diff --git a/kubernetes/ocp-mgmt/openshift-gitops-config/system-appset.yaml b/kubernetes/ocp-mgmt/openshift-gitops-config/system-appset.yaml
index 174001f..b825c9d 100644
--- a/kubernetes/ocp-mgmt/openshift-gitops-config/system-appset.yaml
+++ b/kubernetes/ocp-mgmt/openshift-gitops-config/system-appset.yaml
@@ -50,3 +50,8 @@ spec:
       destination:
         namespace: openshift-cnv
     {{ end }}
+    {{- if eq .path.basename "openshift-gitops" }}
+    spec:
+      destination:
+        namespace: openshift-gitops
+    {{ end }}
diff --git a/kubernetes/ocp-mgmt/bootstrap/0-gitops-operator.yaml b/kubernetes/ocp-mgmt/system/openshift-gitops/0-gitops-operator.yaml
similarity index 100%
rename from kubernetes/ocp-mgmt/bootstrap/0-gitops-operator.yaml
rename to kubernetes/ocp-mgmt/system/openshift-gitops/0-gitops-operator.yaml
diff --git a/kubernetes/ocp-mgmt/bootstrap/1-cluster-argocd-instance.yaml b/kubernetes/ocp-mgmt/system/openshift-gitops/1-cluster-argocd-instance.yaml
similarity index 100%
rename from kubernetes/ocp-mgmt/bootstrap/1-cluster-argocd-instance.yaml
rename to kubernetes/ocp-mgmt/system/openshift-gitops/1-cluster-argocd-instance.yaml
diff --git a/kubernetes/ocp-mgmt/bootstrap/2-cluster-role.yaml b/kubernetes/ocp-mgmt/system/openshift-gitops/2-cluster-role.yaml
similarity index 100%
rename from kubernetes/ocp-mgmt/bootstrap/2-cluster-role.yaml
rename to kubernetes/ocp-mgmt/system/openshift-gitops/2-cluster-role.yaml
diff --git a/kubernetes/ocp-mgmt/bootstrap/3-app-of-apps.yaml b/kubernetes/ocp-mgmt/system/openshift-gitops/3-app-of-apps.yaml
similarity index 100%
rename from kubernetes/ocp-mgmt/bootstrap/3-app-of-apps.yaml
rename to kubernetes/ocp-mgmt/system/openshift-gitops/3-app-of-apps.yaml