@@ -7,7 +7,7 @@ The Airtable auth provider enables tools and agents to call [Airtable APIs](http
 <Callout>
   Want to quickly get started with Airtable in your agent or AI app? The
   pre-built [Arcade Airtable MCP
-  Server](/resources/integrations/productivity/airtableapi) is what you want!
+  Server](/resources/integrations/productivity/airtable) is what you want!
 </Callout>
 
 ### What's documented here
@@ -16,10 +16,16 @@ This page describes how to use and configure Airtable auth with Arcade.
 
 This auth provider is used by:
 
-- The [Arcade Airtable MCP Server](/resources/integrations/productivity/airtableapi), which provides pre-built tools for interacting with Airtable
+- The [Arcade Airtable MCP Server](/resources/integrations/productivity/airtable), which provides pre-built tools for interacting with Airtable
 - Your [app code](#using-airtable-auth-in-app-code) that needs to call the Airtable API
 - Or, your [custom tools](#using-airtable-auth-in-custom-tools) that need to call the Airtable API
 
+## Use Arcade's default Airtable auth provider
+
+Arcade offers a default Airtable auth provider that you can use in the Arcade Cloud Platform. In this case, your users will see `Arcade` as the name of the app requesting permission.
+
+If you choose to use Arcade's Airtable auth, you don't need to configure anything. Follow the [Airtable MCP Server examples](/resources/integrations/productivity/airtable) to get started calling Airtable tools.
+
 ## Configuring Airtable auth
 
 <Callout type="info">
@@ -58,6 +64,7 @@ Navigate to the [Airtable Developer Hub](https://airtable.com/developers/web) an
    - `data.records:read` - Read records from tables
    - `data.records:write` - Create, update, and delete records
    - `schema.bases:read` - Read base schema
+   - `user.email:read` - Read the user's email address
    - Add other scopes as needed for your use case
 
 #### Obtain your credentials
@@ -87,19 +94,17 @@ To access the Arcade Cloud dashboard, go to [api.arcade.dev/dashboard](https://a
 
 #### Navigate to the OAuth Providers page
 
-- Under the **OAuth** section of the Arcade Dashboard left-side menu, click **Providers**.
+- Under the **Connections** section of the Arcade Dashboard left-side menu, click **Connected apps**.
 - Click **Add OAuth Provider** in the top right corner.
-- Select the **OAuth 2.0** tab at the top.
+- Select the **Included Providers** tab at the top.
+- In the **Provider** dropdown, select **Airtable**.
 
 #### Enter the provider details
 
-- Choose a unique **ID** for your provider (e.g. "arcade-airtable").
-- Optionally enter a **Description**.
+- Choose a unique **ID** for your provider (e.g. "my-airtable-provider").
 - Enter the **Client ID** and **Client Secret** from your Airtable integration.
-- Configure the OAuth 2.0 endpoints:
-  - **Authorization URL**: `https://airtable.com/oauth2/v1/authorize`
-  - **Token URL**: `https://airtable.com/oauth2/v1/token`
-- Note the **Redirect URL** generated by Arcade. This must be set as your Airtable integration's Redirect URL.
+- Note the **Redirect URI** generated by Arcade. This must be set as your Airtable integration's Redirect URL.
+- Optionally enter a **Description**.
 
 #### Create the provider
 
@@ -143,34 +148,17 @@ Edit the `engine.yaml` file and add a new item to the `auth.providers` section:
 ```yaml
 auth:
   providers:
-    - id: arcade-airtable
+    - id: my-airtable-provider
       description: Airtable OAuth 2.0 provider
       enabled: true
       type: oauth2
+      provider_id: airtable
       client_id: ${env:AIRTABLE_CLIENT_ID}
       client_secret: ${env:AIRTABLE_CLIENT_SECRET}
-      oauth2:
-        scope_delimiter: " "
-        pkce:
-          enabled: true
-          code_challenge_method: S256
-        authorize_request:
-          endpoint: "https://airtable.com/oauth2/v1/authorize"
-          params:
-            response_type: code
-            client_id: "{{client_id}}"
-            redirect_uri: "{{redirect_uri}}"
-            scope: "{{scopes}}"
-            state: "{{state}}"
-        token_request:
-          endpoint: "https://airtable.com/oauth2/v1/token"
-          params:
-            grant_type: authorization_code
-            client_id: "{{client_id}}"
-            redirect_uri: "{{redirect_uri}}"
-          response_content_type: application/json
 ```
 
+Setting `provider_id: airtable` applies the Arcade Engine's built-in Airtable configuration (endpoints, PKCE, and token request settings), so you don't need to specify them.
+
 </Steps>
 
 </Tabs.Tab>
@@ -197,7 +185,7 @@ user_id = "{arcade_user_id}"
 # Start the authorization process
 auth_response = client.auth.start(
     user_id=user_id,
-    provider="arcade-airtable",
+    provider="airtable",
     scopes=["data.records:read", "data.records:write", "schema.bases:read"]
 )
 
@@ -216,19 +204,17 @@ token = auth_response.context.token
 
 <Tabs.Tab>
 
-```javascript {8-11}
+```javascript {8-10}
 import { Arcade } from "@arcadeai/arcadejs";
 
 const client = new Arcade();
 
 const userId = "{arcade_user_id}";
 
 // Start the authorization process
-const authResponse = await client.auth.start(userId, "arcade-airtable", [
-  "data.records:read",
-  "data.records:write",
-  "schema.bases:read",
-]);
+let authResponse = await client.auth.start(userId, "airtable", {
+  scopes: ["data.records:read", "data.records:write", "schema.bases:read"],
+});
 
 if (authResponse.status !== "completed") {
   console.log("Please complete the authorization challenge in your browser:");
@@ -248,35 +234,34 @@ const token = authResponse.context.token;
 
 ## Using Airtable auth in custom tools
 
-You can use the pre-built [Arcade Airtable MCP Server](/resources/integrations/productivity/airtableapi) to quickly build agents and AI apps that interact with Airtable.
+You can use the pre-built [Arcade Airtable MCP Server](/resources/integrations/productivity/airtable) to quickly build agents and AI apps that interact with Airtable.
 
 If the pre-built tools in the Airtable MCP Server don't meet your needs, you can author your own [custom tools](/build/create-tools/tool-basics/build-mcp-server) that interact with the Airtable API.
 
-Use the `OAuth2()` auth class to specify that a tool requires authorization with Airtable. The `context.authorization.token` field will be automatically populated with the user's Airtable token:
+Use the `Airtable()` auth class to specify that a tool requires authorization with Airtable. The `context.authorization.token` field will be automatically populated with the user's Airtable token:
 
-```python {8-12,22}
+```python {8-12,21}
 from typing import Annotated
 
 import httpx
-from arcade_tdk import ToolContext, tool
-from arcade_tdk.auth import OAuth2
+from arcade_mcp_server import Context, tool
+from arcade_mcp_server.auth import Airtable
 
 
 @tool(
-    requires_auth=OAuth2(
-        provider_id="arcade-airtable",
-        scopes=["data.records:read", "schema.bases:read"]
+    requires_auth=Airtable(
+        scopes=["schema.bases:read"]
     )
 )
 async def list_bases(
-    context: ToolContext,
+    context: Context,
 ) -> Annotated[dict, "The user's bases."]:
     """
     Retrieve the list of bases accessible to the authenticated user.
     """
     url = "https://api.airtable.com/v0/meta/bases"
     headers = {
-        "Authorization": context.authorization.token,
+        "Authorization": f"Bearer {context.authorization.token}",
     }
 
     async with httpx.AsyncClient() as client:
 
@@ -81,7 +81,7 @@ To access the Arcade Cloud dashboard, go to [api.arcade.dev/dashboard](https://a
 
 #### Navigate to the OAuth Providers page
 
-- Under the **Connections** section of the Arcade Dashboard left-side menu, click **Connected Apps**.
+- Under the **Connections** section of the Arcade Dashboard left-side menu, click **Connected apps**.
 - Click **Add OAuth Provider** in the top right corner.
 - Select the **Included Providers** tab at the top.
 - In the **Provider** dropdown, select **Asana**.
@@ -91,7 +91,7 @@ To access the Arcade Cloud dashboard, go to [api.arcade.dev/dashboard](https://a
 - Choose a unique **ID** for your provider (e.g. "my-asana-provider").
 - Optionally enter a **Description**.
 - Enter the **Client ID** and **Client Secret** from your Asana app.
-- Note the **Redirect URL** generated by Arcade. This must be added to your Asana app's Redirect URLs.
+- Note the **Redirect URI** generated by Arcade. This must be added to your Asana app's Redirect URLs.
 
 #### Create the provider
 
@@ -204,13 +204,13 @@ from typing import Annotated
 
 import httpx
 
-from arcade_tdk import ToolContext, tool
-from arcade_tdk.auth import Asana
+from arcade_mcp_server import Context, tool
+from arcade_mcp_server.auth import Asana
 
 
 @tool(requires_auth=Asana(scopes=["default"]))
 async def delete_task(
-    context: ToolContext,
+    context: Context,
     task_id: Annotated[str, "The ID of the task to delete."],
 ) -> Annotated[dict, "Details of the deletion response"]:
     """Deletes a task."""
 
@@ -2,12 +2,6 @@ import { Tabs, Callout, Steps } from "nextra/components";
 
 # Atlassian
 
-<Callout type="info">
-  At this time, Arcade does not offer a default Atlassian Auth Provider. To use
-  Atlassian auth, you must create a custom Auth Provider with your own Atlassian
-  OAuth 2.0 credentials as described below.
-</Callout>
-
 The Atlassian auth provider enables tools and agents to call the Atlassian API on behalf of a user.
 
 ### What's documented here
@@ -16,9 +10,16 @@ This page describes how to use and configure Atlassian auth with Arcade.
 
 This auth provider is used by:
 
+- The [Arcade Jira MCP Server](/resources/integrations/productivity/jira) and [Arcade Confluence MCP Server](/resources/integrations/productivity/confluence), which provide pre-built tools for interacting with Jira and Confluence
 - Your [app code](#using-atlassian-auth-in-app-code) that needs to call Atlassian APIs
 - Or, your [custom tools](#using-atlassian-auth-in-custom-tools) that need to call Atlassian APIs
 
+## Use Arcade's default Atlassian auth provider
+
+Arcade offers a default Atlassian auth provider that you can use in the Arcade Cloud Platform. In this case, your users will see `Arcade` as the name of the app requesting permission.
+
+If you choose to use Arcade's Atlassian auth, you don't need to configure anything. Follow the [Jira](/resources/integrations/productivity/jira) or [Confluence](/resources/integrations/productivity/confluence) MCP Server examples to get started calling Atlassian tools.
+
 ## Configuring Atlassian auth
 
 <Callout type="info">
@@ -57,7 +58,7 @@ To access the Arcade Cloud dashboard, go to [api.arcade.dev/dashboard](https://a
 
 #### Navigate to the OAuth Providers page
 
-- Under the **Connections** section of the Arcade Dashboard left-side menu, click **Connected Apps**.
+- Under the **Connections** section of the Arcade Dashboard left-side menu, click **Connected apps**.
 - Click **Add OAuth Provider** in the top right corner.
 - Select the **Included Providers** tab at the top.
 - In the **Provider** dropdown, select **Atlassian**.
@@ -67,17 +68,19 @@ To access the Arcade Cloud dashboard, go to [api.arcade.dev/dashboard](https://a
 - Choose a unique **ID** for your provider (e.g. "my-atlassian-provider").
 - Optionally enter a **Description**.
 - Enter the **Client ID** and **Client Secret** from your Atlassian app.
-- Note the **Redirect URL** generated by Arcade. This must be added to your Atlassian app as a Callback URL.
+- Note the **Redirect URI** generated by Arcade. This must be added to your Atlassian app as a Callback URL.
 
 #### Create the provider
 
 Hit the **Create** button and the provider will be ready to be used.
 
 </Steps>
+
 When you use tools that require Atlassian auth using your Arcade account credentials, Arcade will automatically use this Atlassian OAuth provider. If you have multiple Atlassian providers, see [using multiple auth providers of the same type](/references/auth-providers#using-multiple-providers-of-the-same-type) for more information.
 
 </Tabs.Tab>
 </Tabs>
+
 ## Using Atlassian auth in app code
 
 Use the Atlassian auth provider in your own agents and AI apps to get a user token for the Atlassian API. See [authorizing agents with Arcade](/get-started/about-arcade) to understand how this works.
@@ -155,8 +158,8 @@ from typing import Annotated, Optional
 
 import httpx
 
-from arcade_tdk import ToolContext, tool
-from arcade_tdk.auth import Atlassian
+from arcade_mcp_server import Context, tool
+from arcade_mcp_server.auth import Atlassian
 
 
 @tool(
@@ -165,7 +168,7 @@ from arcade_tdk.auth import Atlassian
     )
 )
 async def list_projects(
-    context: ToolContext,
+    context: Context,
     query: Annotated[
         Optional[str],
         "The query to filter the projects by. Defaults to empty string to list all projects.",
 
@@ -85,7 +85,7 @@ To access the Arcade Cloud dashboard, go to [api.arcade.dev/dashboard](https://a
 
 #### Navigate to the OAuth Providers page
 
-- Under the **Connections** section of the Arcade Dashboard left-side menu, click **Connected Apps**.
+- Under the **Connections** section of the Arcade Dashboard left-side menu, click **Connected apps**.
 - Click **Add OAuth Provider** in the top right corner.
 - Select the **Included Providers** tab at the top.
 - In the **Provider** dropdown, select **Attio**.
@@ -95,7 +95,7 @@ To access the Arcade Cloud dashboard, go to [api.arcade.dev/dashboard](https://a
 - Enter `attio` as the **ID** for your provider.
 - Optionally enter a **Description**.
 - Enter the **Client ID** and **Client Secret** from your Attio app.
-- Note the **Redirect URL** generated by Arcade. This must be added to your Attio app's redirect URIs.
+- Note the **Redirect URI** generated by Arcade. This must be added to your Attio app's redirect URIs.
 
 #### Create the provider
 
@@ -193,8 +193,8 @@ from typing import Annotated
 
 import httpx
 
-from arcade_tdk import ToolContext, tool
-from arcade_tdk.auth import Attio
+from arcade_mcp_server import Context, tool
+from arcade_mcp_server.auth import Attio
 
 
 @tool(
@@ -203,7 +203,7 @@ from arcade_tdk.auth import Attio
     )
 )
 async def query_attio_companies(
-    context: ToolContext,
+    context: Context,
     limit: Annotated[
         int,
         "Maximum number of company records to return.",