diff --git a/.github/workflows/mcp-server-generation.yml b/.github/workflows/mcp-server-generation.yml
index 354cc39ad5..04451b0774 100644
--- a/.github/workflows/mcp-server-generation.yml
+++ b/.github/workflows/mcp-server-generation.yml
@@ -39,7 +39,7 @@ jobs:
 
       - name: Verify MCP server generation
         run: |
-          MCP_DIR="./MCP-Generated"
+          MCP_DIR="./MCP"
           
           # Check if MCP server directory was created
           if [ ! -d "$MCP_DIR" ]; then
@@ -76,7 +76,7 @@ jobs:
 
       - name: Test MCP server build
         run: |
-          MCP_DIR="./MCP-Generated"
+          MCP_DIR="./MCP"
           if [ -d "$MCP_DIR" ] && [ -f "$MCP_DIR/package.json" ]; then
             cd "$MCP_DIR"
             echo "🔨 Installing dependencies..."
@@ -95,6 +95,6 @@ jobs:
       - name: Upload MCP server as artifact
         uses: actions/upload-artifact@v4
         with:
-          name: MCP-Generated
-          path: ./MCP-Generated/
+          name: MCP
+          path: ./MCP/
           retention-days: 30
diff --git a/.github/workflows/publish-mcp-server.yml b/.github/workflows/publish-mcp-server.yml
index 0e81dc5fec..57158811b0 100644
--- a/.github/workflows/publish-mcp-server.yml
+++ b/.github/workflows/publish-mcp-server.yml
@@ -74,7 +74,7 @@ jobs:
 
       - name: Verify MCP server generation
         run: |
-          MCP_DIR="./MCP-Generated"
+          MCP_DIR="./MCP"
           
           if [ ! -d "$MCP_DIR" ]; then
             echo "❌ MCP server directory not created"
@@ -89,31 +89,31 @@ jobs:
 
       - name: Update package version
         run: |
-          cd MCP-Generated
+          cd MCP
           npm version ${{ steps.version.outputs.version }} --no-git-tag-version
 
       - name: Install dependencies and build
         run: |
-          cd MCP-Generated
+          cd MCP
           npm install
           npm run build
 
       - name: Run tests
         run: |
-          cd MCP-Generated
+          cd MCP
           npm test || echo "No tests found or tests failed, continuing..."
 
       - name: Publish to npm (dry run)
         if: ${{ github.event.inputs.dry_run == 'true' || github.event_name == 'push' }}
         run: |
-          cd MCP-Generated
+          cd MCP
           npm pack --dry-run
           echo "✅ Dry run completed successfully"
 
       - name: Publish to npm
         if: ${{ github.event.inputs.dry_run != 'true' && (github.event_name == 'release' || github.event_name == 'workflow_dispatch') }}
         run: |
-          cd MCP-Generated
+          cd MCP
           npm publish --access public
           echo "✅ Published @oneuptime/mcp-server@${{ steps.version.outputs.version }} to npm"
         env:
@@ -122,7 +122,7 @@ jobs:
       - name: Create Docker image
         if: ${{ github.event.inputs.dry_run != 'true' && (github.event_name == 'release' || github.event_name == 'workflow_dispatch') }}
         run: |
-          cd MCP-Generated
+          cd MCP
           docker build -t oneuptime/mcp-server:${{ steps.version.outputs.version }} .
           docker tag oneuptime/mcp-server:${{ steps.version.outputs.version }} oneuptime/mcp-server:latest
           echo "✅ Created Docker image"
diff --git a/.gitignore b/.gitignore
index aa93689a2e..6a55e9cadc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,4 +125,5 @@ TerraformTest/**
 
 terraform-provider-example/** 
 
+MCP/**
 MCP-Generated/**
\ No newline at end of file
diff --git a/Scripts/MCPProvider/GenerateMCPServer.ts b/Scripts/MCPProvider/GenerateMCPServer.ts
index 8658f520be..a3f2b06b5b 100644
--- a/Scripts/MCPProvider/GenerateMCPServer.ts
+++ b/Scripts/MCPProvider/GenerateMCPServer.ts
@@ -9,13 +9,13 @@ async function main(): Promise<void> {
   Logger.info("🚀 Starting MCP Server Generation Process...");
 
   // Define paths
-  const mcpDir: string = path.resolve(__dirname, "../../MCP-Generated");
+  const mcpDir: string = path.resolve(__dirname, "../../MCP");
   const openApiSpecPath: string = path.resolve(mcpDir, "openapi.json");
 
   try {
     // Step 1: Clean up existing MCP directory
     if (fs.existsSync(mcpDir)) {
-      Logger.info("🗑️ Removing existing MCP-Generated directory...");
+      Logger.info("🗑️ Removing existing MCP directory...");
       fs.rmSync(mcpDir, { recursive: true, force: true });
     }
 
@@ -52,7 +52,7 @@ async function main(): Promise<void> {
     Logger.info("✅ MCP server generation completed successfully!");
     Logger.info(`📁 MCP server generated at: ${mcpDir}`);
     Logger.info("🎯 Next steps:");
-    Logger.info("   1. cd MCP-Generated");
+    Logger.info("   1. cd MCP");
     Logger.info("   2. npm install");
     Logger.info("   3. Set up your environment variables");
     Logger.info("   4. npm run build");
diff --git a/Scripts/MCPProvider/publish-mcp-server.sh b/Scripts/MCPProvider/publish-mcp-server.sh
index cae0e4d436..847ca2a42a 100755
--- a/Scripts/MCPProvider/publish-mcp-server.sh
+++ b/Scripts/MCPProvider/publish-mcp-server.sh
@@ -154,7 +154,7 @@ print_status "Step 4: Generating MCP server..."
 npm run generate-mcp-server
 
 # Check if MCP server was generated
-MCP_DIR="./MCP-Generated"
+MCP_DIR="./MCP"
 if [ ! -d "$MCP_DIR" ]; then
     print_error "MCP server generation failed - directory not created"
     exit 1