diff --git a/qa/releases/octopus.yaml b/qa/releases/octopus.yaml
index a834310f773..935603395ad 100644
--- a/qa/releases/octopus.yaml
+++ b/qa/releases/octopus.yaml
@@ -3,4 +3,5 @@ tasks:
     osd.0:
       - ceph osd require-osd-release octopus
       - ceph osd set-require-min-compat-client octopus
+      - for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
 - ceph.healthy:
diff --git a/qa/suites/upgrade/mimic-x-singleton/7-nautilus.yaml b/qa/suites/upgrade/mimic-x-singleton/7-nautilus.yaml
deleted file mode 120000
index 9e99b7d2829..00000000000
--- a/qa/suites/upgrade/mimic-x-singleton/7-nautilus.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/releases/nautilus.yaml
\ No newline at end of file
diff --git a/qa/suites/upgrade/mimic-x-singleton/7-octopus.yaml b/qa/suites/upgrade/mimic-x-singleton/7-octopus.yaml
new file mode 120000
index 00000000000..344983858fc
--- /dev/null
+++ b/qa/suites/upgrade/mimic-x-singleton/7-octopus.yaml
@@ -0,0 +1 @@
+.qa/releases/octopus.yaml
\ No newline at end of file