diff --git a/docs/conf.py b/docs/conf.py
index 43ac74f87b..6d70fa6bdb 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -64,8 +64,10 @@
 
 del intersphinx_mapping['scipy']
 del intersphinx_mapping['h5py']
+
+# Using astropy latest in the mapping is temporary, change it back to stable once 6.0 is out
 intersphinx_mapping.update({
-    'astropy': ('https://docs.astropy.org/en/stable/', None),
+    'astropy': ('https://docs.astropy.org/en/latest/', None),
     'requests': ('https://requests.kennethreitz.org/en/stable/', None),
     'regions': ('https://astropy-regions.readthedocs.io/en/stable/', None),
     'mocpy': ('https://cds-astro.github.io/mocpy/', None),