diff --git a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04.yaml
similarity index 95%
rename from qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml
rename to qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04.yaml
index dd33de8067e15..767cd2421941b 100644
--- a/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_20.04.yaml
+++ b/qa/suites/orch/cephadm/upgrade/1-start-distro/1-start-ubuntu_22.04.yaml
@@ -1,5 +1,5 @@
 os_type: ubuntu
-os_version: "20.04"
+os_version: "22.04"
 
 tasks:
 - cephadm:
diff --git a/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_20.04.yaml b/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_20.04.yaml
deleted file mode 120000
index 162964882d383..0000000000000
--- a/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_20.04.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/all/ubuntu_20.04.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_latest.yaml b/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_latest.yaml
new file mode 120000
index 0000000000000..3a09f9abb05ca
--- /dev/null
+++ b/qa/suites/rgw/upgrade/1-install/quincy/distro$/ubuntu_latest.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/ubuntu_latest.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade/quincy-x/filestore-remove-check/ubuntu_20.04.yaml b/qa/suites/upgrade/quincy-x/filestore-remove-check/ubuntu_20.04.yaml
deleted file mode 100644
index e1374c4105d86..0000000000000
--- a/qa/suites/upgrade/quincy-x/filestore-remove-check/ubuntu_20.04.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-os_type: ubuntu
-os_version: "20.04"
-# the normal ubuntu 20.04 kernel (5.4.0-88-generic currently) have a bug that prevents the nvme_loop
-# from behaving.  I think it is this:
-#   https://lkml.org/lkml/2020/9/21/1456
-# (at least, that is the symptom: nvme nvme1: Connect command failed, error wo/DNR bit: 880)
-overrides:
-  kernel:
-    hwe: true
\ No newline at end of file
diff --git a/qa/suites/upgrade/quincy-x/filestore-remove-check/ubuntu_latest.yaml b/qa/suites/upgrade/quincy-x/filestore-remove-check/ubuntu_latest.yaml
new file mode 120000
index 0000000000000..3a09f9abb05ca
--- /dev/null
+++ b/qa/suites/upgrade/quincy-x/filestore-remove-check/ubuntu_latest.yaml
@@ -0,0 +1 @@
+.qa/distros/supported/ubuntu_latest.yaml
\ No newline at end of file