diff --git a/apps/cluster-setup.yaml b/apps/app-of-apps.yaml
similarity index 86%
rename from apps/cluster-setup.yaml
rename to apps/app-of-apps.yaml
index b3a2dd7e..d5228a15 100644
--- a/apps/cluster-setup.yaml
+++ b/apps/app-of-apps.yaml
@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: ApplicationSet
 metadata:
-  name: cluster-setup
+  name: app-of-apps
 spec:
   syncPolicy:
     preserveResourcesOnDeletion: true
@@ -12,9 +12,10 @@ spec:
         selector:
           matchLabels:
             argocd.argoproj.io/secret-type: cluster
+            understack.rackspace.com/argocd: enabled
   template:
     metadata:
-      name: '{{.name}}-cluster-setup'
+      name: '{{.name}}-app-of-apps'
     spec:
       project: default
       source:
diff --git a/apps/appsets/argocd.yaml b/apps/appsets/argocd.yaml
index 0add8c03..dcee40d4 100644
--- a/apps/appsets/argocd.yaml
+++ b/apps/appsets/argocd.yaml
@@ -13,6 +13,7 @@ spec:
         selector:
           matchLabels:
             argocd.argoproj.io/secret-type: cluster
+            understack.rackspace.com/argocd: enabled
   template:
     metadata:
       name: '{{.name}}-argocd'
diff --git a/docs/deploy-guide/gitops-install.md b/docs/deploy-guide/gitops-install.md
index 4e453ae8..110a3b61 100644
--- a/docs/deploy-guide/gitops-install.md
+++ b/docs/deploy-guide/gitops-install.md
@@ -179,7 +179,7 @@ Finally run the following to have ArgoCD deploy the system:
 
 ```bash
 # from your understack checkout
-kubectl apply -f apps/cluster-setup.yaml
+kubectl apply -f apps/app-of-apps.yaml
 ```
 
 At this point ArgoCD will work to deploy Understack.
diff --git a/scripts/gitops-secrets-gen.sh b/scripts/gitops-secrets-gen.sh
index b561f46f..8e70febc 100755
--- a/scripts/gitops-secrets-gen.sh
+++ b/scripts/gitops-secrets-gen.sh
@@ -101,6 +101,7 @@ metadata:
   namespace: argocd
   labels:
     argocd.argoproj.io/secret-type: cluster
+    understack.rackspace.com/argocd: enabled
   annotations:
     uc_repo_git_url: "https://github.com/rackerlabs/understack.git"
     uc_repo_ref: "HEAD"