diff --git a/lib/tasks/swagger.rake b/lib/tasks/swagger.rake
index 6bf5f5742..2e5650d42 100644
--- a/lib/tasks/swagger.rake
+++ b/lib/tasks/swagger.rake
@@ -22,6 +22,10 @@ module SwaggerTaskActions
         resolve_file_ref: true, # Uses CWD (swagger_dir) for resolving file refs
         logging: true
       )
+      
+      # Add x-mcp property to the final build
+      final_build['x-mcp'] = { 'enabled' => true }
+      
       File.write(swagger_json_relative_path, JSON.pretty_generate(final_build))
 
       # For user messages, provide the absolute path
@@ -86,6 +90,9 @@ module SwaggerTaskActions
       tag_spec['paths'] = _filter_paths_for_tag_group(tag_spec['paths'], tags_in_current_group)
       tag_spec['tags'] = _filter_tags_for_tag_group(tag_spec['tags'], tags_in_current_group)
 
+      # Add x-mcp property to the tag spec
+      tag_spec['x-mcp'] = { 'enabled' => true }
+
       output_filename = _determine_output_filename(group_name)
       File.write(output_dir.join(output_filename), JSON.pretty_generate(tag_spec))
     end
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 943b7a3e8..78411fb71 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -11851,5 +11851,8 @@
         "CSAT Survey Page"
       ]
     }
-  ]
+  ],
+  "x-mcp": {
+    "enabled": true
+  }
 }
\ No newline at end of file
diff --git a/swagger/tag_groups/application_swagger.json b/swagger/tag_groups/application_swagger.json
index 33e75183f..b48105753 100644
--- a/swagger/tag_groups/application_swagger.json
+++ b/swagger/tag_groups/application_swagger.json
@@ -10180,5 +10180,8 @@
         "CSAT Survey Page"
       ]
     }
-  ]
+  ],
+  "x-mcp": {
+    "enabled": true
+  }
 }
\ No newline at end of file
diff --git a/swagger/tag_groups/client_swagger.json b/swagger/tag_groups/client_swagger.json
index 6d471da43..ee76dbaa7 100644
--- a/swagger/tag_groups/client_swagger.json
+++ b/swagger/tag_groups/client_swagger.json
@@ -4959,5 +4959,8 @@
         "CSAT Survey Page"
       ]
     }
-  ]
+  ],
+  "x-mcp": {
+    "enabled": true
+  }
 }
\ No newline at end of file
diff --git a/swagger/tag_groups/other_swagger.json b/swagger/tag_groups/other_swagger.json
index fc61e8721..057a327a2 100644
--- a/swagger/tag_groups/other_swagger.json
+++ b/swagger/tag_groups/other_swagger.json
@@ -4366,5 +4366,8 @@
         "CSAT Survey Page"
       ]
     }
-  ]
+  ],
+  "x-mcp": {
+    "enabled": true
+  }
 }
\ No newline at end of file
diff --git a/swagger/tag_groups/platform_swagger.json b/swagger/tag_groups/platform_swagger.json
index 18ec796a0..e87440cc4 100644
--- a/swagger/tag_groups/platform_swagger.json
+++ b/swagger/tag_groups/platform_swagger.json
@@ -5139,5 +5139,8 @@
         "CSAT Survey Page"
       ]
     }
-  ]
+  ],
+  "x-mcp": {
+    "enabled": true
+  }
 }
\ No newline at end of file