diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index d10116d..ba92f92 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -52,12 +52,13 @@ jobs:
         if: ${{ !contains(github.event.head_commit.message, '[skip build]') }}
         uses: docker/setup-buildx-action@v3
 
-      - name: Extract commit hash
+      - name: Extract commit hash and lowercase repo
         id: vars
         if: ${{ !contains(github.event.head_commit.message, '[skip build]') }}
         shell: bash
         run: |
           echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+          echo "ghcr_repo=${GITHUB_REPOSITORY,,}" >> $GITHUB_OUTPUT
 
       - name: Build, tag, and push image
         if: ${{ !contains(github.event.head_commit.message, '[skip build]') }}
@@ -65,14 +66,14 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           push: true
           provenance: false
           tags: |
             ${{ steps.login-ecr.outputs.registry }}/${{ vars.ECR_REPO_NAME }}:${{ steps.vars.outputs.sha_short }}
             ${{ steps.login-ecr.outputs.registry }}/${{ vars.ECR_REPO_NAME }}:latest
-            ghcr.io/${{ github.repository }}:${{ steps.vars.outputs.sha_short }}
-            ghcr.io/${{ github.repository }}:latest
+            ghcr.io/${{ steps.vars.outputs.ghcr_repo }}:${{ steps.vars.outputs.sha_short }}
+            ghcr.io/${{ steps.vars.outputs.ghcr_repo }}:latest
           cache-from: type=registry,ref=${{ steps.login-ecr.outputs.registry }}/${{ vars.ECR_REPO_NAME }}:cache
           cache-to: type=registry,ref=${{ steps.login-ecr.outputs.registry }}/${{ vars.ECR_REPO_NAME }}:cache,mode=max
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3c92b3b..bcb8454 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ Thank you for your interest in contributing to the KeeperHub MCP Server!
 
 1. Clone the repository:
 ```bash
-git clone https://github.com/techops-services/keeperhub-mcp.git
+git clone https://github.com/KeeperHub/keeperhub-mcp.git
 cd keeperhub-mcp
 ```
 
diff --git a/Dockerfile b/Dockerfile
index 13c78bf..4170aa4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,10 +21,10 @@ RUN pnpm run build
 # Runner stage
 FROM node:22-alpine
 
-LABEL org.opencontainers.image.source="https://github.com/techops-services/keeperhub-mcp"
+LABEL org.opencontainers.image.source="https://github.com/KeeperHub/keeperhub-mcp"
 LABEL org.opencontainers.image.description="MCP server for KeeperHub workflow automation"
 LABEL org.opencontainers.image.licenses="MIT"
-LABEL io.modelcontextprotocol.server.name="io.github.techops-services/keeperhub-mcp"
+LABEL io.modelcontextprotocol.server.name="io.github.KeeperHub/keeperhub-mcp"
 
 WORKDIR /app
 
diff --git a/README.md b/README.md
index 8ac900b..3e87ca3 100644
--- a/README.md
+++ b/README.md
@@ -487,5 +487,5 @@ MIT
 ## Support
 
 For issues or questions:
-- GitHub Issues: [techops-services/keeperhub-mcp](https://github.com/techops-services/keeperhub-mcp/issues)
+- GitHub Issues: [KeeperHub/keeperhub-mcp](https://github.com/KeeperHub/keeperhub-mcp/issues)
 - Documentation: [KeeperHub Docs](https://docs.keeperhub.com)
diff --git a/package.json b/package.json
index 7bbc3ba..0a5318a 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "keeperhub-mcp",
   "version": "1.0.0",
   "description": "Model Context Protocol server for KeeperHub workflow automation",
-  "mcpName": "io.github.techops-services/keeperhub-mcp",
+  "mcpName": "io.github.KeeperHub/keeperhub-mcp",
   "type": "module",
   "main": "dist/index.js",
   "scripts": {
diff --git a/server.json b/server.json
index e74d300..b77a6c0 100644
--- a/server.json
+++ b/server.json
@@ -1,9 +1,9 @@
 {
   "$schema": "https://static.modelcontextprotocol.io/schemas/2025-12-11/server.schema.json",
-  "name": "io.github.techops-services/keeperhub-mcp",
+  "name": "io.github.KeeperHub/keeperhub-mcp",
   "description": "MCP server for KeeperHub blockchain workflow automation",
   "repository": {
-    "url": "https://github.com/techops-services/keeperhub-mcp",
+    "url": "https://github.com/KeeperHub/keeperhub-mcp",
     "source": "github"
   },
   "version": "1.0.0",