diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index 82090a4..6fb20dc 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -23,18 +23,18 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Sign in to GitHub Container Registry
+      - name: Sign in to Gitea Container Registry
         uses: docker/login-action@v3
         with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: git.us2plus2.com
+          username: ${{ secrets.GITEA_REGISTRY_USERNAME }}
+          password: ${{ secrets.GITEA_REGISTRY_TOKEN }}
 
       - name: Generate image tags
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/${{ github.repository }}
+          images: git.us2plus2.com/marvin/site-gateway
           tags: |
             type=raw,value=latest,enable={{is_default_branch}}
             type=semver,pattern={{version}}
diff --git a/README.md b/README.md
index 07ec69a..aa736c6 100644
--- a/README.md
+++ b/README.md
@@ -103,7 +103,7 @@ At startup, the container creates the complete `/data` hierarchy, applies `PUID`
 
 ## Unraid
 
-1. Add the container from **Docker → Add Container** using the image `ghcr.io/mfwadejr/site-gateway2:latest`, or search Community Applications once a template is published.
+1. Add the container from **Docker → Add Container** using the image `git.us2plus2.com/marvin/site-gateway:latest`, or search Community Applications once a template is published.
 2. Map ports `80`, `443` (TCP+UDP), `8080`, and `9000-9099` as above, plus any Streaming Host ports you plan to use.
 3. Map one path, e.g. `/mnt/user/appdata/site-gateway:/data`.
 4. Set `PUID=99` and `PGID=100` so the container writes to `/data` as the `nobody`/`users` account Unraid expects.
diff --git a/compose.release.yaml b/compose.release.yaml
index 1dc1edd..1036e7f 100644
--- a/compose.release.yaml
+++ b/compose.release.yaml
@@ -5,7 +5,7 @@
 #   docker compose -f compose.release.yaml up -d
 services:
   site-gateway:
-    image: ${SITE_GATEWAY_IMAGE:-ghcr.io/mfwadejr/site-gateway2:latest}
+    image: ${SITE_GATEWAY_IMAGE:-git.us2plus2.com/marvin/site-gateway:latest}
     container_name: site-gateway
     restart: unless-stopped
     environment:
diff --git a/compose.zimaos.yaml b/compose.zimaos.yaml
index 3840c94..f3a3278 100644
--- a/compose.zimaos.yaml
+++ b/compose.zimaos.yaml
@@ -13,7 +13,7 @@ name: site-gateway
 
 services:
   site-gateway:
-    image: ghcr.io/mfwadejr/site-gateway2:latest
+    image: git.us2plus2.com/marvin/site-gateway:latest
     container_name: site-gateway
     restart: unless-stopped
     environment:
@@ -77,7 +77,7 @@ x-casaos:
   index: /
   port_map: "8080"
   scheme: http
-  icon: https://raw.githubusercontent.com/mfwadejr/site-gateway2/main/src/public/site-gateway-icon-approved.png
+  icon: https://git.us2plus2.com/marvin/site-gateway/raw/branch/main/src/public/site-gateway-icon-approved.png
   title:
     en_US: Site Gateway
   tagline:
@@ -93,6 +93,6 @@ x-casaos:
   architectures: ["amd64", "arm64"]
   version: "0.16.58"
   update_at: "2026-09-20"
-  website: https://github.com/mfwadejr/site-gateway2
-  repo: https://github.com/mfwadejr/site-gateway2
-  support: https://github.com/mfwadejr/site-gateway2/issues
+  website: https://git.us2plus2.com/marvin/site-gateway
+  repo: https://git.us2plus2.com/marvin/site-gateway
+  support: https://git.us2plus2.com/marvin/site-gateway/issues