diff --git a/docs/index.html b/docs/index.html
index 55ed88aa6..4d2763b9c 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -14,7 +14,7 @@ <h1>Documentation</h1>
         <hr class="whitespace">
         <div class="row">
             <div class="small-12 medium-412 large-4 columns">
-                <a href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/" target="_blank" class="card-as-link">
+                <a href="https://omero.readthedocs.io/en/stable/" target="_blank" class="card-as-link">
                     <div class="card card-support">
                         <div class="card-section">
                             <div class="medium-2"><img class="thumbnail" alt="OMERO logo" src="{{ site.baseurl }}/img/logos/omero-logomark.svg"></div>
diff --git a/omero/developers/docs.html b/omero/developers/docs.html
index 7e4be84ae..f961ede7f 100644
--- a/omero/developers/docs.html
+++ b/omero/developers/docs.html
@@ -14,7 +14,7 @@ <h3 class="header-blue">Documentation</h3>
 
         <div class="row small-up-12 medium-up-3">
             <div class="column">
-                <a href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/developers/index.html" target="_blank">
+                <a href="https://omero.readthedocs.io/en/stable/developers/index.html" target="_blank">
                     <div class="card card-docs top-red">
                         <div class="card-section">
                             <h5 class="doc-title">OMERO developers documentation</h5>
diff --git a/omero/developers/getting-started.html b/omero/developers/getting-started.html
index c9aaa5d99..56f72223d 100644
--- a/omero/developers/getting-started.html
+++ b/omero/developers/getting-started.html
@@ -19,7 +19,7 @@ <h3 class="header-blue">Getting Started</h3>
                         <h4 class="text-center">Intro to working with OMERO</h4>
                         <i class="fa fa-book fa-5x icon-red"></i>
                         <p class="card-caption">This page summarizes the different aspects of OMERO - clients, server and data model as well as give some example database queries.</p>
-                        <div class="text-center"><a class="button small" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/developers/GettingStarted.html" target="_blank">Read the Guide</a></div>
+                        <div class="text-center"><a class="button small" href="https://omero.readthedocs.io/en/stable/developers/GettingStarted.html" target="_blank">Read the Guide</a></div>
                     </div>
                 </div>
             </div>
@@ -29,7 +29,7 @@ <h4 class="text-center">Intro to working with OMERO</h4>
                         <h4 class="text-center">Installing OMERO from source</h4>
                         <i class="fa fa-book fa-5x icon-gray"></i>
                         <p class="card-caption">This page provides links to the source code and further information on working with it via Git and GitHub and how to build OMERO.</p>
-                        <div class="text-center"><a class="button small" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/developers/installation.html" target="_blank">Read the Guide</a></div>
+                        <div class="text-center"><a class="button small" href="https://omero.readthedocs.io/en/stable/developers/installation.html" target="_blank">Read the Guide</a></div>
                     </div>
                 </div>
             </div>
diff --git a/omero/developers/index.html b/omero/developers/index.html
index c48454885..4e64ffd72 100644
--- a/omero/developers/index.html
+++ b/omero/developers/index.html
@@ -39,7 +39,7 @@ <h4>Open Source</h4>
             <div class="omero-key-feature-container medium-3 columns end">
                 <h4>Public API</h4>
                 <p>Work with your data in Python, Java, MATLAB and C++.</p>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/developers/index.html#using-the-omero-api" target="_blank">View Developer Guides</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/developers/index.html#using-the-omero-api" target="_blank">View Developer Guides</a>
             </div>
         </div>
         <hr class="invisible">
@@ -48,7 +48,7 @@ <h4>Public API</h4>
             <div class="omero-key-feature-container medium-3 columns">
                 <h4>OMERO.web</h4>
                 <p>Use the OMERO.web framework to build web applications for OMERO.</p>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/developers/Web.html" target="_blank">View Developer Guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/developers/Web.html" target="_blank">View Developer Guide</a>
                 <a class="button hollow tiny" href="{{ site.baseurl }}/omero/apps/">OMERO apps</a>
             </div>
             <div class="medium-1 columns"><img class="hide-for-small-only omero-feature-png thumbnail" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_blitz.png"></div>
@@ -56,7 +56,7 @@ <h4>OMERO.web</h4>
             <div class="omero-key-feature-container medium-3 columns end">
                 <h4>OMERO clients</h4>
                 <p>Develop Blitz clients that use the API and the Ice remoting framework.</p>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/developers/GettingStarted/AdvancedClientDevelopment.html" target="_blank">View Developer Guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/developers/GettingStarted/AdvancedClientDevelopment.html" target="_blank">View Developer Guide</a>
             </div>
         </div>
         <hr class="invisible">
@@ -65,13 +65,13 @@ <h4>OMERO clients</h4>
             <div class="omero-key-feature-container medium-3 columns">
                 <h4>OMERO.cli</h4>
                 <p>Use the CLI to work with OMERO objects and write plugins.</p>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/developers/cli/index.html" target="_blank">View Developer Guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/developers/cli/index.html" target="_blank">View Developer Guide</a>
             </div>
             <div class="medium-1 columns"><img class="omero-feature thumbnail" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_scripts.svg"></div>
             <div class="omero-key-feature-container medium-3 columns end">
                 <h4>Scripting Service</h4>
                 <p>Write Python scripts to add functionality to the OMERO.server. <a href="https://github.com/openmicroscopy/omero-example-scripts" target="_blank">Share your scripts</a> with the community.</p>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/developers/scripts/" target="_blank">View Developer Guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/developers/scripts/" target="_blank">View Developer Guide</a>
             </div>
         </div>
         <hr class="invisible">
@@ -80,14 +80,14 @@ <h4>Scripting Service</h4>
             <div class="omero-key-feature-container medium-3 columns">
                 <h4>Analysis</h4>
                 <p>Save your analysis results to OMERO.server or use OMERO.tables to store columnar data.</p>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/developers/index.html#analysis" target="_blank">View Developer Guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/developers/index.html#analysis" target="_blank">View Developer Guide</a>
                 <a class="button hollow tiny" href="{{ site.baseurl }}/omero/features/analyze/">Learn more about analysis integrations</a>
             </div>
             <div class="medium-1 columns"><img class="omero-feature thumbnail" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_server.svg"></div>
             <div class="omero-key-feature-container medium-3 columns end">
                 <h4>OMERO.server</h4>
                 <p>Extend the OMERO.server by writing your own services or using the OMERO.grid infrastructure to manage your own processes.</p>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/developers/Server/ExtendingOmero.html" target="_blank">View Developer Guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/developers/Server/ExtendingOmero.html" target="_blank">View Developer Guide</a>
             </div>
         </div>
         <!-- end Key Features -->
diff --git a/omero/downloads/index.html b/omero/downloads/index.html
index 2e34244dd..7d3923f06 100644
--- a/omero/downloads/index.html
+++ b/omero/downloads/index.html
@@ -93,7 +93,7 @@ <h6>omero_ij-{{ site.omero.insight.version }}-all.jar</h6>
                         <img class="thumbnail omero-feature" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_matlab.svg">
                         <h5>MATLAB</h5>
                         <h6>OMERO.matlab-{{ site.omero.matlab.version }}.zip</h6>
-                        <p class="card-caption">View instructions at <a href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/developers/Matlab.html" target="_blank">OMERO MATLAB language bindings</a>.</p>
+                        <p class="card-caption">View instructions at <a href="https://omero.readthedocs.io/en/stable/developers/Matlab.html" target="_blank">OMERO MATLAB language bindings</a>.</p>
                         <a href="https://github.com/ome/omero-matlab/releases/download/v{{ site.omero.matlab.version }}/OMERO.matlab-{{ site.omero.matlab.version }}.zip" class="button hollow small"><i class="fa fa-download"></i> Download (54 MB)</a>
                     </div>
                 </div>
@@ -104,7 +104,7 @@ <h6>OMERO.matlab-{{ site.omero.matlab.version }}.zip</h6>
                         <img class="thumbnail omero-feature" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_server.svg">
                         <h5>Server (Ice 3.6)</h5>
                         <h6>OMERO.server-{{ site.omero.version }}-ice36.zip</h6>
-                        <p class="card-caption">View installation guides in <a href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/index.html" target="_blank">System Administrator documentation</a>.</p>
+                        <p class="card-caption">View installation guides in <a href="https://omero.readthedocs.io/en/stable/sysadmins/index.html" target="_blank">System Administrator documentation</a>.</p>
                         <a href="https://github.com/ome/openmicroscopy/releases/download/v{{ site.omero.version }}/OMERO.server-{{ site.omero.version }}-ice36.zip" class="button hollow small"><i class="fa fa-download"></i> Download (260 MB)</a>
                     </div>
                 </div>
@@ -136,7 +136,7 @@ <h3 class="text-center">OMERO Java</h3>
                         <img class="thumbnail omero-feature" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_java.svg">
                         <h5>Java (Ice 3.6)</h5>
                         <h6>OMERO.java-{{ site.omero.version }}-ice36.zip</h6>
-                        <p class="card-caption">The OMERO Java documentation is available to read on the web <a href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/developers/Java.html">here</a>.</p>
+                        <p class="card-caption">The OMERO Java documentation is available to read on the web <a href="https://omero.readthedocs.io/en/stable/developers/Java.html">here</a>.</p>
                         <a href="https://github.com/ome/openmicroscopy/releases/download/v{{ site.omero.version }}/OMERO.java-{{ site.omero.version }}-ice36.zip" class="button hollow small"><i class="fa fa-download"></i> Download (125 MB)</a>
                     </div>
                 </div>
diff --git a/omero/features/analyze/index.html b/omero/features/analyze/index.html
index ad14368ef..e662cfdcf 100644
--- a/omero/features/analyze/index.html
+++ b/omero/features/analyze/index.html
@@ -58,7 +58,7 @@ <h4>ImageJ/Fiji plugin</h4>
                 <h4>Scripting service</h4>
                 <p>Write scripts to add functionality to OMERO.server
                     and share them with the community.</p>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/developers/scripts/" target="_blank">View developer guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/developers/scripts/" target="_blank">View developer guide</a>
                 <a class="button hollow tiny" href="https://www.youtube.com/watch?v=sKRvYVZksdM" target="_blank">View movie</a>
             </div>
             <div class="omero-feature-container tall-content column text-center">
@@ -94,7 +94,7 @@ <h4>R and OMERO</h4>
                 <h4>Tabular Data support</h4>
                 <p>HDF-based storage of measurement results with an API for
                     exporting to Excel using OMERO.tables.</p>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/developers/analysis.html#storing-external-data-in-omero" target="_blank">View developer guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/developers/analysis.html#storing-external-data-in-omero" target="_blank">View developer guide</a>
             </div>
             <div class="omero-feature-container tall-content column text-center">
                 <img class="thumbnail omero-feature" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_matlab.svg">
diff --git a/omero/features/export/index.html b/omero/features/export/index.html
index ceba698f8..484cca241 100644
--- a/omero/features/export/index.html
+++ b/omero/features/export/index.html
@@ -30,14 +30,14 @@ <h4>Export images</h4>
                 <h4>Export multi-image filesets</h4>
                 <p>Bio-Formats allows OMERO to recognize filesets and treat
                     them as one unit.</p>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/developers/ImportFS.html#filesets" target="_blank">View developer guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/developers/ImportFS.html#filesets" target="_blank">View developer guide</a>
             </div>
             <div class="omero-feature-container column text-center">
                 <img class="thumbnail omero-feature" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_export-hcs.svg">
                 <h4>Export HCS data</h4>
                 <p>OMERO.server can be configured to allow plate
                     data to be downloaded.</p>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/config.html#omero-policy-binary-access" target="_blank">View sysadmin guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/sysadmins/config.html#omero-policy-binary-access" target="_blank">View sysadmin guide</a>
             </div>
         </div>
     </div>
diff --git a/omero/features/import/index.html b/omero/features/import/index.html
index 1c9d64bd8..ee63bd02e 100644
--- a/omero/features/import/index.html
+++ b/omero/features/import/index.html
@@ -36,7 +36,7 @@ <h4>Supported file formats</h4>
                     <img class="thumbnail omero-feature" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_command-line.svg">
                     <h4>Command Line Import</h4>
                     <p>Use the command line to import images into OMERO.</p>
-                    <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/users/cli/import.html" target="_blank">View CLI guide</a>
+                    <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/users/cli/import.html" target="_blank">View CLI guide</a>
                     <a class="button hollow tiny" href="https://www.youtube.com/playlist?list=PL-oOCWFUMH53JcqG_Fi09NcG1zS2VC0cP" target="_blank">View movies</a>
                 </div>
                 <div class="omero-feature-container tall-content column text-center">
@@ -44,14 +44,14 @@ <h4>Command Line Import</h4>
                     <h4>Improved performance</h4>
                     <p>Stream-lined backend import process uploads large
                         datasets such as HCS and SPIM much faster.</p>
-                    <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/import-scenarios.html#parallel-import" target="_blank">View CLI guide</a>
+                    <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/sysadmins/import-scenarios.html#parallel-import" target="_blank">View CLI guide</a>
                 </div>
                 <div class="omero-feature-container tall-content column text-center">
                     <img class="thumbnail omero-feature" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_dropbox.svg">
                     <h4>OMERO.dropbox</h4>
                     <p>Allows automatic import from a defined directory of all
                         supported file formats.</p>
-                    <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/dropbox.html" target="_blank">View sysadmin guide</a>
+                    <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/sysadmins/dropbox.html" target="_blank">View sysadmin guide</a>
                 </div>
                 <div class="omero-feature-container tall-content column text-center">
                     <img class="thumbnail omero-feature" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_import-for.svg">
@@ -60,14 +60,14 @@ <h4>Import-For</h4>
                         users, which will then be owned by that other
                         user.</p>
                     <a class="button hollow tiny" href="https://omero-guides.readthedocs.io/en/latest/upload/docs/import-desktop-client.html#import-for-another-user" target="_blank">View user guide</a>
-                    <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/users/cli/import.html" target="_blank">View CLI guide</a>
+                    <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/users/cli/import.html" target="_blank">View CLI guide</a>
                 </div>
                 <div class="omero-feature-container tall-content column text-center">
                     <img class="thumbnail omero-feature" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_files.svg">
                     <h4>Original file formats</h4>
                     <p>OMERO.server now uploads, exports, and stores files in
                         their original file format.</p>
-                    <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/developers/Server/FS.html" target="_blank">View developer guide</a>
+                    <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/developers/Server/FS.html" target="_blank">View developer guide</a>
                 </div>
                 <div class="omero-feature-container tall-content column text-center">
                     <img class="thumbnail omero-feature" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_integrity-reports.svg">
diff --git a/omero/features/learning/index.html b/omero/features/learning/index.html
index 1a7031dc1..318e39639 100644
--- a/omero/features/learning/index.html
+++ b/omero/features/learning/index.html
@@ -23,13 +23,13 @@ <h2 class="header-blue">OMERO as a learning platform</h2>
                 <img class="thumbnail omero-feature" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_customize.svg">
                 <h4>Customize clients</h4>
                 <p>Customize landing pages, menus and user access to data</p>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/customization.html" target="_blank">View sysadmin guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/sysadmins/customization.html" target="_blank">View sysadmin guide</a>
             </div>
             <div class="omero-feature-container column text-center">
                 <img class="thumbnail omero-feature" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_public.svg">
                 <h4>Public access</h4>
                 <p>Configure OMERO to host data publicly.</p>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/public.html" target="_blank">View sysadmin guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/sysadmins/public.html" target="_blank">View sysadmin guide</a>
             </div>
         </div>
     </div>
diff --git a/omero/features/organize/index.html b/omero/features/organize/index.html
index 2438fdd23..7f321f0eb 100644
--- a/omero/features/organize/index.html
+++ b/omero/features/organize/index.html
@@ -24,7 +24,7 @@ <h2 class="header-blue">Managing your data in OMERO</h2>
                     <h4>Manage and organize</h4>
                     <p>Manage, organize and delete images within Projects and Datasets. </p>
                     <a class="button hollow tiny" href="https://omero-guides.readthedocs.io/en/latest/introduction/docs/index.html" target="_blank">View user guide</a>
-                    <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/users/cli/index.html" target="_blank">View CLI guides</a>
+                    <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/users/cli/index.html" target="_blank">View CLI guides</a>
                 </div>
                 <div class="omero-feature-container column text-center">
                     <img class="thumbnail omero-feature" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_search.svg">
@@ -44,7 +44,7 @@ <h4>Browse and filter images</h4>
                     <h4>Annotate data</h4>
                     <p>Add descriptions, comments, file attachments, tags or ratings.</p>
                     <a class="button hollow tiny" href="https://omero-guides.readthedocs.io/en/latest/introduction/docs/annotate.html" target="_blank">View user guide</a>
-                    <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/users/cli/index.html" target="_blank">View CLI guides</a>
+                    <a class="button hollow tiny" href="hhttps://omero.readthedocs.io/en/stable/users/cli/index.html" target="_blank">View CLI guides</a>
                 </div>
                 <div class="omero-feature-container column text-center">
                     <img class="thumbnail omero-feature" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_acquisition.svg">
diff --git a/omero/features/publish/index.html b/omero/features/publish/index.html
index a61e07a1c..f4e6859ae 100644
--- a/omero/features/publish/index.html
+++ b/omero/features/publish/index.html
@@ -41,7 +41,7 @@ <h4>Using a public group</h4>
                 <p>OMERO.web can allow public access to selected data without
                     the need to log in.</p>
                 <a class="button hollow tiny" href="https://omero-guides.readthedocs.io/en/latest/introduction/docs/data-publication.html" target="_blank">View user guide</a>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/public.html" target="_blank">View administrator guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/sysadmins/public.html" target="_blank">View administrator guide</a>
             </div>
             <div class="omero-feature-container tall-content column text-center">
                 <img class="thumbnail omero-feature" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_public-repo.svg">
@@ -49,7 +49,7 @@ <h4>OMERO as a public repository</h4>
                 <p>Configure OMERO.web or use another app to create a
                     customized front end for your OMERO installation.</p>
                 <a class="button hollow tiny" href="{{ site.baseurl }}/explore/index.html#public-servers">Explore examples</a>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/index.html#optimizing-omero-as-a-data-repository" target="_blank">View administrator guides</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/sysadmins/index.html#optimizing-omero-as-a-data-repository" target="_blank">View administrator guides</a>
             </div>
         </div>
     </div>
diff --git a/omero/features/share/index.html b/omero/features/share/index.html
index 33513a662..9f58a25d7 100644
--- a/omero/features/share/index.html
+++ b/omero/features/share/index.html
@@ -22,7 +22,7 @@ <h2 class="header-blue">Sharing your data in OMERO</h2>
                     <h4>Permissions</h4>
                     <p>Allows users to share data within groups and collaborate on their data.</p>
                     <a class="button hollow tiny" href="https://omero-guides.readthedocs.io/en/latest/introduction/docs/data-management.html" target="_blank">View user guide</a>
-                    <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/server-permissions.html" target="_blank">View sysadmin guide</a>
+                    <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/sysadmins/server-permissions.html" target="_blank">View sysadmin guide</a>
                 </div>
                 <div class="omero-feature-container column text-center">
                     <img class="thumbnail omero-feature" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_organize.svg">
diff --git a/omero/features/utility/index.html b/omero/features/utility/index.html
index 76ec260f0..f06060f18 100644
--- a/omero/features/utility/index.html
+++ b/omero/features/utility/index.html
@@ -24,21 +24,21 @@ <h4>Manage users &amp; groups</h4>
                 <p>Administrators can add and manage users and groups
                     with the admin tools.</p>
                 <a class="button hollow tiny" href="https://omero-guides.readthedocs.io/en/latest/introduction/docs/group-user-management.html" target="_blank">View OMERO.<span class="lowercase">w</span>eb admin guide</a>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/cli/usergroup.html" target="_blank">View OMERO.<span class="lowercase">c</span>li guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/sysadmins/cli/usergroup.html" target="_blank">View OMERO.<span class="lowercase">c</span>li guide</a>
             </div>
             <div class="omero-feature-container tall-content  column text-center">
                 <img class="thumbnail omero-feature" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_ldap.png">
                 <h4>LDAP support</h4>
                 <p>The Lightweight Directory Access Protocol (LDAP)
                     support.</p>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/server-ldap.html" target="_blank">View sysadmin guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/sysadmins/server-ldap.html" target="_blank">View sysadmin guide</a>
             </div>
             <div class="omero-feature-container tall-content  column text-center">
                 <img class="thumbnail omero-feature" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_command-line.svg">
                 <h4>Command Line Interface</h4>
                 <p>Many OMERO functions can be accessed from the command
                     line.</p>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/cli/index.html" target="_blank">View sysadmin guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/sysadmins/cli/index.html" target="_blank">View sysadmin guide</a>
             </div>
             <div class="omero-feature-container tall-content  column text-center">
                 <img class="thumbnail omero-feature" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_qa.svg">
@@ -58,7 +58,7 @@ <h4>Personalize</h4>
                 <img class="thumbnail omero-feature" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_email.svg">
                 <h4>OMERO.mail</h4>
                 <p>Sysadmins can use a GUI to email users from the server.</p>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/mail.html" target="_blank">View sysadmin guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/sysadmins/mail.html" target="_blank">View sysadmin guide</a>
             </div>
         </div>
     </div>
diff --git a/omero/index.html b/omero/index.html
index 74ea8df1e..1122a1bc5 100644
--- a/omero/index.html
+++ b/omero/index.html
@@ -73,7 +73,7 @@ <h1 class="hero-main-header"><img src="{{ site.baseurl }}/img/logos/omero-white.
                     </p>
                     <br>
                     <a href="{{ site.baseurl }}/omero/downloads/" class="large button sites-button btn-red">Download Version {{ site.omero.majorversion }}</a>
-                    <a href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/" target="_blank" class="hero-link">Read the Docs</a>
+                    <a href="https://omero.readthedocs.io/en/stable/" target="_blank" class="hero-link">Read the Docs</a>
                     <a href="{{ site.baseurl }}/omero/institution/getting-started.html" target="_blank" class="hero-link">Start with OMERO at your Institution</a>
                 </div>
             </div>
diff --git a/omero/institution/docs.html b/omero/institution/docs.html
index 1f01860da..628ba7861 100644
--- a/omero/institution/docs.html
+++ b/omero/institution/docs.html
@@ -23,7 +23,7 @@ <h5 class="doc-title">Introductory guide<br>for facility managers</h5>
                 </a>
             </div>
             <div class="column">
-                <a href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/index.html" target="_blank">
+                <a href="https://omero.readthedocs.io/en/stable/sysadmins/index.html" target="_blank">
                     <div class="card card-docs top-gray">
                         <div class="card-section">
                             <h5 class="doc-title">OMERO system administrator documentation</h5>
diff --git a/omero/institution/getting-started.html b/omero/institution/getting-started.html
index 17a4695f8..d4028ab76 100644
--- a/omero/institution/getting-started.html
+++ b/omero/institution/getting-started.html
@@ -137,7 +137,7 @@ <h4 class="text-center">OMERO for facility managers</h4>
                         <h4 class="text-center">System requirements</h4>
                         <i class="fa fa-book fa-5x icon-gray"></i>
                         <p class="card-caption">Hardware developments constantly outpace us but this guide will give you an idea of the requirements depending on the number of users and amount of data you expect.</p>
-                        <div class="text-center"><a class="button small" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/system-requirements.html" target="_blank">Read the Guide</a></div>
+                        <div class="text-center"><a class="button small" href="https://omero.readthedocs.io/en/stable/sysadmins/system-requirements.html" target="_blank">Read the Guide</a></div>
                     </div>
                 </div>
             </div>
@@ -149,7 +149,7 @@ <h4 class="text-center">System requirements</h4>
                         <h4 class="text-center">Groups and permissions system</h4>
                         <i class="fa fa-book fa-5x icon-blue"></i>
                         <p class="card-caption">Getting to grips with the user roles, groups and permissions in OMERO is a great way to support a range of privacy and collaboration scenarios. This in-depth guide gives you all the information you need.</p>
-                        <div class="text-center"><a class="button small" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/server-permissions.html" target="_blank">Read the Guide</a></div>
+                        <div class="text-center"><a class="button small" href="https://omero.readthedocs.io/en/stable/sysadmins/server-permissions.html" target="_blank">Read the Guide</a></div>
                     </div>
                 </div>
             </div>
@@ -159,7 +159,7 @@ <h4 class="text-center">Groups and permissions system</h4>
                         <h4 class="text-center">Installing OMERO.server</h4>
                         <i class="fa fa-book fa-5x icon-green"></i>
                         <p class="card-caption">How to guides are provided for installing the server on a range of supported platforms and there is also information for getting your data repository, PostgreSQL database and OMERO.web deployment up and running.</p>
-                        <div class="text-center"><a class="button small" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/index.html#server-installation" target="_blank">Read the Guide</a></div>
+                        <div class="text-center"><a class="button small" href="https://omero.readthedocs.io/en/stable/sysadmins/index.html#server-installation" target="_blank">Read the Guide</a></div>
                     </div>
                 </div>
             </div>
@@ -171,7 +171,7 @@ <h4 class="text-center">Installing OMERO.server</h4>
                         <h4 class="text-center">Advanced import scenarios</h4>
                         <i class="fa fa-book fa-5x icon-red"></i>
                         <p class="card-caption">This is an overview of the advantages and disadvantages of all the available methods for importing data so you can choose the best method for your facility.</p>
-                        <div class="text-center"><a class="button small" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/import-scenarios.html" target="_blank">Read the Guide</a></div>
+                        <div class="text-center"><a class="button small" href="https://omero.readthedocs.io/en/stable/sysadmins/import-scenarios.html" target="_blank">Read the Guide</a></div>
                     </div>
                 </div>
             </div>
@@ -181,7 +181,7 @@ <h4 class="text-center">Advanced import scenarios</h4>
                         <h4 class="text-center">Server security and firewalls</h4>
                         <i class="fa fa-book fa-5x icon-gray"></i>
                         <p class="card-caption">OMERO is built with security in mind. This guide takes you through our practices and how to ensure your installation is as secure as possible.</p>
-                        <div class="text-center"><a class="button small" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/server-security.html" target="_blank">Read the Guide</a></div>
+                        <div class="text-center"><a class="button small" href="https://omero.readthedocs.io/en/stable/sysadmins/server-security.html" target="_blank">Read the Guide</a></div>
                     </div>
                 </div>
             </div>
diff --git a/omero/institution/index.html b/omero/institution/index.html
index 3a7cedd75..0c9d7a993 100644
--- a/omero/institution/index.html
+++ b/omero/institution/index.html
@@ -22,7 +22,7 @@ <h3 class="header-green text-center">OMERO is designed to be an institutional da
                     securely stored and managed, using group permissions and
                     user roles to allow controlled access tailored to your
                     institution. From private repositories for sensitive data
-                    to hosting public data for your website and latest <a href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/public.html" target="blank">publications</a>,
+                    to hosting public data for your website and latest <a href="https://omero.readthedocs.io/en/stable/sysadmins/public.html" target="blank">publications</a>,
                     the permissions model is designed to meet the range of
                     researchers’ needs. OMERO is tried and tested in hundreds
                     of institutions world-wide, with extensive installation
@@ -56,7 +56,7 @@ <h4>Supported File Formats</h4>
             <div class="omero-key-feature-container medium-3 columns end">
                 <h4>Permissions</h4>
                 <p>OMERO permissions functionality allows users to share data within groups of scientists and collaborate on their data.</p>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/server-permissions.html" target="_blank">View Sysadmin Guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/sysadmins/server-permissions.html" target="_blank">View Sysadmin Guide</a>
                 <a class="button hollow tiny" href="https://omero-guides.readthedocs.io/en/latest/example_facility_manager.html" target="_blank">View Facility Manager Guide</a>
             </div>
         </div>
@@ -84,14 +84,14 @@ <h4>Manage Users &amp; Groups</h4>
             <div class="omero-key-feature-container medium-3 columns">
                 <h4>LDAP Support</h4>
                 <p>Lightweight Directory Access Protocol (LDAP) is supported to allow existing institutional authentication services to be used for OMERO.</p>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/server-ldap.html" target="_blank">View Sysadmin Guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/sysadmins/server-ldap.html" target="_blank">View Sysadmin Guide</a>
             </div>
             <div class="medium-1 columns"><img class="omero-feature thumbnail" alt="OMERO feature" src="{{ site.baseurl }}/img/icons/omero-features-icons_command-line.svg"></div>
             <div class="omero-key-feature-container medium-3 columns end">
                 <h4>Command Line</h4>
                 <p>The Command Line Interface enables a range of OMERO functions to be performed efficiently on single or batches of images.</p>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/users/cli/index.html" target="_blank">View User Guide</a>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/cli/index.html" target="_blank">View Sysadmin Guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/users/cli/index.html" target="_blank">View User Guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/sysadmins/cli/index.html" target="_blank">View Sysadmin Guide</a>
             </div>
         </div>
         <hr class="invisible">
@@ -106,7 +106,7 @@ <h4>File Integrity Reports</h4>
             <div class="omero-key-feature-container medium-3 columns end">
                 <h4>DropBox</h4>
                 <p>Full-fledged “DropBox" allows automatic import from a defined directory of all supported file formats.</p>
-                <a class="button hollow tiny" href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/sysadmins/dropbox.html" target="_blank">View Sysadmin Guide</a>
+                <a class="button hollow tiny" href="https://omero.readthedocs.io/en/stable/sysadmins/dropbox.html" target="_blank">View Sysadmin Guide</a>
             </div>
         </div>
         <!-- end Key Features -->
diff --git a/omero/scientists/docs.html b/omero/scientists/docs.html
index 81c3a3566..f49abf192 100644
--- a/omero/scientists/docs.html
+++ b/omero/scientists/docs.html
@@ -24,7 +24,7 @@ <h5 class="doc-title">User guides</h5>
                 </a>
             </div>
             <div class="column">
-                <a href="https://docs.openmicroscopy.org/omero/{{ site.omero.version }}/users/index.html" target="_blank">
+                <a href="https://omero.readthedocs.io/en/stable/users/index.html" target="_blank">
                     <div class="card card-docs top-gray">
                         <div class="card-section">
                             <h5 class="doc-title">OMERO Documentation</h5>