diff --git a/Makefile b/Makefile
index b8002b6a8..242d727f8 100644
--- a/Makefile
+++ b/Makefile
@@ -36,11 +36,5 @@ gen:
 		--additional-properties=typescriptThreePlus=true,supportsES6=true,npmName=authentik-api,npmVersion=1.0.0
 	cd web/api && npx tsc
 
-local-stack:
-	export AUTHENTIK_TAG=testing
-	docker build -t beryju/authentik:testng .
-	docker-compose up -d
-	docker-compose run --rm server migrate
-
 run:
 	go run -v cmd/server/main.go
diff --git a/authentik/lib/default.yml b/authentik/lib/default.yml
index 24d3fcf2c..4cc831e88 100644
--- a/authentik/lib/default.yml
+++ b/authentik/lib/default.yml
@@ -43,7 +43,7 @@ outposts:
   # %(type)s: Outpost type; proxy, ldap, etc
   # %(version)s: Current version; 2021.4.1
   # %(build_hash)s: Build hash if you're running a beta version
-  docker_image_base: "beryju/authentik-%(type)s:%(version)s"
+  docker_image_base: "ghcr.io/goauthentik/%(type)s:%(version)s"
 
 authentik:
   avatars: gravatar  # gravatar or none
diff --git a/docker-compose.yml b/docker-compose.yml
index bd27285c2..1d80a13cb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
     networks:
       - internal
   server:
-    image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.5.1-rc10}
+    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.5.1-rc10}
     restart: unless-stopped
     command: server
     environment:
@@ -52,7 +52,7 @@ services:
       - "0.0.0.0:9000:9000"
       - "0.0.0.0:9443:9443"
   worker:
-    image: ${AUTHENTIK_IMAGE:-beryju/authentik}:${AUTHENTIK_TAG:-2021.5.1-rc10}
+    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.5.1-rc10}
     restart: unless-stopped
     command: worker
     networks:
diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 2bbde1b17..a6cdec870 100644
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -34,7 +34,7 @@ module.exports = {
                     position: "left",
                 },
                 {
-                    href: "https://github.com/beryju/authentik",
+                    href: "https://github.com/goauthentik/authentik",
                     label: "GitHub",
                     position: "right",
                 },
@@ -69,7 +69,7 @@ module.exports = {
                     items: [
                         {
                             label: "GitHub",
-                            href: "https://github.com/beryju/authentik",
+                            href: "https://github.com/goauthentik/authentik",
                         },
                         {
                             label: "Discord",
@@ -95,7 +95,7 @@ module.exports = {
                 docs: {
                     id: "docs",
                     sidebarPath: require.resolve("./sidebars.js"),
-                    editUrl: "https://github.com/beryju/authentik/edit/master/website/",
+                    editUrl: "https://github.com/goauthentik/authentik/edit/master/website/",
                 },
                 theme: {
                     customCss: require.resolve("./src/css/custom.css"),
@@ -111,7 +111,7 @@ module.exports = {
                 path: 'developer-docs',
                 routeBasePath: 'developer-docs',
                 sidebarPath: require.resolve('./sidebarsDev.js'),
-                editUrl: "https://github.com/beryju/authentik/edit/master/website/",
+                editUrl: "https://github.com/goauthentik/authentik/edit/master/website/",
             },
         ],
     ],