diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 6425b7b155..9c9a8554d1 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -1,15 +1,28 @@
 version: 2
 
-python:
-   # Revise build version once more dependencies support python 3.9+
-   version: 3.8
-   system_packages: false
-   install:
-     - method: pip
-       path: .
-       extra_requirements:
-          - docs
+build:
+  os: "ubuntu-20.04"
+  tools:
+    python: "mambaforge-4.10"
+
+conda:
+  environment: docs/rtd_environment.yaml
 
 sphinx:
-   fail_on_warning: true
-   configuration: docs/conf.py
\ No newline at end of file
+  builder: html
+  configuration: docs/conf.py
+  fail_on_warning: true
+
+# Install regular dependencies.
+# Then, install special pinning for RTD.
+python:
+  system_packages: false
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs
+        - all
+
+# Don't build any extra formats
+formats: []
diff --git a/astroquery/mast/tests/test_mast.py b/astroquery/mast/tests/test_mast.py
index 39d962ced5..10297eed67 100644
--- a/astroquery/mast/tests/test_mast.py
+++ b/astroquery/mast/tests/test_mast.py
@@ -302,7 +302,7 @@ def test_mast_service_request(patch_post):
 def test_resolve_object(patch_post):
     m103_loc = mast.Mast.resolve_object("M103")
     print(m103_loc)
-    assert m103_loc.separation(SkyCoord("23.34086 60.658", unit='deg')).value == 0
+    assert round(m103_loc.separation(SkyCoord("23.34086 60.658", unit='deg')).value, 10) == 0
 
 
 def test_login_logout(patch_post):
diff --git a/docs/rtd_environment.yaml b/docs/rtd_environment.yaml
new file mode 100644
index 0000000000..3e133fe5d7
--- /dev/null
+++ b/docs/rtd_environment.yaml
@@ -0,0 +1,8 @@
+name: rtd311
+channels:
+  - conda-forge
+  - defaults
+dependencies:
+  - python=3.11
+  - pip
+  - graphviz