diff --git a/README.md b/README.md
index a7dbaea67..cb4d991fb 100644
--- a/README.md
+++ b/README.md
@@ -17,11 +17,7 @@
 
 ---
 
-[ReactPy](https://reactpy.herokuapp.com) is a library for building user interfaces in Python without Javascript. ReactPy
-interfaces are made from components which look and behave similarly to this found in
-[ReactJS](https://reactjs.org/). Designed with simplicity in mind, ReactPy can be used
-by those without web development experience while also being powerful enough to grow
-with your ambitions.
+[ReactPy](https://reactpy.dev/) is a library for building user interfaces in Python without Javascript. ReactPy interfaces are made from components which look and behave similarly to those found in [ReactJS](https://reactjs.org/). Designed with simplicity in mind, ReactPy can be used by those without web development experience while also being powerful enough to grow with your ambitions.
 
 <table align="center">
     <thead>
@@ -35,7 +31,7 @@ with your ambitions.
     <tbody>
         <tr>
         <td>
-            <a href="">
+            <a href="https://reactpy.dev/docs/guides/getting-started/installing-reactpy.html#officially-supported-servers">
                 Flask, FastAPI, Sanic, Tornado
             </a>
         </td>
@@ -66,8 +62,8 @@ run(HelloWorld)
 
 Follow the links below to find out more about this project.
 
-- [Try it Now](https://mybinder.org/v2/gh/reactive-python/reactpy-jupyter/main?urlpath=lab/tree/notebooks/introduction.ipynb) - check out ReactPy in a Jupyter Notebook.
-- [Documentation](https://reactpy.herokuapp.com/) - learn how to install, run, and use ReactPy.
-- [Community Forum](https://github.com/reactive-python/reactpy/discussions) - ask questions, share ideas, and show off projects.
-- [Contributor Guide](https://reactpy.herokuapp.com/docs/developing-reactpy/contributor-guide.html) - see how you can help develop this project.
-- [Code of Conduct](https://github.com/reactive-python/reactpy/blob/main/CODE_OF_CONDUCT.md) - standards for interacting with this community.
+-   [Try it Now](https://mybinder.org/v2/gh/reactive-python/reactpy-jupyter/main?urlpath=lab/tree/notebooks/introduction.ipynb) - check out ReactPy in a Jupyter Notebook.
+-   [Documentation](https://reactpy.dev/) - learn how to install, run, and use ReactPy.
+-   [Community Forum](https://github.com/reactive-python/reactpy/discussions) - ask questions, share ideas, and show off projects.
+-   [Contributor Guide](https://reactpy.dev/docs/developing-reactpy/contributor-guide.html) - see how you can help develop this project.
+-   [Code of Conduct](https://github.com/reactive-python/reactpy/blob/main/CODE_OF_CONDUCT.md) - standards for interacting with this community.
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 71364b00d..3b039925e 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -163,7 +163,7 @@
 
 # -- sphinxext.opengraph --
 
-ogp_site_url = "https://reactpy-docs.herokuapp.com/"
+ogp_site_url = "https://reactpy.dev/"
 ogp_image = "https://raw.githubusercontent.com/reactive-python/reactpy/main/branding/png/reactpy-logo-padded.png"
 # We manually specify this below
 # ogp_description_length = 200
diff --git a/docs/source/guides/getting-started/_static/embed-doc-ex.html b/docs/source/guides/getting-started/_static/embed-doc-ex.html
index 659ba250a..7844b31a4 100644
--- a/docs/source/guides/getting-started/_static/embed-doc-ex.html
+++ b/docs/source/guides/getting-started/_static/embed-doc-ex.html
@@ -3,6 +3,6 @@
   import { mountLayoutWithWebSocket } from "https://esm.sh/@reactpy/client@0.33.3";
   mountLayoutWithWebSocket(
     document.getElementById("reactpy-app"),
-    "wss://reactpy-docs.herokuapp.com/_reactpy/stream?view_id=todo"
+    "wss://reactpy.dev/_reactpy/stream?view_id=todo"
   );
 </script>
diff --git a/docs/source/index.rst b/docs/source/index.rst
index bf7936f8f..712db3ead 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -40,7 +40,7 @@ ReactPy
 
 ReactPy is a library for building user interfaces in Python without Javascript. ReactPy
 interfaces are made from :ref:`components <Your First Components>` which look and behave
-similarly to this found in `ReactJS <https://reactjs.org/>`__. Designed with simplicity
+similarly to those found in `ReactJS <https://reactjs.org/>`__. Designed with simplicity
 in mind, ReactPy can be used by those without web development experience while also
 being powerful enough to grow with your ambitions.