diff --git a/.gitremotes b/.gitremotes
index 94b5edf..1c6ca01 100644
--- a/.gitremotes
+++ b/.gitremotes
@@ -1 +1 @@
-github git@github.com:dls-controls/pmac_motorhome.git
+github git@github.com:DiamondLightSource/pmac_motorhome.git
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 52695fa..d21a361 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -8,14 +8,14 @@ involves big changes, please file a ticket before making a pull request! We
 want to make sure you don't spend your time coding something that might not fit
 the scope of the project.
 
-.. _dls_controls repository: https://github.com/dls-controls/pmac_motorhome/issues
+.. _dls_controls repository: https://github.com/DiamondLightSource/pmac_motorhome/issues
 
 Running the tests
 -----------------
 
 To get the source source code and run the unit tests, run::
 
-    $ git clone git://github.com/dls-controls/pmac_motorhome.git
+    $ git clone git://github.com/DiamondLightSource/pmac_motorhome.git
     $ cd pmac_motorhome
     $ pipenv install --dev
     $ pipenv run tests
diff --git a/README.rst b/README.rst
index 024cb17..c941a27 100644
--- a/README.rst
+++ b/README.rst
@@ -8,8 +8,8 @@ script
 
 ============== ==============================================================
 PyPI           ``pip install pmac_motorhome``
-Source code    https://github.com/dls-controls/pmac_motorhome
-Documentation  https://dls-controls.github.io/pmac_motorhome
+Source code    https://github.com/DiamondLightSource/pmac_motorhome
+Documentation  https://DiamondLightSource.github.io/pmac_motorhome
 ============== ==============================================================
 
 This is where you should put some images or code snippets that illustrate
@@ -28,16 +28,16 @@ Or if it is a commandline tool then you might put some example commands here::
     pmac_motorhome person --times=2
 
 
-.. |code_ci| image:: https://github.com/dls-controls/pmac_motorhome/workflows/Code%20CI/badge.svg?branch=master
-    :target: https://github.com/dls-controls/pmac_motorhome/actions?query=workflow%3A%22Code+CI%22
+.. |code_ci| image:: https://github.com/DiamondLightSource/pmac_motorhome/workflows/Code%20CI/badge.svg?branch=master
+    :target: https://github.com/DiamondLightSource/pmac_motorhome/actions?query=workflow%3A%22Code+CI%22
     :alt: Code CI
 
-.. |docs_ci| image:: https://github.com/dls-controls/pmac_motorhome/workflows/Docs%20CI/badge.svg?branch=master
-    :target: https://github.com/dls-controls/pmac_motorhome/actions?query=workflow%3A%22Docs+CI%22
+.. |docs_ci| image:: https://github.com/DiamondLightSource/pmac_motorhome/workflows/Docs%20CI/badge.svg?branch=master
+    :target: https://github.com/DiamondLightSource/pmac_motorhome/actions?query=workflow%3A%22Docs+CI%22
     :alt: Docs CI
 
-.. |coverage| image:: https://codecov.io/gh/dls-controls/pmac_motorhome/branch/master/graph/badge.svg
-    :target: https://codecov.io/gh/dls-controls/pmac_motorhome
+.. |coverage| image:: https://codecov.io/gh/DiamondLightSource/pmac_motorhome/branch/master/graph/badge.svg
+    :target: https://codecov.io/gh/DiamondLightSource/pmac_motorhome
     :alt: Test Coverage
 
 .. |pypi_version| image:: https://img.shields.io/pypi/v/pmac_motorhome.svg
@@ -52,4 +52,4 @@ Or if it is a commandline tool then you might put some example commands here::
     Anything below this line is used when viewing README.rst and will be replaced
     when included in index.rst
 
-See https://dls-controls.github.io/pmac_motorhome for more detailed documentation.
+See https://DiamondLightSource.github.io/pmac_motorhome for more detailed documentation.
diff --git a/docs/tutorials/installation.rst b/docs/tutorials/installation.rst
index c2e5742..c28450c 100644
--- a/docs/tutorials/installation.rst
+++ b/docs/tutorials/installation.rst
@@ -40,7 +40,7 @@ You can now use ``pip`` to install the library::
 If you require a feature that is not currently released you can also install
 from github::
 
-    python3 -m pip install git+git://github.com/dls-controls/pmac_motorhome.git
+    python3 -m pip install git+git://github.com/DiamondLightSource/pmac_motorhome.git
 
 The library should now be installed and the commandline interface on your path.
 You can check the version that has been installed by typing::
diff --git a/pmac_motorhome/_version_git.py b/pmac_motorhome/_version_git.py
index da05a94..7574cbb 100644
--- a/pmac_motorhome/_version_git.py
+++ b/pmac_motorhome/_version_git.py
@@ -1,7 +1,7 @@
 # Compute a version number from a git repo or archive
 
 # This file is released into the public domain. Generated by:
-# versiongit-1.0 (https://github.com/dls-controls/versiongit)
+# versiongit-1.0 (https://github.com/DiamondLightSource/versiongit)
 import os
 import re
 import sys
diff --git a/setup.cfg b/setup.cfg
index cf7f826..5709d77 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
 [metadata]
 name = pmac_motorhome
 description = Generate homing procedures in pmc code for Delta Tau motion controllers
-url = https://github.com/dls-controls/pmac_motorhome
+url = https://github.com/DiamondLightSource/pmac_motorhome
 author = Arvinder Palaha
 author_email = arvinder.palaha@diamond.ac.uk
 license = Apache License 2.0