diff --git a/guestbook-with-sub-directories/deployment/deployment.yaml b/guestbook-with-sub-directories/deployment/deployment.yaml
index 18909261d1..e848555641 100644
--- a/guestbook-with-sub-directories/deployment/deployment.yaml
+++ b/guestbook-with-sub-directories/deployment/deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: guestbook-ui
 spec:
-  replicas: 2
+  replicas: 1
   revisionHistoryLimit: 3
   selector:
     matchLabels:
diff --git a/guestbook-with-sub-directories/service.yaml b/guestbook-with-sub-directories/service.yaml
deleted file mode 100644
index e8a4a27fba..0000000000
--- a/guestbook-with-sub-directories/service.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: guestbook-ui
-spec:
-  ports:
-  - port: 80
-    targetPort: 80
-  selector:
-    app: guestbook-ui
diff --git a/guestbook/guestbook-ui-deployment.yaml b/guestbook/guestbook-ui-deployment.yaml
index e848555641..18909261d1 100644
--- a/guestbook/guestbook-ui-deployment.yaml
+++ b/guestbook/guestbook-ui-deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: guestbook-ui
 spec:
-  replicas: 1
+  replicas: 2
   revisionHistoryLimit: 3
   selector:
     matchLabels:
diff --git a/sync-options/no-prune/deployment.yaml b/sync-options/no-prune/deployment.yaml
deleted file mode 100644
index 886935731e..0000000000
--- a/sync-options/no-prune/deployment.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  annotations:
-    argocd.argoproj.io/sync-options: Prune=false
-  name: guestbook-ui
-spec:
-  replicas: 1
-  revisionHistoryLimit: 3
-  selector:
-    matchLabels:
-      app: guestbook-ui
-  template:
-    metadata:
-      labels:
-        app: guestbook-ui
-    spec:
-      containers:
-      - image: swr.cn-east-3.myhuaweicloud.com/kubesre/gcr.io/heptio-images/ks-guestbook-demo:0.2
-        name: guestbook-ui
-        ports:
-        - containerPort: 80
diff --git a/sync-options/selective-sync/deployment.yaml b/sync-options/selective-sync/deployment.yaml
index 53e0763d68..18a6ce0246 100644
--- a/sync-options/selective-sync/deployment.yaml
+++ b/sync-options/selective-sync/deployment.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: guestbook-ui
 spec:
-  replicas: 3
+  replicas: 6
   revisionHistoryLimit: 3
   selector:
     matchLabels:
diff --git a/sync-waves/plain-manifests/manifests.yaml b/sync-waves/plain-manifests/manifests.yaml
index ff99567c4a..64a046ba3b 100644
--- a/sync-waves/plain-manifests/manifests.yaml
+++ b/sync-waves/plain-manifests/manifests.yaml
@@ -3,6 +3,9 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   generateName: upgrade-sql-schema-1
+  annotations:
+    argocd.argoproj.io/hook: PreSync
+    argocd.argoproj.io/sync-wave: "0"
 spec:
   template:
     spec:
@@ -16,6 +19,9 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   generateName: upgrade-sql-schema-2
+  annotations:
+    argocd.argoproj.io/hook: PreSync
+    argocd.argoproj.io/sync-wave: "1"
 spec:
   template:
     spec:
@@ -59,6 +65,10 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: maint-page-up
+  annotations:
+    argocd.argoproj.io/hook: Sync
+    argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
+    argocd.argoproj.io/sync-wave: "1"
 spec:
   template:
     spec:
@@ -73,6 +83,8 @@ apiVersion: apps/v1
 kind: ReplicaSet
 metadata:
   name: frontend
+  annotations:
+    argocd.argoproj.io/sync-wave: "2"
 spec:
   replicas: 1
   selector:
@@ -91,6 +103,8 @@ apiVersion: v1
 kind: Service
 metadata:
   name: frontend
+  annotations:
+    argocd.argoproj.io/sync-wave: "2"
 spec:
   selector:
     tier: frontend
@@ -103,6 +117,10 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: maint-page-down
+  annotations:
+    argocd.argoproj.io/hook: Sync
+    argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
+    argocd.argoproj.io/sync-wave: "3"
 spec:
   template:
     spec: