diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index 47670d8605..4bf3ee37fe 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -26,12 +26,17 @@ jobs:
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         with:
-          image-name: ghcr.io/goauthentik/server,beryju/authentik
-      - name: Docker Login Registry
+          image-name: ghcr.io/goauthentik/server,beryju/authentik,authentik/server
+      - name: Login to Docker Registry (legacy)
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Login to Docker Registry (org)
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_CORP_USERNAME }}
+          password: ${{ secrets.DOCKER_CORP_PASSWORD }}
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
@@ -92,16 +97,21 @@ jobs:
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         with:
-          image-name: ghcr.io/goauthentik/${{ matrix.type }},beryju/authentik-${{ matrix.type }}
+          image-name: ghcr.io/goauthentik/${{ matrix.type }},beryju/authentik-${{ matrix.type }},authentik/${{ matrix.type }}
       - name: make empty clients
         run: |
           mkdir -p ./gen-ts-api
           mkdir -p ./gen-go-api
-      - name: Docker Login Registry
+      - name: Login to Docker Registry (legacy)
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Login to Docker Registry (org)
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_CORP_USERNAME }}
+          password: ${{ secrets.DOCKER_CORP_PASSWORD }}
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
diff --git a/website/docs/install-config/air-gapped.mdx b/website/docs/install-config/air-gapped.mdx
index dd5a55475c..a79c6bd4a9 100644
--- a/website/docs/install-config/air-gapped.mdx
+++ b/website/docs/install-config/air-gapped.mdx
@@ -65,4 +65,4 @@ In addition to the configuration options above, the following [System settings](
 Container images can be pulled from the following URLs:
 
 - ghcr.io/goauthentik/server (https://ghcr.io)
-- beryju/authentik (https://index.docker.io)
+- authentik/server (https://index.docker.io)