diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 88271ea51f074bcc60da7188f85b77b69d1fdb45..a1c1839d8f0a5ac8a582527f553f15b4fd3b769a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -107,6 +107,14 @@ jobs:
             - name: Run Complement tests
               run: |
                   direnv exec . bin/complement 'complement_src' 'complement_test_logs.jsonl' 'complement_test_results.jsonl'
+                  cp -v -f result complement_oci_image.tar.gz
+
+            - name: Upload Complement OCI image
+              uses: actions/upload-artifact@v4
+              with:
+                name: complement_oci_image.tar.gz
+                path: complement_oci_image.tar.gz
+                if-no-files-found: error
 
             - name: Upload Complement logs
               uses: actions/upload-artifact@v4
diff --git a/bin/complement b/bin/complement
index c2c6ab34541848b8748819704fe746a27a9d4960..115a94e03462fb0da3d989d93316e82e470aefc6 100755
--- a/bin/complement
+++ b/bin/complement
@@ -15,7 +15,7 @@ LOG_FILE="$2"
 # A `.jsonl` file to write test results to
 RESULTS_FILE="$3"
 
-OCI_IMAGE="complement-conduit:dev"
+OCI_IMAGE="complement-conduit:main"
 
 toplevel="$(git rev-parse --show-toplevel)"
 
diff --git a/docs/development/testing.md b/docs/development/testing.md
index d483898856394edc58f535d4f9c28793f5b4bd8d..680e6fb99b52377d7d1e5ce50442a788f22bc1cf 100644
--- a/docs/development/testing.md
+++ b/docs/development/testing.md
@@ -5,13 +5,15 @@ ## Complement
 Have a look at [Complement's repository][complement] for an explanation of what
 it is.
 
-To test against Complement, with Nix and direnv installed and set up, you can
-either:
+To test against Complement, with Nix and direnv installed and set up, you can:
 
 * Run `./bin/complement "$COMPLEMENT_SRC" ./path/to/logs.jsonl ./path/to/results.jsonl`
   to build a Complement image, run the tests, and output the logs and results
-  to the specified paths
+  to the specified paths. This will also output the OCI image at `result`
 * Run `nix build .#complement` from the root of the repository to just build a
-  Complement image
+  Complement OCI image outputted to `result` (it's a `.tar.gz` file)
+* Or download the latest Complement OCI image from the CI workflow artifacts output
+  from the commit/revision you want to test (e.g. from main) [here][ci-workflows]
 
+[ci-workflows]: https://github.com/girlbossceo/conduwuit/actions/workflows/ci.yml?query=event%3Apush+is%3Asuccess+actor%3Agirlbossceo
 [complement]: https://github.com/matrix-org/complement
diff --git a/nix/pkgs/complement/default.nix b/nix/pkgs/complement/default.nix
index 0399f1e827e115a4cc25a25c2d0520114c3450ed..f7bb483fd2412e490d817bcf2300e0525bfea83d 100644
--- a/nix/pkgs/complement/default.nix
+++ b/nix/pkgs/complement/default.nix
@@ -53,7 +53,7 @@ in
 
 dockerTools.buildImage {
   name = "complement-${main.pname}";
-  tag = "dev";
+  tag = "main";
 
   copyToRoot = buildEnv {
     name = "root";
@@ -81,7 +81,7 @@ dockerTools.buildImage {
 
     Env = [
       "SSL_CERT_FILE=/complement/ca/ca.crt"
-      "CONDUIT_CONFIG=${./config.toml}"
+      "CONDUWUIT_CONFIG=${./config.toml}"
     ];
 
     ExposedPorts = {