diff --git a/argo-git.yaml b/argo-git.yaml
deleted file mode 100644
index 242b35a..0000000
--- a/argo-git.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: oadp-backups
-  namespace: openshift-gitops
-spec:
-  project: default
-  source:
-    repoURL: <YOUR_REPO_URL>
-    targetRevision: main
-    path: gitops/oadp/base
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: openshift-adp
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=false
-      - ServerSideApply=true
diff --git a/bootstrap/oadp-application.yaml b/bootstrap/oadp-application.yaml
new file mode 100644
index 0000000..711ec09
--- /dev/null
+++ b/bootstrap/oadp-application.yaml
@@ -0,0 +1,25 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: oadp
+  namespace: openshift-gitops
+  annotations:
+    argocd.argoproj.io/sync-wave: "-5"
+spec:
+  orphanedResources:
+    warn: false # Disable warning
+  project: infrastructure
+  destination:
+    server: https://kubernetes.default.svc
+  source:
+    repoURL: https://gitea.apilab.us/cscott/oadp.git
+    targetRevision: main
+    path: manifests
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: false
+    syncOptions:
+      - CreateNamespace=true
+      - ApplyOutOfSyncOnly=true
+      - PruneLast=true
diff --git a/backup-test-cronjob.yaml b/manifests/backup-test-cronjob.yaml
similarity index 100%
rename from backup-test-cronjob.yaml
rename to manifests/backup-test-cronjob.yaml
diff --git a/config-backups.yaml b/manifests/config-backups.yaml
similarity index 100%
rename from config-backups.yaml
rename to manifests/config-backups.yaml
diff --git a/dpa.yaml b/manifests/dpa.yaml
similarity index 100%
rename from dpa.yaml
rename to manifests/dpa.yaml
diff --git a/stateful-backups.yaml b/manifests/stateful-backups.yaml
similarity index 100%
rename from stateful-backups.yaml
rename to manifests/stateful-backups.yaml