diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 366114ab..8d2ad4fc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,7 +1,7 @@
 # Contributing
 
-[![Build Status](https://travis-ci.org/cdubz/babybuddy.svg?branch=master)](https://travis-ci.org/cdubz/babybuddy)
-[![Coverage Status](https://coveralls.io/repos/github/cdubz/babybuddy/badge.svg?branch=master)](https://coveralls.io/github/cdubz/babybuddy?branch=master)
+[![Build Status](https://travis-ci.org/babybuddy/babybuddy.svg?branch=master)](https://travis-ci.org/babybuddy/babybuddy)
+[![Coverage Status](https://coveralls.io/repos/github/babybuddy/babybuddy/badge.svg?branch=master)](https://coveralls.io/github/babybuddy/babybuddy?branch=master)
 
 - [Contributions](#contributions)
   - [Pull request process](#pull-request-process)
@@ -12,9 +12,9 @@
   
 ## Contributions
 
-Contributions are accepted and encouraged via GitHub [Issues](https://github.com/cdubz/babybuddy/issues)
-and [Pull Requests](https://github.com/cdubz/babybuddy/pulls). Maintainers and
-users may also be found at [babybuddy/Lobby](https://gitter.im/babybuddy/Lobby)
+Contributions are accepted and encouraged via GitHub [Issues](https://github.com/babybuddy/babybuddy/issues)
+and [Pull Requests](https://github.com/babybuddy/babybuddy/pulls). Maintainers
+and users may also be found at [babybuddy/Lobby](https://gitter.im/babybuddy/Lobby)
 on Gitter.
 
 ### Pull request process
@@ -25,7 +25,7 @@ on Gitter.
    ensure that all tests pass.
 1. If changes are made to assets: build, collect and commit the `/static` 
    folder (see [`gulp collectstatic`](#collectstatic)).
-1. Open a [new pull request](https://github.com/cdubz/babybuddy/compare) against
+1. Open a [new pull request](https://github.com/babybuddy/babybuddy/compare) against
    the `master` branch.
    
 New pull requests will be reviewed by project maintainers as soon as possible 
diff --git a/README.md b/README.md
index b800b7ff..3a0c93d8 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ for detailed information.
 
 1. Clone/download the Baby Buddy repo
 
-        git clone https://github.com/cdubz/babybuddy.git
+        git clone https://github.com/babybuddy/babybuddy.git
 
 1. Enter the cloned/downloaded directory
 
@@ -169,7 +169,7 @@ Python 3.6+, nginx, uwsgi and sqlite and should be sufficient for a few users
         sudo mkdir /var/www/babybuddy
         sudo chown user:user /var/www/babybuddy
         mkdir -p /var/www/babybuddy/data/media
-        git clone https://github.com/cdubz/babybuddy.git /var/www/babybuddy/public
+        git clone https://github.com/babybuddy/babybuddy.git /var/www/babybuddy/public
 
 1. Move in to the application folder
 
diff --git a/app.json b/app.json
index fa501057..fab49bc3 100644
--- a/app.json
+++ b/app.json
@@ -11,7 +11,7 @@
         "python",
         "self-host"
     ],
-    "repository": "https://github.com/cdubz/babybuddy",
+    "repository": "https://github.com/babybuddy/babybuddy",
     "website": "http://www.baby-buddy.net",
     "buildpacks": [
         {
diff --git a/babybuddy/templates/babybuddy/nav-dropdown.html b/babybuddy/templates/babybuddy/nav-dropdown.html
index facd1971..6d75c7cf 100644
--- a/babybuddy/templates/babybuddy/nav-dropdown.html
+++ b/babybuddy/templates/babybuddy/nav-dropdown.html
@@ -250,7 +250,7 @@
                                    target="_blank">{% trans "Backend Admin" %}</a>
                             {% endif %}
                             <h6 class="dropdown-header">{% trans "Support" %}</h6>
-                            <a href="https://github.com/cdubz/babybuddy"
+                            <a href="https://github.com/babybuddy/babybuddy"
                                class="dropdown-item"
                                target="_blank">
                                 <i class="icon icon-source" aria-hidden="true"></i> {% trans "Source Code" %}</a>
diff --git a/package.json b/package.json
index 446129a0..7211a809 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "license": "BSD-2-Clause",
   "repository": {
     "type": "git",
-    "url": "https://github.com/cdubz/babybuddy.git"
+    "url": "https://github.com/babybuddy/babybuddy.git"
   },
   "devDependencies": {
     "bootstrap": "4.4.1",