diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index c1c8da8..941b32a 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -24,7 +24,7 @@ on:
 
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: bakerboy448/redditmodlog
+  IMAGE_NAME: ${{ github.repository_owner }}/redditmodlog
 
 jobs:
   build:
@@ -67,7 +67,7 @@ jobs:
           labels: |
             org.opencontainers.image.title=Reddit ModLog Wiki Publisher
             org.opencontainers.image.description=Automated Reddit moderation log publisher to wiki pages
-            org.opencontainers.image.vendor=bakerboy448
+            org.opencontainers.image.vendor=baker-scripts
             org.opencontainers.image.licenses=GPL-3.0
 
       - name: Build and push Docker image
diff --git a/Dockerfile b/Dockerfile
index 08a99bd..a68ac40 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,11 +20,11 @@ FROM python:3.11-slim
 # OCI Labels
 LABEL org.opencontainers.image.title="Reddit ModLog Wiki Publisher" \
       org.opencontainers.image.description="Automated Reddit moderation log publisher to wiki pages" \
-      org.opencontainers.image.authors="bakerboy448" \
-      org.opencontainers.image.source="https://github.com/bakerboy448/RedditModLog" \
-      org.opencontainers.image.documentation="https://github.com/bakerboy448/RedditModLog/blob/main/README.md" \
+      org.opencontainers.image.authors="baker-scripts" \
+      org.opencontainers.image.source="https://github.com/baker-scripts/RedditModLog" \
+      org.opencontainers.image.documentation="https://github.com/baker-scripts/RedditModLog/blob/main/README.md" \
       org.opencontainers.image.licenses="GPL-3.0" \
-      org.opencontainers.image.vendor="bakerboy448" \
+      org.opencontainers.image.vendor="baker-scripts" \
       org.opencontainers.image.base.name="python:3.11-slim"
 
 # Install runtime dependencies and s6-overlay for user management
diff --git a/README.md b/README.md
index 05690d7..702d1c0 100644
--- a/README.md
+++ b/README.md
@@ -244,7 +244,7 @@ docker run -d \
   -e PUID=1000 \
   -e PGID=1000 \
   -v ./config:/config \
-  ghcr.io/bakerboy448/redditmodlog:1
+  ghcr.io/baker-scripts/redditmodlog:1
 
 # 4. Using Docker Compose (recommended)
 docker compose up -d
@@ -270,7 +270,7 @@ docker run -d \
   -e REDDIT_PASSWORD=your_password \
   -e SOURCE_SUBREDDIT=yoursubreddit \
   -v ./config:/config \
-  ghcr.io/bakerboy448/redditmodlog:1
+  ghcr.io/baker-scripts/redditmodlog:1
 ```
 
 ### Docker Compose Example
@@ -280,7 +280,7 @@ version: '3.8'
 
 services:
   redditmodlog-opensignups:
-    image: ghcr.io/bakerboy448/redditmodlog:1
+    image: ghcr.io/baker-scripts/redditmodlog:1
     container_name: redditmodlog-opensignups
     restart: unless-stopped
     environment:
@@ -321,13 +321,13 @@ services:
 Pre-built images available at GitHub Container Registry:
 
 **Recommended Tags:**
-- `ghcr.io/bakerboy448/redditmodlog:1` - Major version (gets v1.x.x updates automatically)
-- `ghcr.io/bakerboy448/redditmodlog:1.4` - Minor version (gets v1.4.x patches only)
-- `ghcr.io/bakerboy448/redditmodlog:1.4.3` - Specific version (pinned, no updates)
+- `ghcr.io/baker-scripts/redditmodlog:1` - Major version (gets v1.x.x updates automatically)
+- `ghcr.io/baker-scripts/redditmodlog:1.4` - Minor version (gets v1.4.x patches only)
+- `ghcr.io/baker-scripts/redditmodlog:1.4.3` - Specific version (pinned, no updates)
 
 **Other Tags:**
-- `ghcr.io/bakerboy448/redditmodlog:latest` - Always latest build (use with caution)
-- `ghcr.io/bakerboy448/redditmodlog:sha-<commit>` - Specific commit SHA
+- `ghcr.io/baker-scripts/redditmodlog:latest` - Always latest build (use with caution)
+- `ghcr.io/baker-scripts/redditmodlog:sha-<commit>` - Specific commit SHA
 
 **Architectures:** `linux/amd64`, `linux/arm64`
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 08b1065..f7706dc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   modlog-bot:
     build: .
-    image: ghcr.io/bakerboy448/redditmodlog:latest
+    image: ghcr.io/baker-scripts/redditmodlog:latest
     container_name: reddit-modlog-bot
     restart: unless-stopped
     environment: