diff --git a/templates/etcd.yaml b/templates/etcd.yaml
index e47f503..fe0133a 100644
--- a/templates/etcd.yaml
+++ b/templates/etcd.yaml
@@ -15,6 +15,8 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: etcd
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
 spec:
   replicas: 1
   selector:
diff --git a/templates/pre-sync.yaml b/templates/pre-sync.yaml
index fcea67e..35c4462 100644
--- a/templates/pre-sync.yaml
+++ b/templates/pre-sync.yaml
@@ -2,7 +2,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  generateName: wave-1-etcd-backup-
+  generateName: presync-wave-1-etcd-backup-
   annotations:
     argocd.argoproj.io/hook: PreSync
     argocd.argoproj.io/sync-wave: "1"
@@ -30,35 +30,3 @@ spec:
         persistentVolumeClaim:
           claimName: etcd-backups
 
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  generateName: wave-2-migrate-
-  annotations:
-    argocd.argoproj.io/hook: PreSync
-    argocd.argoproj.io/sync-wave: "2"
-spec:
-  backoffLimit: 3
-  template:
-    spec:
-      restartPolicy: Never
-      containers:
-      - name: migrate
-        image: {{ .Values.migrate.repo }}:{{ .Values.migrate.tag }}
-        volumeMounts:
-        - mountPath: /data
-          name: data
-          subPath: etcd
-        command:
-        - etcdctl
-        - --endpoints=http://etcd:2379
-        - snap
-        - save
-        - /data/snap-{{ now | unixEpoch }}
-
-      volumes:
-      - name: data
-        persistentVolumeClaim:
-          claimName: etcd-backups
-
diff --git a/templates/sync.yaml b/templates/sync.yaml
new file mode 100644
index 0000000..4fcf319
--- /dev/null
+++ b/templates/sync.yaml
@@ -0,0 +1,32 @@
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  generateName: sync-wave-2-migrate-
+  annotations:
+    argocd.argoproj.io/hook: Sync
+    argocd.argoproj.io/sync-wave: "2"
+spec:
+  backoffLimit: 3
+  template:
+    spec:
+      restartPolicy: Never
+      containers:
+      - name: migrate
+        image: {{ .Values.migrate.repo }}:{{ .Values.migrate.tag }}
+        volumeMounts:
+        - mountPath: /data
+          name: data
+          subPath: etcd
+        command:
+        - etcdctl
+        - --endpoints=http://etcd:2379
+        - snap
+        - save
+        - /data/snap-{{ now | unixEpoch }}
+
+      volumes:
+      - name: data
+        persistentVolumeClaim:
+          claimName: etcd-backups
+