diff --git a/.gitremotes b/.gitremotes
index fdd02b0..9fca3ec 100644
--- a/.gitremotes
+++ b/.gitremotes
@@ -1,2 +1,2 @@
-github git@github.com:dls-controls/epicsdbbuilder.git
+github git@github.com:DiamondLightSource/epicsdbbuilder.git
 gitlab-py2 ssh://git@gitlab.diamond.ac.uk/controls/python/epicsdbbuilder.git
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index a137002..d058262 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/epicsdbbuilder/issues
+.. _dls_controls repository: https://github.com/DiamondLightSource/epicsdbbuilder/issues
 
 Running the tests
 -----------------
 
 To get the source source code and run the unit tests, run::
 
-    $ git clone git://github.com/dls-controls/epicsdbbuilder.git
+    $ git clone git://github.com/DiamondLightSource/epicsdbbuilder.git
     $ cd epicsdbbuilder
     $ pipenv install --dev
     $ pipenv run tests
diff --git a/Pipfile b/Pipfile
index 4927103..b6d93b6 100644
--- a/Pipfile
+++ b/Pipfile
@@ -5,7 +5,7 @@ verify_ssl = true
 
 [dev-packages]
 # Switch to main repo after PR https://github.com/Holzhaus/sphinx-multiversion/pull/64 is merged
-sphinx-multiversion = {editable = true,git = "https://github.com/dls-controls/sphinx-multiversion.git",ref = "only-arg"}
+sphinx-multiversion = {editable = true,git = "https://github.com/DiamondLightSource/sphinx-multiversion.git",ref = "only-arg"}
 
 # Make sure lockfile is usable on other platforms
 atomicwrites = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index e0060b4..25a84ce 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -317,7 +317,7 @@
         },
         "sphinx-multiversion": {
             "editable": true,
-            "git": "https://github.com/dls-controls/sphinx-multiversion.git",
+            "git": "https://github.com/DiamondLightSource/sphinx-multiversion.git",
             "ref": "3e72beb7f8f0a76b53722fb2eb3daeed3d2a3d31"
         },
         "sphinx-rtd-theme": {
diff --git a/README.rst b/README.rst
index 3f6701a..5eae2b8 100644
--- a/README.rst
+++ b/README.rst
@@ -9,8 +9,8 @@ dbd entries are checked to reduce the number of errors in the database.
 
 ============== ==============================================================
 PyPI           ``pip install epicsdbbuilder``
-Source code    https://github.com/dls-controls/epicsdbbuilder
-Documentation  https://dls-controls.github.io/epicsdbbuilder
+Source code    https://github.com/DiamondLightSource/epicsdbbuilder
+Documentation  https://DiamondLightSource.github.io/epicsdbbuilder
 ============== ==============================================================
 
 A simple example of the use of this library is the following:
@@ -27,16 +27,16 @@ A simple example of the use of this library is the following:
 
     WriteRecords('output.db')
 
-.. |code_ci| image:: https://github.com/dls-controls/epicsdbbuilder/workflows/Code%20CI/badge.svg?branch=master
-    :target: https://github.com/dls-controls/epicsdbbuilder/actions?query=workflow%3A%22Code+CI%22
+.. |code_ci| image:: https://github.com/DiamondLightSource/epicsdbbuilder/workflows/Code%20CI/badge.svg?branch=master
+    :target: https://github.com/DiamondLightSource/epicsdbbuilder/actions?query=workflow%3A%22Code+CI%22
     :alt: Code CI
 
-.. |docs_ci| image:: https://github.com/dls-controls/epicsdbbuilder/workflows/Docs%20CI/badge.svg?branch=master
-    :target: https://github.com/dls-controls/epicsdbbuilder/actions?query=workflow%3A%22Docs+CI%22
+.. |docs_ci| image:: https://github.com/DiamondLightSource/epicsdbbuilder/workflows/Docs%20CI/badge.svg?branch=master
+    :target: https://github.com/DiamondLightSource/epicsdbbuilder/actions?query=workflow%3A%22Docs+CI%22
     :alt: Docs CI
 
-.. |coverage| image:: https://codecov.io/gh/dls-controls/epicsdbbuilder/branch/master/graph/badge.svg
-    :target: https://codecov.io/gh/dls-controls/epicsdbbuilder
+.. |coverage| image:: https://codecov.io/gh/DiamondLightSource/epicsdbbuilder/branch/master/graph/badge.svg
+    :target: https://codecov.io/gh/DiamondLightSource/epicsdbbuilder
     :alt: Test Coverage
 
 .. |pypi_version| image:: https://img.shields.io/pypi/v/epicsdbbuilder.svg
@@ -51,6 +51,6 @@ A simple example of the use of this library is the following:
     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/epicsdbbuilder for more detailed documentation.
+See https://DiamondLightSource.github.io/epicsdbbuilder for more detailed documentation.
 
 
diff --git a/epicsdbbuilder/_version_git.py b/epicsdbbuilder/_version_git.py
index ec811d1..efe15d0 100644
--- a/epicsdbbuilder/_version_git.py
+++ b/epicsdbbuilder/_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 a14769b..ffb334b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,7 +1,7 @@
 [metadata]
 name = epicsdbbuilder
 description = EPICS Database Builder
-url = https://github.com/dls-controls/epicsdbbuilder
+url = https://github.com/DiamondLightSource/epicsdbbuilder
 author = Michael Abbott
 author_email = Michael.Abbott@diamond.ac.uk
 license = Apache License 2.0