diff --git a/qa/suites/fs/cephadm/multivolume/2-workload/dbench.yaml b/qa/suites/fs/cephadm/multivolume/2-workload/dbench.yaml
index f03efad814e..31d806f79bb 120000
--- a/qa/suites/fs/cephadm/multivolume/2-workload/dbench.yaml
+++ b/qa/suites/fs/cephadm/multivolume/2-workload/dbench.yaml
@@ -1 +1 @@
-../../../workload/tasks/workunit/suites/dbench.yaml
\ No newline at end of file
+.qa/suites/fs/workload/tasks/3-workunit/suites/dbench.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/workload/subvolume/$ b/qa/suites/fs/workload/tasks/0-subvolume/$
similarity index 100%
rename from qa/suites/fs/workload/subvolume/$
rename to qa/suites/fs/workload/tasks/0-subvolume/$
diff --git a/qa/suites/fs/workload/scrub/.qa b/qa/suites/fs/workload/tasks/0-subvolume/.qa
similarity index 100%
rename from qa/suites/fs/workload/scrub/.qa
rename to qa/suites/fs/workload/tasks/0-subvolume/.qa
diff --git a/qa/suites/fs/workload/subvolume/no-subvolume.yaml b/qa/suites/fs/workload/tasks/0-subvolume/no-subvolume.yaml
similarity index 100%
rename from qa/suites/fs/workload/subvolume/no-subvolume.yaml
rename to qa/suites/fs/workload/tasks/0-subvolume/no-subvolume.yaml
diff --git a/qa/suites/fs/workload/subvolume/with-namespace-isolated-and-quota.yaml b/qa/suites/fs/workload/tasks/0-subvolume/with-namespace-isolated-and-quota.yaml
similarity index 100%
rename from qa/suites/fs/workload/subvolume/with-namespace-isolated-and-quota.yaml
rename to qa/suites/fs/workload/tasks/0-subvolume/with-namespace-isolated-and-quota.yaml
diff --git a/qa/suites/fs/workload/subvolume/with-namespace-isolated.yaml b/qa/suites/fs/workload/tasks/0-subvolume/with-namespace-isolated.yaml
similarity index 100%
rename from qa/suites/fs/workload/subvolume/with-namespace-isolated.yaml
rename to qa/suites/fs/workload/tasks/0-subvolume/with-namespace-isolated.yaml
diff --git a/qa/suites/fs/workload/subvolume/with-no-extra-options.yaml b/qa/suites/fs/workload/tasks/0-subvolume/with-no-extra-options.yaml
similarity index 100%
rename from qa/suites/fs/workload/subvolume/with-no-extra-options.yaml
rename to qa/suites/fs/workload/tasks/0-subvolume/with-no-extra-options.yaml
diff --git a/qa/suites/fs/workload/subvolume/with-quota.yaml b/qa/suites/fs/workload/tasks/0-subvolume/with-quota.yaml
similarity index 100%
rename from qa/suites/fs/workload/subvolume/with-quota.yaml
rename to qa/suites/fs/workload/tasks/0-subvolume/with-quota.yaml
diff --git a/qa/suites/fs/workload/tasks/0-check-counter.yaml b/qa/suites/fs/workload/tasks/1-check-counter.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/0-check-counter.yaml
rename to qa/suites/fs/workload/tasks/1-check-counter.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/.qa b/qa/suites/fs/workload/tasks/2-scrub/.qa
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/.qa
rename to qa/suites/fs/workload/tasks/2-scrub/.qa
diff --git a/qa/suites/fs/workload/scrub/no.yaml b/qa/suites/fs/workload/tasks/2-scrub/no.yaml
similarity index 100%
rename from qa/suites/fs/workload/scrub/no.yaml
rename to qa/suites/fs/workload/tasks/2-scrub/no.yaml
diff --git a/qa/suites/fs/workload/scrub/yes.yaml b/qa/suites/fs/workload/tasks/2-scrub/yes.yaml
similarity index 100%
rename from qa/suites/fs/workload/scrub/yes.yaml
rename to qa/suites/fs/workload/tasks/2-scrub/yes.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/fs/.qa b/qa/suites/fs/workload/tasks/3-workunit/.qa
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/fs/.qa
rename to qa/suites/fs/workload/tasks/3-workunit/.qa
diff --git a/qa/suites/fs/workload/tasks/workunit/direct_io.yaml b/qa/suites/fs/workload/tasks/3-workunit/direct_io.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/direct_io.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/direct_io.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/suites/.qa b/qa/suites/fs/workload/tasks/3-workunit/fs/.qa
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/suites/.qa
rename to qa/suites/fs/workload/tasks/3-workunit/fs/.qa
diff --git a/qa/suites/fs/workload/tasks/workunit/fs/misc.yaml b/qa/suites/fs/workload/tasks/3-workunit/fs/misc.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/fs/misc.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/fs/misc.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/fs/norstats.yaml b/qa/suites/fs/workload/tasks/3-workunit/fs/norstats.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/fs/norstats.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/fs/norstats.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/fs/test_o_trunc.yaml b/qa/suites/fs/workload/tasks/3-workunit/fs/test_o_trunc.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/fs/test_o_trunc.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/fs/test_o_trunc.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/kernel_untar_build.yaml b/qa/suites/fs/workload/tasks/3-workunit/kernel_untar_build.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/kernel_untar_build.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/kernel_untar_build.yaml
diff --git a/qa/suites/fs/workload/tasks/3-workunit/suites/.qa b/qa/suites/fs/workload/tasks/3-workunit/suites/.qa
new file mode 120000
index 00000000000..a602a0353e7
--- /dev/null
+++ b/qa/suites/fs/workload/tasks/3-workunit/suites/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/workload/tasks/workunit/suites/blogbench.yaml b/qa/suites/fs/workload/tasks/3-workunit/suites/blogbench.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/suites/blogbench.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/suites/blogbench.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/suites/dbench.yaml b/qa/suites/fs/workload/tasks/3-workunit/suites/dbench.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/suites/dbench.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/suites/dbench.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/suites/ffsb.yaml b/qa/suites/fs/workload/tasks/3-workunit/suites/ffsb.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/suites/ffsb.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/suites/ffsb.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/suites/fsstress.yaml b/qa/suites/fs/workload/tasks/3-workunit/suites/fsstress.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/suites/fsstress.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/suites/fsstress.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/suites/fsx.yaml b/qa/suites/fs/workload/tasks/3-workunit/suites/fsx.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/suites/fsx.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/suites/fsx.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/suites/fsync-tester.yaml b/qa/suites/fs/workload/tasks/3-workunit/suites/fsync-tester.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/suites/fsync-tester.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/suites/fsync-tester.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/suites/iogen.yaml b/qa/suites/fs/workload/tasks/3-workunit/suites/iogen.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/suites/iogen.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/suites/iogen.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/suites/iozone.yaml b/qa/suites/fs/workload/tasks/3-workunit/suites/iozone.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/suites/iozone.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/suites/iozone.yaml
diff --git a/qa/suites/fs/workload/tasks/workunit/suites/pjd.yaml b/qa/suites/fs/workload/tasks/3-workunit/suites/pjd.yaml
similarity index 100%
rename from qa/suites/fs/workload/tasks/workunit/suites/pjd.yaml
rename to qa/suites/fs/workload/tasks/3-workunit/suites/pjd.yaml