diff --git a/servers/couchbase/server.yaml b/servers/couchbase/server.yaml
index 9b71aa9..4d38bbe 100644
--- a/servers/couchbase/server.yaml
+++ b/servers/couchbase/server.yaml
@@ -16,34 +16,35 @@ config:
   description: Configure the connection to Couchbase
   secrets:
     - name: couchbase.cb_password
+      description: Password for the Couchbase cluster with access to the bucket.
       env: CB_PASSWORD
       example: <CB_PASSWORD>
   env:
     - name: CB_CONNECTION_STRING
       example: couchbases://cb.example.com
-      value: '{{couchbase.cb_connection_string}}'
+      value: "{{couchbase.cb_connection_string}}"
     - name: CB_USERNAME
       example: Administrator
-      value: '{{couchbase.cb_username}}'
+      value: "{{couchbase.cb_username}}"
     - name: CB_BUCKET_NAME
       example: my-bucket
-      value: '{{couchbase.cb_bucket_name}}'
-    - name: MCP_TRANSPORT
-      example: stdio
-      value: '{{couchbase.mcp_transport}}'
-    - name: READ_ONLY_QUERY_MODE
+      value: "{{couchbase.cb_bucket_name}}"
+
+    - name: CB_MCP_READ_ONLY_QUERY_MODE
       example: "true"
-      value: '{{couchbase.read_only_query_mode}}'
+      value: "{{couchbase.cb_mcp_read_only_query_mode}}"
   parameters:
     type: object
     properties:
       cb_connection_string:
+        description: Connection string for the Couchbase cluster.
         type: string
       cb_username:
+        description: Username for the Couchbase cluster with access to the bucket.
         type: string
       cb_bucket_name:
+        description: Bucket in the Couchbase cluster to use for the MCP server.
         type: string
-      mcp_transport:
-        type: string
-      read_only_query_mode:
+      cb_mcp_read_only_query_mode:
+        description: Setting to "true" (default) enables read-only query mode while running SQL++ queries.
         type: string