diff --git a/RELEASE.md b/RELEASE.md
index 83bdf46..43bf244 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -61,20 +61,13 @@ and newer platforms, we have to do the following:
   - [ ] Run the Dangerzone tests.
   - [ ] Create an .rpm package and install it system-wide.
   - [ ] Test some QA scenarios (see [Scenarios](#Scenarios) below).
-- [ ] Create a test build in the most recent Fedora template in Qubes OS (Fedora 38 as of
-  writing this) and make sure it works:
+- [ ] Create a test build in the most recent Qubes Fedora template (Fedora 38 as
+  of writing this) and make sure it works:
   - [ ] Create a new development environment with Poetry.
-  - [ ] Build the container image and ensure the development environment uses
-        the new image.
-  - [ ] Run the Dangerzone tests and confirm that the tests are ran using containers
-        instead of disposable qubes
-  - [ ] Run the Dangerzone tests with the env var `QUBES_CONVERSION=1` and confirm that
-        the tests are ran using diposable qubes instead of containers
-  - [ ] Create an .rpm with `./install/linux/build-rpm.py` package and
-        install it in a fedora qube and make sure conversions run with containers
-  - [ ] Create an .rpm with `./install/linux/build-rpm.py --qubes` package and
-        install it following the instructions in `BUILD.md`
-  - [ ] Test some QA scenarios (see [Scenarios](#Scenarios) below).
+  - [ ] Run the Dangerzone tests.
+  - [ ] Create a Qubes .rpm package and install it system-wide.
+  - [ ] Test some QA scenarios (see [Scenarios](#Scenarios) below) and make sure
+    they spawn disposable qubes.
 
 ### Scenarios
 
@@ -166,13 +159,6 @@ REPOSITORY                   TAG         IMAGE ID        CREATED       SIZE
 dangerzone.rocks/dangerzone  latest      <different ID>  <newer date>  <different size>
 ```
 
-#### 10. Ensure in Qubes disposable qubes are used by default
-
-_(Only for Qubes OS)_
-
-Run a conversion on Qubes and ensure that it uses disposable qubes by default.
-
-
 ## Pre-release
 
 Before making a release, all of these should be complete:
@@ -330,6 +316,16 @@ Create a .rpm:
 Publish the .rpm under `./dist` to the
 [`freedomofpress/yum-tools-prod`](https://github.com/freedomofpress/yum-tools-prod) repo, by sending a PR. Follow the instructions in that repo on how to do so.
 
+#### Qubes
+
+Create a .rpm for Qubes:
+
+```sh
+./install/linux/build-rpm.py --qubes
+```
+
+and similarly publish it to the [`freedomofpress/yum-tools-prod`](https://github.com/freedomofpress/yum-tools-prod)
+repo.
 
 ## Publishing the release
 
diff --git a/dev_scripts/qa.py b/dev_scripts/qa.py
index 9730abb..55c197b 100755
--- a/dev_scripts/qa.py
+++ b/dev_scripts/qa.py
@@ -62,20 +62,13 @@ and newer platforms, we have to do the following:
   - [ ] Run the Dangerzone tests.
   - [ ] Create an .rpm package and install it system-wide.
   - [ ] Test some QA scenarios (see [Scenarios](#Scenarios) below).
-- [ ] Create a test build in the most recent Fedora template in Qubes OS (Fedora 38 as of
-  writing this) and make sure it works:
+- [ ] Create a test build in the most recent Qubes Fedora template (Fedora 38 as
+  of writing this) and make sure it works:
   - [ ] Create a new development environment with Poetry.
-  - [ ] Build the container image and ensure the development environment uses
-        the new image.
-  - [ ] Run the Dangerzone tests and confirm that the tests are ran using containers
-        instead of disposable qubes
-  - [ ] Run the Dangerzone tests with the env var `QUBES_CONVERSION=1` and confirm that
-        the tests are ran using diposable qubes instead of containers
-  - [ ] Create an .rpm with `./install/linux/build-rpm.py` package and
-        install it in a fedora qube and make sure conversions run with containers
-  - [ ] Create an .rpm with `./install/linux/build-rpm.py --qubes` package and
-        install it following the instructions in `BUILD.md`
-  - [ ] Test some QA scenarios (see [Scenarios](#Scenarios) below).
+  - [ ] Run the Dangerzone tests.
+  - [ ] Create a Qubes .rpm package and install it system-wide.
+  - [ ] Test some QA scenarios (see [Scenarios](#Scenarios) below) and make sure
+    they spawn disposable qubes.
 """
 
 CONTENT_QA_SCENARIOS = r"""### Scenarios
@@ -167,12 +160,6 @@ $ podman images dangerzone.rocks/dangerzone:latest
 REPOSITORY                   TAG         IMAGE ID        CREATED       SIZE
 dangerzone.rocks/dangerzone  latest      <different ID>  <newer date>  <different size>
 ```
-
-#### 10. Ensure in Qubes disposable qubes are used by default
-
-_(Only for Qubes OS)_
-
-Run a conversion on Qubes and ensure that it uses disposable qubes by default.
 """
 
 CONTENT_BUILD_DEBIAN_UBUNTU = r"""## Debian/Ubuntu