diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 5f18e8d08..9341f9f58 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -60,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-hello@beryju.org.
+hello@goauthentik.io.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the
diff --git a/SECURITY.md b/SECURITY.md
index 103cb4742..3b50443b2 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -11,4 +11,4 @@
 
 ## Reporting a Vulnerability
 
-To report a vulnerability, send an email to [security@beryju.org](mailto:security@beryju.org)
+To report a vulnerability, send an email to [security@goauthentik.io](mailto:security@goauthentik.io)
diff --git a/authentik/root/settings.py b/authentik/root/settings.py
index 53d3c1c8a..9098ae917 100644
--- a/authentik/root/settings.py
+++ b/authentik/root/settings.py
@@ -147,7 +147,7 @@ SPECTACULAR_SETTINGS = {
         },
     ],
     "CONTACT": {
-        "email": "hello@beryju.org",
+        "email": "hello@goauthentik.io",
     },
     "AUTHENTICATION_WHITELIST": ["authentik.api.authentication.TokenAuthentication"],
     "LICENSE": {
diff --git a/authentik/sources/oauth/tests/test_type_azure_ad.py b/authentik/sources/oauth/tests/test_type_azure_ad.py
index a94f9fe03..da2562483 100644
--- a/authentik/sources/oauth/tests/test_type_azure_ad.py
+++ b/authentik/sources/oauth/tests/test_type_azure_ad.py
@@ -15,12 +15,12 @@ AAD_USER = {
     "displayName": "foo bar",
     "givenName": "foo",
     "jobTitle": None,
-    "mail": "foo@beryju.org",
+    "mail": "foo@goauthentik.io",
     "mobilePhone": None,
     "officeLocation": None,
     "preferredLanguage": None,
     "surname": "bar",
-    "userPrincipalName": "foo@beryju.org",
+    "userPrincipalName": "foo@goauthentik.io",
     "id": "018b0aff-8aff-473e-bf9c-b50e27f52208",
 }
 
diff --git a/pyproject.toml b/pyproject.toml
index 13dd0628d..dccde20f7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -94,7 +94,7 @@ addopts = "-p no:celery --junitxml=unittest.xml"
 name = "authentik"
 version = "2022.5.3"
 description = ""
-authors = ["Jens Langhammer <jens.langhammer@beryju.org>"]
+authors = ["authentik Team <hello@goauthentik.io>"]
 
 [tool.poetry.dependencies]
 celery = "*"
diff --git a/schema.yml b/schema.yml
index d485cce61..ca6beafa0 100644
--- a/schema.yml
+++ b/schema.yml
@@ -4,7 +4,7 @@ info:
   version: 2022.5.3
   description: Making authentication simple.
   contact:
-    email: hello@beryju.org
+    email: hello@goauthentik.io
   license:
     name: GNU GPLv3
     url: https://github.com/goauthentik/authentik/blob/master/LICENSE
diff --git a/web/security.txt b/web/security.txt
index 32a882543..5cb6fcb35 100644
--- a/web/security.txt
+++ b/web/security.txt
@@ -1,4 +1,4 @@
-Contact: mailto:security@beryju.org
+Contact: mailto:security@goauthentik.io
 Expires: Sat, 1 Jan 2023 00:00 +0200
 Preferred-Languages: en, de
 Policy: https://github.com/goauthentik/authentik/blob/master/SECURITY.md
diff --git a/web/src/api/Plex.ts b/web/src/api/Plex.ts
index fadab730d..35e1d0b3d 100644
--- a/web/src/api/Plex.ts
+++ b/web/src/api/Plex.ts
@@ -20,7 +20,7 @@ export const DEFAULT_HEADERS = {
     "Content-Type": "application/json",
     "X-Plex-Product": "authentik",
     "X-Plex-Version": VERSION,
-    "X-Plex-Device-Vendor": "BeryJu.org",
+    "X-Plex-Device-Vendor": "goauthentik.io",
 };
 
 export function popupCenterScreen(url: string, title: string, w: number, h: number): Window | null {
diff --git a/website/netlify/functions/oci-proxy.js b/website/netlify/functions/oci-proxy.js
index 74e990ec0..4ebf0e936 100644
--- a/website/netlify/functions/oci-proxy.js
+++ b/website/netlify/functions/oci-proxy.js
@@ -1,11 +1,7 @@
 const config = {
     namespace: "goauthentik/",
-    // Settings for GHCR
     registryTokenEndpoint: "https://ghcr.io/token",
     registryService: "ghcr.io",
-    // Settings for Harbor
-    // registryTokenEndpoint: "https://docker.beryju.org/service/token",
-    // registryService: "harbor-registry",
 };
 
 async function getToken(event) {