diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644
index 00000000..70e260a4
--- /dev/null
+++ b/.readthedocs.yaml
@@ -0,0 +1,29 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Build documentation in the doc/ directory with Sphinx
+sphinx:
+  configuration: doc/source/conf.py
+
+# Build documentation with MkDocs
+#mkdocs:
+#  configuration: mkdocs.yml
+
+# Optionally build your docs in additional formats such as PDF and ePub
+formats:
+  - pdf
+
+build:
+  os: "ubuntu-22.04"
+  tools:
+    python: "3.10"
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+  install:
+    - requirements: doc/requirements.txt
+    - requirements: requirements.readthedocs.txt
diff --git a/.zuul.yaml b/.zuul.yaml
index 787b9752..0c919653 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -164,7 +164,7 @@
     post-run:
       - tools/gate/playbooks/osh-infra-collect-logs.yaml
     vars:
-      treasuremap_ref: refs/changes/43/927643/4
+      treasuremap_ref: v1.9
       extra_volume:
         size: 80G
         type: Linux
@@ -209,7 +209,6 @@
       HTK_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
       OSH_INFRA_COMMIT: 43fd7143481b6ddda0dbd2f26bf6ec39a417b15b
       OSH_COMMIT: 540df5cb0dbdaed63c202e2d6f2b7891062f8203
-      TREASUREMAP_COMMIT: refs/changes/43/927643/4
       CLONE_SHIPYARD: false
       DISTRO: ubuntu_jammy
       DOCKER_REGISTRY: localhost:5000