diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 34a749b354..1a5c89754c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -136,7 +136,7 @@ jobs:
           git commit -m "Helm Chart Release ${{needs.read-version.outputs.major_minor}}"
           git push origin master
 
-  publish-mcp-server:
+  publish-mcp:
     runs-on: ubuntu-latest
     needs: [generate-build-number, read-version, publish-npm-packages]
     env:
@@ -248,7 +248,7 @@ jobs:
               exit $PUBLISH_EXIT
             fi
           else
-            echo "✅ Published @oneuptime/mcp-server@${{ steps.version.outputs.version }} to npm"
+            echo "✅ Published @oneuptime/mcp@${{ steps.version.outputs.version }} to npm"
           fi
 
       - name: Set up Docker Buildx
@@ -265,7 +265,7 @@ jobs:
       - name: Build and push Docker images
         run: |
           bash ./Scripts/GHA/build_docker_images.sh \
-            --image mcp-server \
+            --image mcp \
             --version "${{ steps.version.outputs.version }}" \
             --dockerfile ./MCP/Dockerfile.tpl \
             --context . \
@@ -275,7 +275,7 @@ jobs:
       - name: Upload MCP server artifact
         uses: actions/upload-artifact@v4
         with:
-          name: mcp-server-${{ steps.version.outputs.version }}
+          name: mcp-${{ steps.version.outputs.version }}
           path: ./MCP/
           retention-days: 90
 
@@ -1571,7 +1571,7 @@ jobs:
     needs:
       - read-version
       - generate-build-number
-      - publish-mcp-server
+      - publish-mcp
       - nginx-docker-image-deploy
       - e2e-docker-image-deploy
       - isolated-vm-docker-image-deploy
@@ -1600,7 +1600,7 @@ jobs:
       fail-fast: false
       matrix:
         image: [
-          "mcp-server",
+          "mcp",
           "nginx",
           "e2e",
           "isolated-vm",
@@ -1668,7 +1668,7 @@ jobs:
 
   test-e2e-release-saas: 
     runs-on: ubuntu-latest
-    needs: [telemetry-docker-image-deploy, publish-mcp-server, docs-docker-image-deploy, api-reference-docker-image-deploy, workflow-docker-image-deploy, accounts-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, dashboard-docker-image-deploy, probe-ingest-docker-image-deploy, server-monitor-ingest-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, worker-docker-image-deploy, otel-collector-docker-image-deploy, probe-docker-image-deploy, status-page-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, read-version, nginx-docker-image-deploy, incoming-request-ingest-docker-image-deploy]
+    needs: [telemetry-docker-image-deploy, publish-mcp, docs-docker-image-deploy, api-reference-docker-image-deploy, workflow-docker-image-deploy, accounts-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, dashboard-docker-image-deploy, probe-ingest-docker-image-deploy, server-monitor-ingest-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, worker-docker-image-deploy, otel-collector-docker-image-deploy, probe-docker-image-deploy, status-page-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, read-version, nginx-docker-image-deploy, incoming-request-ingest-docker-image-deploy]
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
@@ -1756,7 +1756,7 @@ jobs:
   test-e2e-release-self-hosted: 
     runs-on: ubuntu-latest
     # After all the jobs runs
-    needs: [telemetry-docker-image-deploy, publish-mcp-server, incoming-request-ingest-docker-image-deploy, docs-docker-image-deploy, api-reference-docker-image-deploy, workflow-docker-image-deploy, accounts-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, dashboard-docker-image-deploy, probe-ingest-docker-image-deploy, server-monitor-ingest-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, worker-docker-image-deploy, otel-collector-docker-image-deploy, probe-docker-image-deploy, status-page-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, read-version, nginx-docker-image-deploy]
+    needs: [telemetry-docker-image-deploy, publish-mcp, incoming-request-ingest-docker-image-deploy, docs-docker-image-deploy, api-reference-docker-image-deploy, workflow-docker-image-deploy, accounts-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, dashboard-docker-image-deploy, probe-ingest-docker-image-deploy, server-monitor-ingest-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, worker-docker-image-deploy, otel-collector-docker-image-deploy, probe-docker-image-deploy, status-page-docker-image-deploy, test-docker-image-deploy, test-server-docker-image-deploy, publish-npm-packages, e2e-docker-image-deploy, helm-chart-deploy, generate-build-number, read-version, nginx-docker-image-deploy]
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
diff --git a/.github/workflows/test-release.yaml b/.github/workflows/test-release.yaml
index a7ff2c0f4e..8ef347374e 100644
--- a/.github/workflows/test-release.yaml
+++ b/.github/workflows/test-release.yaml
@@ -86,7 +86,7 @@ jobs:
           echo "patch=${target_patch}" >> "$GITHUB_OUTPUT"
           echo "Using version base: ${new_version}"
 
-  publish-mcp-server:
+  publish-mcp:
     needs: [read-version, generate-build-number]
     runs-on: ubuntu-latest
     env:
@@ -176,7 +176,7 @@ jobs:
       - name: Build and push Docker images (test)
         run: |
           bash ./Scripts/GHA/build_docker_images.sh \
-            --image mcp-server \
+            --image mcp \
             --version "${{ steps.version.outputs.version }}" \
             --dockerfile ./MCP/Dockerfile.tpl \
             --context . \
@@ -189,7 +189,7 @@ jobs:
       - name: Upload MCP server artifact
         uses: actions/upload-artifact@v4
         with:
-          name: mcp-server-${{ steps.version.outputs.version }}
+          name: mcp-${{ steps.version.outputs.version }}
           path: ./MCP/
           retention-days: 90
 
@@ -1443,7 +1443,7 @@ jobs:
 
   test-helm-chart:
     runs-on: ubuntu-latest
-    needs: [infrastructure-agent-deploy, publish-mcp-server, publish-terraform-provider, telemetry-docker-image-deploy, docs-docker-image-deploy, worker-docker-image-deploy,  workflow-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, api-reference-docker-image-deploy,  test-server-docker-image-deploy, test-docker-image-deploy, probe-ingest-docker-image-deploy, server-monitor-ingest-docker-image-deploy, probe-docker-image-deploy, dashboard-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, accounts-docker-image-deploy, otel-collector-docker-image-deploy, status-page-docker-image-deploy, nginx-docker-image-deploy, e2e-docker-image-deploy, incoming-request-ingest-docker-image-deploy]
+    needs: [infrastructure-agent-deploy, publish-mcp, publish-terraform-provider, telemetry-docker-image-deploy, docs-docker-image-deploy, worker-docker-image-deploy,  workflow-docker-image-deploy, isolated-vm-docker-image-deploy, home-docker-image-deploy, api-reference-docker-image-deploy,  test-server-docker-image-deploy, test-docker-image-deploy, probe-ingest-docker-image-deploy, server-monitor-ingest-docker-image-deploy, probe-docker-image-deploy, dashboard-docker-image-deploy, admin-dashboard-docker-image-deploy, app-docker-image-deploy, accounts-docker-image-deploy, otel-collector-docker-image-deploy, status-page-docker-image-deploy, nginx-docker-image-deploy, e2e-docker-image-deploy, incoming-request-ingest-docker-image-deploy]
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
     steps:
diff --git a/Scripts/GHA/build_docker_images.sh b/Scripts/GHA/build_docker_images.sh
index 92ae6e28a8..75d618a03e 100644
--- a/Scripts/GHA/build_docker_images.sh
+++ b/Scripts/GHA/build_docker_images.sh
@@ -7,7 +7,7 @@ usage() {
 Usage: build_docker_images.sh --image <name> --version <version> --dockerfile <path> [options]
 
 Required flags:
-	--image <name>        Image name without registry prefix (example: mcp-server)
+	--image <name>        Image name without registry prefix (example: mcp)
 	--version <version>   Version/tag string appended to the generated tags
 	--dockerfile <path>   Path to the Dockerfile relative to the repo root