diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml
index 4632b8fcd..0545d5082 100644
--- a/.github/workflows/release-tag.yml
+++ b/.github/workflows/release-tag.yml
@@ -14,13 +14,14 @@ jobs:
       - name: Pre-release test
         run: |
           sudo apt-get install -y pwgen
+          echo "AUTHENTIK_IMAGE=testing" >> .env
           echo "AUTHENTIK_TAG=latest" >> .env
           echo "PG_PASS=$(pwgen 40 1)" >> .env
           echo "AUTHENTIK_SECRET_KEY=$(pwgen 50 1)" >> .env
           docker-compose pull -q
           docker build \
             --no-cache \
-            -t ghcr.io/goauthentik/server:latest \
+            -t testing:latest \
             -f Dockerfile .
           docker-compose up --no-start
           docker-compose start postgresql redis
diff --git a/authentik/lib/default.yml b/authentik/lib/default.yml
index 24a4f38be..1ca3a0476 100644
--- a/authentik/lib/default.yml
+++ b/authentik/lib/default.yml
@@ -54,7 +54,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: "ghcr.io/goauthentik/%(type)s:%(version)s"
+  docker_image_base: "goauthentik.io/%(type)s:%(version)s"
 
 disable_update_check: false
 avatars: env://AUTHENTIK_AUTHENTIK__AVATARS?gravatar
diff --git a/authentik/outposts/controllers/docker.py b/authentik/outposts/controllers/docker.py
index 6de85a95b..a418bb8d7 100644
--- a/authentik/outposts/controllers/docker.py
+++ b/authentik/outposts/controllers/docker.py
@@ -97,7 +97,7 @@ class DockerController(BaseController):
         try:
             self.client.images.pull(image)
         except DockerException:
-            image = f"ghcr.io/goauthentik/{self.outpost.type}:latest"
+            image = f"goauthentik.io/{self.outpost.type}:latest"
             self.client.images.pull(image)
         return image
 
diff --git a/authentik/root/test_runner.py b/authentik/root/test_runner.py
index 870574123..d12a0e151 100644
--- a/authentik/root/test_runner.py
+++ b/authentik/root/test_runner.py
@@ -18,7 +18,7 @@ class PytestTestRunner:  # pragma: no cover
         CONFIG.y_set("authentik.geoip", "tests/GeoLite2-City-Test.mmdb")
         CONFIG.y_set(
             "outposts.docker_image_base",
-            f"ghcr.io/goauthentik/dev-%(type)s:{get_docker_tag()}",
+            f"goauthentik.io/dev-%(type)s:{get_docker_tag()}",
         )
 
     def run_tests(self, test_labels):
diff --git a/docker-compose.yml b/docker-compose.yml
index 50969ad8e..0def07579 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
     image: redis:alpine
     restart: unless-stopped
   server:
-    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.9.8}
+    image: ${AUTHENTIK_IMAGE:-goauthentik.io/server}:${AUTHENTIK_TAG:-2021.9.8}
     restart: unless-stopped
     command: server
     environment:
@@ -38,7 +38,7 @@ services:
       - "0.0.0.0:9000:9000"
       - "0.0.0.0:9443:9443"
   worker:
-    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2021.9.8}
+    image: ${AUTHENTIK_IMAGE:-goauthentik.io/server}:${AUTHENTIK_TAG:-2021.9.8}
     restart: unless-stopped
     command: worker
     environment:
diff --git a/tests/e2e/test_provider_ldap.py b/tests/e2e/test_provider_ldap.py
index 11c41ee65..4d032e5fc 100644
--- a/tests/e2e/test_provider_ldap.py
+++ b/tests/e2e/test_provider_ldap.py
@@ -33,7 +33,7 @@ class TestProviderLDAP(SeleniumTestCase):
         """Start ldap container based on outpost created"""
         client: DockerClient = from_env()
         container = client.containers.run(
-            image=self.get_container_image("ghcr.io/goauthentik/dev-ldap"),
+            image=self.get_container_image("goauthentik.io/dev-ldap"),
             detach=True,
             network_mode="host",
             auto_remove=True,
diff --git a/tests/e2e/test_provider_proxy.py b/tests/e2e/test_provider_proxy.py
index ad1ee224e..5cc4b8af8 100644
--- a/tests/e2e/test_provider_proxy.py
+++ b/tests/e2e/test_provider_proxy.py
@@ -42,7 +42,7 @@ class TestProviderProxy(SeleniumTestCase):
         """Start proxy container based on outpost created"""
         client: DockerClient = from_env()
         container = client.containers.run(
-            image=self.get_container_image("ghcr.io/goauthentik/dev-proxy"),
+            image=self.get_container_image("goauthentik.io/dev-proxy"),
             detach=True,
             network_mode="host",
             auto_remove=True,
diff --git a/tests/integration/test_outpost_docker.py b/tests/integration/test_outpost_docker.py
index e4c3bdca2..7fe505c53 100644
--- a/tests/integration/test_outpost_docker.py
+++ b/tests/integration/test_outpost_docker.py
@@ -108,5 +108,5 @@ class OutpostDockerTests(TestCase):
         self.assertEqual(compose["version"], "3.5")
         self.assertEqual(
             compose["services"]["authentik_proxy"]["image"],
-            f"ghcr.io/goauthentik/dev-proxy:{get_docker_tag()}",
+            f"goauthentik.io/dev-proxy:{get_docker_tag()}",
         )
diff --git a/tests/integration/test_proxy_docker.py b/tests/integration/test_proxy_docker.py
index 2c8bb17a2..88997627e 100644
--- a/tests/integration/test_proxy_docker.py
+++ b/tests/integration/test_proxy_docker.py
@@ -108,5 +108,5 @@ class TestProxyDocker(TestCase):
         self.assertEqual(compose["version"], "3.5")
         self.assertEqual(
             compose["services"]["authentik_proxy"]["image"],
-            f"ghcr.io/goauthentik/dev-proxy:{get_docker_tag()}",
+            f"goauthentik.io/dev-proxy:{get_docker_tag()}",
         )
diff --git a/website/docs/installation/configuration.md b/website/docs/installation/configuration.md
index 67546612c..d4581de4e 100644
--- a/website/docs/installation/configuration.md
+++ b/website/docs/installation/configuration.md
@@ -128,7 +128,7 @@ Optionally disable the update check. Defaults to `false`.
    - `%(version)s`: Current version; 2021.4.1
    - `%(build_hash)s`: Build hash if you're running a beta version
 
-  Placeholder for outpost docker images. Default: `ghcr.io/goauthentik/%(type)s:%(version)s`.
+  Placeholder for outpost docker images. Default: `goauthentik.io/%(type)s:%(version)s`.
 
 ### AUTHENTIK_AVATARS
 
diff --git a/website/docs/outposts/manual-deploy-docker-compose.md b/website/docs/outposts/manual-deploy-docker-compose.md
index 2e64c2674..f95d87d9d 100644
--- a/website/docs/outposts/manual-deploy-docker-compose.md
+++ b/website/docs/outposts/manual-deploy-docker-compose.md
@@ -13,7 +13,7 @@ version: "3.5"
 
 services:
   authentik_proxy:
-    image: ghcr.io/goauthentik/proxy:2021.9.8
+    image: goauthentik.io/proxy:2021.9.8
     # Optionally specify which networks the container should be
     # might be needed to reach the core authentik server
     # networks:
@@ -40,7 +40,7 @@ version: "3.5"
 
 services:
   authentik_ldap:
-    image: ghcr.io/goauthentik/ldap:2021.9.8
+    image: goauthentik.io/ldap:2021.9.8
     # Optionally specify which networks the container should be
     # might be needed to reach the core authentik server
     # networks:
diff --git a/website/docs/outposts/manual-deploy-kubernetes.md b/website/docs/outposts/manual-deploy-kubernetes.md
index 9ff6a9cab..4f1bc0719 100644
--- a/website/docs/outposts/manual-deploy-kubernetes.md
+++ b/website/docs/outposts/manual-deploy-kubernetes.md
@@ -88,7 +88,7 @@ spec:
               secretKeyRef:
                 key: authentik_host_insecure
                 name: authentik-outpost-api
-        image: ghcr.io/goauthentik/proxy:2021.9.8
+        image: goauthentik.io/proxy:2021.9.8
         name: proxy
         ports:
           - containerPort: 9000
diff --git a/website/docs/providers/proxy/forward_auth.mdx b/website/docs/providers/proxy/forward_auth.mdx
index 654a8390c..669e2aad9 100644
--- a/website/docs/providers/proxy/forward_auth.mdx
+++ b/website/docs/providers/proxy/forward_auth.mdx
@@ -211,7 +211,7 @@ services:
       - '--entrypoints.https.address=:443'
 
   authentik_proxy:
-    image: ghcr.io/goauthentik/proxy:2021.5.1
+    image: goauthentik.io/proxy:2021.5.1
     ports:
       - 9000:9000
       - 9443:9443
diff --git a/website/docs/releases/v2021.8.md b/website/docs/releases/v2021.8.md
index 273df0a73..0100f01be 100644
--- a/website/docs/releases/v2021.8.md
+++ b/website/docs/releases/v2021.8.md
@@ -151,6 +151,6 @@ Update your values to use the new images:
 
 ```yaml
 image:
-  repository: ghcr.io/goauthentik/server
+  repository: goauthentik.io/server
   tag: 2021.8.5
 ```
diff --git a/website/docs/releases/v2021.9.md b/website/docs/releases/v2021.9.md
index 25e6c168c..1b5965812 100644
--- a/website/docs/releases/v2021.9.md
+++ b/website/docs/releases/v2021.9.md
@@ -206,6 +206,6 @@ Update your values to use the new images:
 
 ```yaml
 image:
-  repository: ghcr.io/goauthentik/server
+  repository: goauthentik.io/server
   tag: 2021.9.1
 ```
diff --git a/website/netlify/functions/oci-proxy.js b/website/netlify/functions/oci-proxy.js
index 276a44a1c..de23bcf32 100644
--- a/website/netlify/functions/oci-proxy.js
+++ b/website/netlify/functions/oci-proxy.js
@@ -38,7 +38,7 @@ async function getToken(event) {
         headers: forwardHeaders,
     });
     const tokenResult = await tokenRes.text();
-    console.debug(`oci-proxy[token]: Status ${tokenRes.status} body '${tokenResult}'`)
+    console.debug(`oci-proxy[token]: Status ${tokenRes.status}`);
     return {
         statusCode: tokenRes.status,
         body: tokenResult,