diff --git a/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml b/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml
index 85814287138..e31e4b43ca8 100644
--- a/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml
+++ b/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml
@@ -23,6 +23,7 @@ tasks:
     - ceph fs dump
 - install.upgrade:
     mon.a:
+      branch: reef
 - print: "**** done install.upgrade"
 - ceph.restart:
     daemons: [mon.*, mgr.*]
diff --git a/qa/suites/fs/upgrade/upgraded_client/branch/nautilus.yaml b/qa/suites/fs/upgrade/upgraded_client/branch/nautilus.yaml
new file mode 100644
index 00000000000..9b1db62e47f
--- /dev/null
+++ b/qa/suites/fs/upgrade/upgraded_client/branch/nautilus.yaml
@@ -0,0 +1,2 @@
+teuthology:
+  branch: nautilus
diff --git a/qa/suites/fs/upgrade/upgraded_client/branch/pacific.yaml b/qa/suites/fs/upgrade/upgraded_client/branch/pacific.yaml
new file mode 100644
index 00000000000..d86c55a34f9
--- /dev/null
+++ b/qa/suites/fs/upgrade/upgraded_client/branch/pacific.yaml
@@ -0,0 +1,2 @@
+teuthology:
+  branch: pacific
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml
deleted file mode 100644
index defb0392259..00000000000
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-meta:
-- desc: |
-   install ceph/pacific latest
-tasks:
-- install:
-    branch: pacific
-    exclude_packages:
-      - cephadm
-      - ceph-mgr-cephadm
-      - ceph-immutable-object-cache
-      - python3-rados
-      - python3-rgw
-      - python3-rbd
-      - python3-cephfs
-      - ceph-volume
-    extra_packages:
-      - python-rados
-      - python-rgw
-      - python-rbd
-      - python-cephfs
-    # For kernel_untar_build workunit
-    extra_system_packages:
-      - bison
-      - flex
-      - elfutils-libelf-devel
-      - openssl-devel
-      - NetworkManager
-      - iproute
-      - util-linux
-- print: "**** done installing pacific"
-- ceph:
-    log-ignorelist:
-      - overall HEALTH_
-      - \(FS_
-      - \(MDS_
-      - \(OSD_
-      - \(MON_DOWN\)
-      - \(CACHE_POOL_
-      - \(POOL_
-      - \(MGR_DOWN\)
-      - \(PG_
-      - \(SMALLER_PGP_NUM\)
-      - Monitor daemon marked osd
-      - Behind on trimming
-      - Manager daemon
-    conf:
-      global:
-        mon warn on pool no app: false
-        ms bind msgr2: false
-- exec:
-    osd.0:
-      - ceph osd set-require-min-compat-client pacific
-- print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install.yaml
similarity index 64%
rename from qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml
rename to qa/suites/fs/upgrade/upgraded_client/tasks/0-install.yaml
index 02f541eaf30..5b250375a00 100644
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml
+++ b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install.yaml
@@ -1,9 +1,15 @@
-meta:
-- desc: |
-   install ceph/nautilus latest
+teuthology:
+  premerge: |
+            local branch = yaml.teuthology.branch
+            yaml_fragment['tasks'][0]['install']['branch'] = tostring(branch)
+            print_branch = "**** done installing "..tostring(branch)
+            yaml_fragment['tasks'][1]['print'] = print_branch
+            local exec = yaml_fragment['tasks'][3]['exec']['osd.0']
+            local set_compat = "ceph osd set-require-min-compat-client "..tostring(branch)
+            py_attrgetter(exec).append(set_compat)
 tasks:
 - install:
-    branch: nautilus
+    branch: []
     exclude_packages:
       - cephadm
       - ceph-mgr-cephadm
@@ -27,7 +33,7 @@ tasks:
       - NetworkManager
       - iproute
       - util-linux
-- print: "**** done installing nautilus"
+- print: []
 - ceph:
     log-ignorelist:
       - overall HEALTH_
@@ -48,6 +54,5 @@ tasks:
         mon warn on pool no app: false
         ms bind msgr2: false
 - exec:
-    osd.0:
-      - ceph osd set-require-min-compat-client nautilus
+    osd.0: []
 - print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml
new file mode 100644
index 00000000000..cb8ac4d4f2d
--- /dev/null
+++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml
@@ -0,0 +1,25 @@
+teuthology:
+  premerge: |
+            local branch = yaml.teuthology.branch
+            if tostring(branch) == "nautilus" then
+              yaml_fragment['tasks'][2]['install.upgrade']['client.0']['branch'] = "pacific"
+            elseif tostring(branch) == "pacific" then
+              yaml_fragment['tasks'][2]['install.upgrade']['client.0']['branch'] = "reef"
+            else
+              error("invalid source branch")
+            end
+  postmerge:
+    - if not is_fuse() then reject() end
+tasks:
+- ceph-fuse:
+    client.0:
+      mounted: false
+- print: "**** done unmount client.0"
+- install.upgrade:
+    client.0:
+      branch: []
+- print: "**** done install.upgrade on client.0"
+- ceph.healthy:
+- ceph-fuse:
+    client.0:
+- print: "**** done remount client.0"
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/kclient.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/kclient.yaml
similarity index 100%
rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/kclient.yaml
rename to qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/kclient.yaml
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml
deleted file mode 100644
index 012969022a4..00000000000
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-teuthology:
-  postmerge:
-    - if not is_fuse() then reject() end
-tasks:
-- ceph-fuse:
-    client.0:
-      mounted: false
-- print: "**** done unmount client.0"
-- install.upgrade:
-    client.0:
-- print: "**** done install.upgrade on client.0"
-- ceph.healthy:
-- ceph-fuse:
-    client.0:
-- print: "**** done remount client"
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/% b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/%
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml
deleted file mode 100644
index 2d948af1959..00000000000
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-teuthology:
-  postmerge:
-    - if not is_fuse() then reject() end
-tasks:
-- ceph-fuse:
-    client.0:
-      mounted: false
-- print: "**** done unmount client.0"
-- install.upgrade:
-    client.0:
-- print: "**** done install.upgrade on client.0"
-- ceph-fuse:
-    client.0:
-- print: "**** done remount client.0"
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/.qa
deleted file mode 120000
index a602a0353e7..00000000000
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/.qa
similarity index 100%
rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa
rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/.qa
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/% b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/%
similarity index 100%
rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/%
rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/%
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/newops.yaml
similarity index 100%
rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml
rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/newops.yaml
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/.qa
similarity index 100%
rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa
rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/.qa
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/blogbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/blogbench.yaml
similarity index 100%
rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/blogbench.yaml
rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/blogbench.yaml
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/dbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/dbench.yaml
similarity index 100%
rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/dbench.yaml
rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/dbench.yaml
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/fsstress.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/fsstress.yaml
similarity index 100%
rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/fsstress.yaml
rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/fsstress.yaml
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/iozone.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/iozone.yaml
similarity index 100%
rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/iozone.yaml
rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/iozone.yaml
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/kernel_untar_build.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/kernel_untar_build.yaml
similarity index 100%
rename from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/kernel_untar_build.yaml
rename to qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/kernel_untar_build.yaml