diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index f4e6282a..f8b1c720 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -152,6 +152,7 @@ jobs:
           GATSBY_FEDS_PRIVACY_ID: ${{ secrets.AIO_FEDS_PRIVACY_ID }}
           GATSBY_SITE_DOMAIN_URL: https://developer-stage.adobe.com
           GATSBY_REDOCLY_KEY: ${{ secrets.REDOCLY_LICENSE_KEY }}
+          GATSBY_TEMPLATE_ID: 667b0b6a6547797329d24f0d
       - name: Deploy
         uses: AdobeDocs/static-website-deploy@master
         with:
@@ -259,6 +260,7 @@ jobs:
           GATSBY_FEDS_PRIVACY_ID: ${{ secrets.AIO_FEDS_PRIVACY_ID }}
           GATSBY_SITE_DOMAIN_URL: https://developer.adobe.com
           GATSBY_REDOCLY_KEY: ${{ secrets.REDOCLY_LICENSE_KEY }}
+          GATSBY_TEMPLATE_ID: 671938c0a355389273dc7a8f
       - name: Deploy
         uses: AdobeDocs/static-website-deploy@master
         with:
diff --git a/gatsby-config.js b/gatsby-config.js
index bc44580e..b58f2741 100644
--- a/gatsby-config.js
+++ b/gatsby-config.js
@@ -12,6 +12,8 @@
 
 module.exports = {
   siteMetadata: {
+    template_id: process.env.GATSBY_TEMPLATE_ID,
+
     // versions: [
     //   {
     //     title: 'v2.0',
diff --git a/gatsby-node.js b/gatsby-node.js
new file mode 100644
index 00000000..3aead724
--- /dev/null
+++ b/gatsby-node.js
@@ -0,0 +1,8 @@
+exports.createSchemaCustomization = ({ actions }) => {
+    const { createTypes } = actions
+    createTypes(`
+        type SiteSiteMetadata {
+          template_id: String
+        }
+      `)
+  }
\ No newline at end of file
diff --git a/src/pages/credentials/GetCredentialOAuth2.js b/src/pages/credentials/GetCredentialOAuth2.js
index b8dceb7b..5d3f3f6f 100644
--- a/src/pages/credentials/GetCredentialOAuth2.js
+++ b/src/pages/credentials/GetCredentialOAuth2.js
@@ -1,17 +1,33 @@
 import React from 'react'
 import { GetCredential } from '@adobe/gatsby-theme-aio/src/components/GetCredential';
+import { graphql, useStaticQuery } from 'gatsby';
 import platform from "./images/platform.png";
 
 const GetCredentialOAuthS2s = () => {
+
+    const data = useStaticQuery(
+        graphql`
+        query { 
+          site {
+            siteMetadata{
+              template_id
+            }
+          }
+        }
+      `
+      )
+    
+      const { template_id } = data?.site?.siteMetadata;
+    
   return (
 
-    <GetCredential className="getCredentialContainer" templateId="667b0b6a6547797329d24f0d" productName='Adobe Experience Platform' >
+    <GetCredential className="getCredentialContainer" templateId={template_id} productName='Adobe Experience Platform' >
 
-      <GetCredential.SignIn title="Get credentials" paragraph="Create unique credentials that you will use to call multiple APIs from your application." buttonText="Sign in to create credentials" />
+      <GetCredential.SignIn title="Get credentials" paragraph="After signing in, you can create credentials that can be used to call the Platform APIs." buttonText="Sign in" />
 
-      <GetCredential.Form title="Get credentials" paragraph="Create unique credentials that you will use to call multiple APIs from your application." className="formClass">
+      <GetCredential.Form title="Get credentials" paragraph="Create credentials that you can use to call the Platform APIs." className="formClass">
 
-        <GetCredential.Form.CredentialName label="Credential name" description="Credential name must be unique and between 6 and 45 characters long. A project will be automatically created with the same name in Adobe Developer Console." range="45" />
+        <GetCredential.Form.CredentialName label="Credential name" description="The credential name must be unique, use alphanumeric characters, and between 6 and 45 characters long. A project will be automatically created with the same name in Adobe Developer Console." range="45" />
 
         <GetCredential.Form.Products label="Included products and services">
           <GetCredential.Form.Product label="Adobe Experience Platform" icon={platform} />
@@ -26,9 +42,7 @@ const GetCredentialOAuthS2s = () => {
                 OAuth server-to-server credential
               </h3>
               <p className="spectrum-Body spectrum-Body--sizeM">
-                This credential allows you to use industry standard OAuth2.0
-                libraries to generate access tokens using the OAuth 2.0 client
-                credentials grant type.
+                This credential allows you to use industry standard OAuth2.0 libraries to generate access tokens using the OAuth 2.0 client credentials grant type.
               </p>
             </div>
             <div style={{ display: "flex", gap: "16px", flexDirection: "column" }}>
@@ -52,7 +66,7 @@ const GetCredentialOAuthS2s = () => {
 
       <GetCredential.UnknownError helpLink="https://some_help_link" helpLinkText="Get Help" className="unKnownError" />
 
-      <GetCredential.Card title="Your credential is ready to use" developerConsoleManage="Manage on Developer Console" className="card_developer_console" devConsoleDirection="/console">
+      <GetCredential.Card title="Your credential is ready to use" developerConsoleManage="Manage on Developer Console" className="card_developer_console" devConsoleDirection="/console" isCollapsable="true">
 
         <GetCredential.Card.Side>
           <div style={{ display: "flex", gap: "32px", flexDirection: "column" }}>
@@ -91,17 +105,18 @@ const GetCredentialOAuthS2s = () => {
 
         <GetCredential.Card.DevConsoleLink heading="Developer Console Project" />
 
-        <GetCredential.Card.AccessToken helpText="" buttonLabel="Generate and copy token" heading="Access Token" />
+        <GetCredential.Card.AccessToken helpText="" buttonLabel="Generate and copy token" heading={(<>Access token<br/><br/> <span style="font-weight:normal"><small>After copying the access token, you must prepend the token with <code>Bearer</code> to use it with API calls.</small></span></>)} />
+
 
-        <GetCredential.Card.CredentialDetails heading="Credential details">
-          <GetCredential.Card.CredentialDetails.ClientId heading="ClientId" />
-          <GetCredential.Card.CredentialDetails.ClientSecret heading="Client Secret" buttonLabel="Retrieve and copy client secret" />
+        <GetCredential.Card.CredentialDetails heading={(<>Credential details<br/><br/> <span style="font-weight:normal"><small>You can use the following credential details to try out the Adobe Experience Platform APIs below.<ul><li>Client ID: Your public identifier for accessing the APIs. This acts as an API key when used with the Platform APIs, and corresponds with the <code>x-api-key</code> header.</li><li>Organization ID: The ID of the organization you're using with the Platform APIs. This corresponds with the <code>x-gw-ims-org-id</code> header.</li></ul></small></span></>)} orderBy="ClientId,ImsOrgID">
+          <GetCredential.Card.CredentialDetails.ClientId heading="Client ID (x-api-key)" />
+          <GetCredential.Card.CredentialDetails.ImsOrgID heading="Organization ID" />
           <GetCredential.Card.CredentialDetails.Scopes heading="Scopes" scope="openid,session,AdobeID,read_organizations,additional_info.projectedProductContext" />
         </GetCredential.Card.CredentialDetails>
 
       </GetCredential.Card>
 
-      <GetCredential.Return title="Previously created projects" paragraph="Select a project and access your existing credentials for Adobe Experience Platform." className="card_developer_console">
+      <GetCredential.Return title="Previously created projects" paragraph="Select a project and access your existing credentials for Adobe Experience Platform." className="card_developer_console" isCollapsable="true">
 
         <GetCredential.Return.Side>
           <GetCredential.Return.Side.Custom>
@@ -113,9 +128,9 @@ const GetCredentialOAuthS2s = () => {
           <GetCredential.Return.Side.NewCredential heading="Need another credential?" buttonLabel="Create new credential" />
         </GetCredential.Return.Side>
 
-        <GetCredential.Return.CredentialDetails heading="Credential details">
-          <GetCredential.Return.CredentialDetails.ClientId heading="ClientId" />
-          <GetCredential.Return.CredentialDetails.ClientSecret heading="Client Secret" buttonLabel="Retrieve and copy client secret" />
+        <GetCredential.Return.CredentialDetails heading={(<>Credential details<br/><br/> <span style="font-weight:normal"><small>You can use the following credential details to try out the Adobe Experience Platform APIs below.<ul><li>Client ID: Your public identifier for accessing the APIs. This acts as an API key when used with the Platform APIs, and corresponds with the <code>x-api-key</code> header.</li><li>Organization ID: The ID of the organization you're using with the Platform APIs. This corresponds with the <code>x-gw-ims-org-id</code> header.</li></ul></small></span></>)} orderBy="ClientId,ImsOrgID">
+          <GetCredential.Return.CredentialDetails.ClientId heading="Client ID (x-api-key)" />
+          <GetCredential.Return.CredentialDetails.ImsOrgID heading="Organization ID" />
           <GetCredential.Return.CredentialDetails.Scopes heading="Scopes" scope="openid,session,AdobeID,read_organizations,additional_info.projectedProductContext" />
         </GetCredential.Return.CredentialDetails>
 
@@ -123,9 +138,9 @@ const GetCredentialOAuthS2s = () => {
 
         <GetCredential.Return.ManageDeveloperConsole label="Manage all your projects and credentials on Adobe Developer Console" direction='/console/projects' />
 
-        <GetCredential.Return.AccessToken helpText="" buttonLabel="Generate and copy token" heading="Access Token" />
+        <GetCredential.Return.AccessToken helpText="" buttonLabel="Generate and copy token" heading={(<>Access token<br/><br/> <span style="font-weight:normal"><small>After copying the access token, you must prepend the token with <code>Bearer</code> to use it with API calls.</small></span></>)} />
 
-        <GetCredential.Return.DevConsoleLink heading="Developer Console Project" />
+        <GetCredential.Return.DevConsoleLink heading="Developer Console project" />
 
         <GetCredential.Return.Products label="Included products and services">
           <GetCredential.Return.Product label="Adobe Experience Platform" icon={platform} />
@@ -133,8 +148,6 @@ const GetCredentialOAuthS2s = () => {
 
       </GetCredential.Return>
 
-      <GetCredential.NoDeveloperAccessError title='Get Credentials' docsLinkText="How do I get developer permissions for the [Firefly - Firefly and Creative Cloud Automation API]?" docsLink="" />
-
       <GetCredential.RequestAccess
         title="Get credentials"
         paragraph="Create unique credentials that you will use to call multiple APIs from your application."
@@ -183,9 +196,6 @@ const GetCredentialOAuthS2s = () => {
           </div>
         </GetCredential.RequestAccess.RequestAccessSide>
       </GetCredential.RequestAccess>
-
-      <GetCredential.ErrorCode helpLink="Get help" title="Error code ###" description="Your personal account does not have Developer role permission to access the [Org Name, Inc.] organization in the Adobe Developer Console." buttonLabel="Contact Adobe" buttonLink="https://some_help_link" />
-
     </GetCredential>
 
   )
diff --git a/src/pages/references/access-control.md b/src/pages/references/access-control.md
index 90c3075f..f086fc60 100644
--- a/src/pages/references/access-control.md
+++ b/src/pages/references/access-control.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/access-control.yaml"/>
diff --git a/src/pages/references/audit-query.md b/src/pages/references/audit-query.md
index 4e421476..89263658 100644
--- a/src/pages/references/audit-query.md
+++ b/src/pages/references/audit-query.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/audit-query.yaml"/>
diff --git a/src/pages/references/batch-ingestion.md b/src/pages/references/batch-ingestion.md
index b0f1d751..11075cf5 100644
--- a/src/pages/references/batch-ingestion.md
+++ b/src/pages/references/batch-ingestion.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/batch-ingestion.yaml"/>
diff --git a/src/pages/references/catalog.md b/src/pages/references/catalog.md
index 36871728..24dc7c40 100644
--- a/src/pages/references/catalog.md
+++ b/src/pages/references/catalog.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/catalog.yaml"/>
diff --git a/src/pages/references/data-access.md b/src/pages/references/data-access.md
index 9121d6a8..d5be6ede 100644
--- a/src/pages/references/data-access.md
+++ b/src/pages/references/data-access.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/data-access.yaml"/>
diff --git a/src/pages/references/data-hygiene.md b/src/pages/references/data-hygiene.md
index d1e309d4..9e3a0b9d 100644
--- a/src/pages/references/data-hygiene.md
+++ b/src/pages/references/data-hygiene.md
@@ -12,4 +12,6 @@ import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
 <GetCredentialsOauth2 />
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/data-hygiene.yaml"/>
diff --git a/src/pages/references/data-prep.md b/src/pages/references/data-prep.md
index 831d6b4a..f2d404f4 100644
--- a/src/pages/references/data-prep.md
+++ b/src/pages/references/data-prep.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/data-prep.yaml"/>
diff --git a/src/pages/references/dataset-service.md b/src/pages/references/dataset-service.md
index 7e25710f..67508996 100644
--- a/src/pages/references/dataset-service.md
+++ b/src/pages/references/dataset-service.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/dataset-service.yaml"/>
diff --git a/src/pages/references/destination-authoring.md b/src/pages/references/destination-authoring.md
index 9895b38e..a4926c14 100644
--- a/src/pages/references/destination-authoring.md
+++ b/src/pages/references/destination-authoring.md
@@ -6,4 +6,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/destination-authoring.yaml"/>
diff --git a/src/pages/references/destinations.md b/src/pages/references/destinations.md
index 30017fc6..836381c9 100644
--- a/src/pages/references/destinations.md
+++ b/src/pages/references/destinations.md
@@ -6,4 +6,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/destinations.yaml"/>
diff --git a/src/pages/references/flow-service.md b/src/pages/references/flow-service.md
index 20016284..395fdc2f 100644
--- a/src/pages/references/flow-service.md
+++ b/src/pages/references/flow-service.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/flow-service.yaml"/>
diff --git a/src/pages/references/identity-service.md b/src/pages/references/identity-service.md
index 2fac6b10..10d90762 100644
--- a/src/pages/references/identity-service.md
+++ b/src/pages/references/identity-service.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/identity-service.yaml"/>
diff --git a/src/pages/references/mtls-service.md b/src/pages/references/mtls-service.md
index 5454d923..39398466 100644
--- a/src/pages/references/mtls-service.md
+++ b/src/pages/references/mtls-service.md
@@ -12,4 +12,6 @@ import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
 <GetCredentialsOauth2 />
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/mtls-service.yaml"/>
diff --git a/src/pages/references/observability-insights.md b/src/pages/references/observability-insights.md
index a5ff6351..f182a0a2 100644
--- a/src/pages/references/observability-insights.md
+++ b/src/pages/references/observability-insights.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/observability-insights.yaml"/>
diff --git a/src/pages/references/policy-service.md b/src/pages/references/policy-service.md
index b280eb34..cf12aecd 100644
--- a/src/pages/references/policy-service.md
+++ b/src/pages/references/policy-service.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/policy-service.yaml"/>
diff --git a/src/pages/references/privacy-service.md b/src/pages/references/privacy-service.md
index 3ebd9086..863fa750 100644
--- a/src/pages/references/privacy-service.md
+++ b/src/pages/references/privacy-service.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/privacy-service.yaml"/>
diff --git a/src/pages/references/profile.md b/src/pages/references/profile.md
index 073df61a..c8523bdc 100644
--- a/src/pages/references/profile.md
+++ b/src/pages/references/profile.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/profile.yaml"/>
diff --git a/src/pages/references/query-service.md b/src/pages/references/query-service.md
index cba647af..b694820d 100644
--- a/src/pages/references/query-service.md
+++ b/src/pages/references/query-service.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/query-service.yaml"/>
diff --git a/src/pages/references/reactor.md b/src/pages/references/reactor.md
index de19e061..e2cdb69a 100644
--- a/src/pages/references/reactor.md
+++ b/src/pages/references/reactor.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/reactor.yaml"/>
diff --git a/src/pages/references/sandbox.md b/src/pages/references/sandbox.md
index c126036a..9e7d5b41 100644
--- a/src/pages/references/sandbox.md
+++ b/src/pages/references/sandbox.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/sandbox.yaml"/>
diff --git a/src/pages/references/schema-registry.md b/src/pages/references/schema-registry.md
index 585d4735..eed99c5c 100644
--- a/src/pages/references/schema-registry.md
+++ b/src/pages/references/schema-registry.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/schema-registry.yaml"/>
diff --git a/src/pages/references/segmentation.md b/src/pages/references/segmentation.md
index f28f5ed1..421138ad 100644
--- a/src/pages/references/segmentation.md
+++ b/src/pages/references/segmentation.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/segmentation.yaml"/>
diff --git a/src/pages/references/sensei-machine-learning.md b/src/pages/references/sensei-machine-learning.md
index ed89d16f..31548d6a 100644
--- a/src/pages/references/sensei-machine-learning.md
+++ b/src/pages/references/sensei-machine-learning.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/sensei-machine-learning.yaml"/>
diff --git a/src/pages/references/streaming-ingestion.md b/src/pages/references/streaming-ingestion.md
index 0a113dea..5046d1d4 100644
--- a/src/pages/references/streaming-ingestion.md
+++ b/src/pages/references/streaming-ingestion.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/streaming-ingestion.yaml"/>
diff --git a/src/pages/references/unified-tags.md b/src/pages/references/unified-tags.md
index 2add560a..6166626b 100644
--- a/src/pages/references/unified-tags.md
+++ b/src/pages/references/unified-tags.md
@@ -10,4 +10,6 @@ layout: none
 
 import GetCredentialsOauth2 from "../credentials/GetCredentialOAuth2.js"
 
+<GetCredentialsOauth2 />
+
 <RedoclyAPIBlock src="/experience-platform-apis/swagger-specs/unified-tags.yaml"/>
diff --git a/static/swagger-specs/access-control.yaml b/static/swagger-specs/access-control.yaml
index 9fe25ccb..fe867a09 100644
--- a/static/swagger-specs/access-control.yaml
+++ b/static/swagger-specs/access-control.yaml
@@ -23,7 +23,13 @@ info:
   version: "1.0"
 
 servers:
-- url: //platform.adobe.io/data/foundation/access-control
+- url: //{environment}.adobe.io/data/foundation/access-control
+  variables:
+    environment:
+      default: platform
+      enum: 
+        - platform
+        - platform-stage
 
 tags:
 - name: (NEW) Interactive API documentation
diff --git a/static/swagger-specs/audit-query.yaml b/static/swagger-specs/audit-query.yaml
index 62b939b2..72ae4505 100644
--- a/static/swagger-specs/audit-query.yaml
+++ b/static/swagger-specs/audit-query.yaml
@@ -5,7 +5,13 @@ info:
     \n- **Visualize API calls with Postman (a free, third-party software)**:\n    - [Audit Query API Postman collection on GitHub](https://github.com/adobe/experience-platform-postman-samples/blob/master/apis/experience-platform/Audit%20Query%20API.postman_collection.json)\n    - [Video guide for creating the Postman environment](https://video.tv.adobe.com/v/28832)\n    - [Steps for importing environments and collections in Postman](https://learning.postman.com/docs/getting-started/importing-and-exporting-data/)\n  \n- **API paths**:\n    - PLATFORM Gateway URL: https://<span>platform.adobe.io/\n    - Base path for this API: /data/foundation\n    - Example of a complete path: https://<span>platform.adobe.io/data/foundation/audit/events\n\n- **Required headers**:\n    - All calls require the headers `Authorization`, `x-gw-ims-org-id`, and `x-api-key`. For more information on how to obtain these values, see the [authentication tutorial](http://www.adobe.com/go/platform-api-authentication-en).\n    - All resources in Experience Platform are isolated to specific virtual sandboxes. All requests to Platform APIs require the header `x-sandbox-name` whose value is the all-lowercase name of the sandbox the operation will take place in (for example, \"prod\"). See the [sandboxes overview](https://adobe.com/go/sandbox-overview-en) for more information.\n - **API error handling**: \n   - Refer to the Experience Platform API troubleshooting guide for [FAQs](https://experienceleague.adobe.com/docs/experience-platform/landing/troubleshooting.html#faq), [API status codes](https://experienceleague.adobe.com/docs/experience-platform/landing/troubleshooting.html#api-status-codes), and [request header errors](https://experienceleague.adobe.com/docs/experience-platform/landing/troubleshooting.html#request-header-errors)."
   version: "1.0"
 servers:
-- url: //platform.adobe.io/data/foundation
+- url: //{environment}.adobe.io/data/foundation
+  variables:
+    environment:
+      default: platform
+      enum: 
+        - platform
+        - platform-stage
 tags:
 - name: (NEW) Interactive API documentation
   description: You can now interact with the Experience Platform API endpoints directly from this API reference page. Get your [authentication credentials](http://www.adobe.com/go/platform-api-authentication-en) and use the **Try it** functionality in the right rail. Note that by using this functionality, you are making real API calls. Keep this in mind when you interact with production sandboxes.
diff --git a/static/swagger-specs/batch-ingestion.yaml b/static/swagger-specs/batch-ingestion.yaml
index e1958ec3..6ebc59d9 100644
--- a/static/swagger-specs/batch-ingestion.yaml
+++ b/static/swagger-specs/batch-ingestion.yaml
@@ -41,7 +41,13 @@ info:
 
   version: "1.0"
 servers:
-- url: //platform.adobe.io/data/foundation/import
+- url: //{environment}.adobe.io/data/foundation/import
+  variables:
+    environment:
+      default: platform
+      enum: 
+        - platform
+        - platform-stage
 tags:
 - name: (NEW) Interactive API documentation
   description: You can now interact with the Experience Platform API endpoints directly from this API reference page. Get your [authentication credentials](http://www.adobe.com/go/platform-api-authentication-en) and use the **Try it** functionality in the right rail. Note that by using this functionality, you are making real API calls. Keep this in mind when you interact with production sandboxes.
diff --git a/static/swagger-specs/catalog.yaml b/static/swagger-specs/catalog.yaml
index c21e19b1..9e9ec6b3 100644
--- a/static/swagger-specs/catalog.yaml
+++ b/static/swagger-specs/catalog.yaml
@@ -34,7 +34,13 @@ info:
 
   version: "1.0"
 servers:
-- url: //platform.adobe.io/data/foundation/catalog
+- url: //{environment}.adobe.io/data/foundation/catalog
+  variables:
+    environment:
+      default: platform
+      enum: 
+        - platform
+        - platform-stage
 tags:
 - name: Batches
   description: Batches allow users to understand which operations and applications have been performed on objects tracked by the system.
diff --git a/static/swagger-specs/data-access.yaml b/static/swagger-specs/data-access.yaml
index ba84719a..fc82c573 100644
--- a/static/swagger-specs/data-access.yaml
+++ b/static/swagger-specs/data-access.yaml
@@ -29,8 +29,14 @@ info:
 
   version: 1.0.0
 servers:
-  - url: https://platform.adobe.io/data/foundation/export
+  - url: https://{environment}.adobe.io/data/foundation/export
     description: Adobe IO gateway endpoint
+    variables:
+      environment:
+        default: platform
+        enum: 
+          - platform
+          - platform-stage
 tags:
 - name: (NEW) Interactive API documentation
   description: You can now interact with the Experience Platform API endpoints directly from this API reference page. Get your [authentication credentials](http://www.adobe.com/go/platform-api-authentication-en) and use the **Try it** functionality in the right rail. Note that by using this functionality, you are making real API calls. Keep this in mind when you interact with production sandboxes.
diff --git a/static/swagger-specs/data-hygiene.yaml b/static/swagger-specs/data-hygiene.yaml
index 13d14bf5..3b4007d7 100644
--- a/static/swagger-specs/data-hygiene.yaml
+++ b/static/swagger-specs/data-hygiene.yaml
@@ -34,7 +34,13 @@ info:
   version: 1.0.0
 
 servers:
-  - url: https://platform.adobe.io
+  - url: https://{environment}.adobe.io
+    variables:
+      environment:
+        default: platform
+        enum: 
+          - platform
+          - platform-stage
 tags: 
   - name: (NEW) Interactive API documentation
     description: You can now interact with the Experience Platform API endpoints directly from this API reference page. Get 
diff --git a/static/swagger-specs/data-prep.yaml b/static/swagger-specs/data-prep.yaml
index bb834885..8e7682bf 100644
--- a/static/swagger-specs/data-prep.yaml
+++ b/static/swagger-specs/data-prep.yaml
@@ -21,7 +21,13 @@ info:
 
   version: "1.0"
 servers:
-- url: //platform.adobe.io/data/foundation/conversion
+- url: //{environment}.adobe.io/data/foundation/conversion
+  variables:
+    environment:
+      default: platform
+      enum: 
+        - platform
+        - platform-stage
 tags:
 - name: (NEW) Interactive API documentation
   description: You can now interact with the Experience Platform API endpoints directly from this API reference page. Get your [authentication credentials](http://www.adobe.com/go/platform-api-authentication-en) and use the **Try it** functionality in the right rail. Note that by using this functionality, you are making real API calls. Keep this in mind when you interact with production sandboxes.
diff --git a/static/swagger-specs/dataset-service.yaml b/static/swagger-specs/dataset-service.yaml
index cb53cbc9..85ca6da1 100644
--- a/static/swagger-specs/dataset-service.yaml
+++ b/static/swagger-specs/dataset-service.yaml
@@ -27,7 +27,13 @@ info:
 
   version: "1.0"
 servers:
-- url: //platform.adobe.io/data/foundation/dataset
+- url: //{environment}.adobe.io/data/foundation/dataset
+  variables:
+    environment:
+      default: platform
+      enum: 
+        - platform
+        - platform-stage
 tags:
 - name: (NEW) Interactive API documentation
   description: You can now interact with the Experience Platform API endpoints directly from this API reference page. Get your [authentication credentials](http://www.adobe.com/go/platform-api-authentication-en) and use the **Try it** functionality in the right rail. Note that by using this functionality, you are making real API calls. Keep this in mind when you interact with production sandboxes.
diff --git a/static/swagger-specs/destinations.yaml b/static/swagger-specs/destinations.yaml
index af77e7eb..0c9707a8 100644
--- a/static/swagger-specs/destinations.yaml
+++ b/static/swagger-specs/destinations.yaml
@@ -34,8 +34,14 @@ info:
   title: Flow Service API - Destinations
   version: 1.0.0
 servers:
-  - url: https://platform.adobe.io/data/foundation/flowservice
+  - url: https://{environment}.adobe.io/data/foundation/flowservice
     description: Adobe IO gateway endpoint
+    variables:
+      environment:
+        default: platform
+        enum: 
+          - platform
+          - platform-stage
 
 tags:
   # - name: Changelog
diff --git a/static/swagger-specs/flow-service.yaml b/static/swagger-specs/flow-service.yaml
index eaeb6827..bddbca45 100644
--- a/static/swagger-specs/flow-service.yaml
+++ b/static/swagger-specs/flow-service.yaml
@@ -29,7 +29,13 @@ info:
         - When performing listing (GET) requests in the Flow Service API, you can use query parameters to [sort and filter responses](https://experienceleague.adobe.com/docs/experience-platform/dataflows/api/sort-and-filter.html?lang=en).
   version: "1.0"
 servers:
-- url: //platform.adobe.io/data/foundation/flowservice
+- url: //{environment}.adobe.io/data/foundation/flowservice
+  variables:
+    environment:
+      default: platform
+      enum: 
+        - platform
+        - platform-stage
 tags:
 - name: (NEW) Interactive API documentation
   description: You can now interact with the Experience Platform API endpoints directly from this API reference page. Get your [authentication credentials](http://www.adobe.com/go/platform-api-authentication-en) and use the **Try it** functionality in the right rail. Note that by using this functionality, you are making real API calls. Keep this in mind when you interact with production sandboxes.
diff --git a/static/swagger-specs/identity-service.yaml b/static/swagger-specs/identity-service.yaml
index 66db5eef..0fdb45a6 100644
--- a/static/swagger-specs/identity-service.yaml
+++ b/static/swagger-specs/identity-service.yaml
@@ -37,7 +37,13 @@ info:
         - Refer to the Experience Platform API troubleshooting guide for [FAQs](https://experienceleague.adobe.com/docs/experience-platform/landing/troubleshooting.html#faq), [API status codes](https://experienceleague.adobe.com/docs/experience-platform/landing/troubleshooting.html#api-status-codes), and [request header errors](https://experienceleague.adobe.com/docs/experience-platform/landing/troubleshooting.html#request-header-errors).
   version: 1.0.0
 servers:
-  - url: https://platform.adobe.io/data/core
+  - url: https://{environment}.adobe.io/data/core
+    variables:
+      environment:
+        default: platform
+        enum: 
+          - platform
+          - platform-stage
 tags:
   - name: (NEW) Interactive API documentation
     description: |
diff --git a/static/swagger-specs/mtls-service.yaml b/static/swagger-specs/mtls-service.yaml
index 65c78b41..d57a0a34 100644
--- a/static/swagger-specs/mtls-service.yaml
+++ b/static/swagger-specs/mtls-service.yaml
@@ -23,7 +23,13 @@ info:
   version: 1.0.0
 
 servers: 
-  - url: https://platform.adobe.io/
+  - url: https://{environment}.adobe.io/
+    variables:
+      environment:
+        default: platform
+        enum: 
+          - platform
+          - platform-stage
 tags: 
 - name: (NEW) Interactive API documentation
   description: > 
diff --git a/static/swagger-specs/observability-insights.yaml b/static/swagger-specs/observability-insights.yaml
index e91258a3..a506df47 100644
--- a/static/swagger-specs/observability-insights.yaml
+++ b/static/swagger-specs/observability-insights.yaml
@@ -29,7 +29,13 @@ info:
 
   version: 1.0.0
 servers:
-- url: //platform.adobe.io/data/infrastructure/observability/insights
+- url: //{environment}.adobe.io/data/infrastructure/observability/insights
+  variables:
+    environment:
+      default: platform
+      enum: 
+        - platform
+        - platform-stage
 tags:
 - name: (NEW) Interactive API documentation
   description: You can now interact with the Experience Platform API endpoints directly from this API reference page. Get your [authentication credentials](http://www.adobe.com/go/platform-api-authentication-en) and use the **Try it** functionality in the right rail. Note that by using this functionality, you are making real API calls. Keep this in mind when you interact with production sandboxes.
diff --git a/static/swagger-specs/policy-service.yaml b/static/swagger-specs/policy-service.yaml
index bf6e58ba..d594e15b 100644
--- a/static/swagger-specs/policy-service.yaml
+++ b/static/swagger-specs/policy-service.yaml
@@ -30,7 +30,13 @@ info:
 
   version: "1.0"
 servers:
-- url: //platform.adobe.io/data/foundation/dulepolicy
+- url: //{environment}.adobe.io/data/foundation/dulepolicy
+  variables:
+    environment:
+      default: platform
+      enum: 
+        - platform
+        - platform-stage
 tags:
 - name: (NEW) Interactive API documentation
   description: You can now interact with the Experience Platform API endpoints directly from this API reference page. Get your [authentication credentials](http://www.adobe.com/go/platform-api-authentication-en) and use the **Try it** functionality in the right rail. Note that by using this functionality, you are making real API calls. Keep this in mind when you interact with production sandboxes.
diff --git a/static/swagger-specs/privacy-service.yaml b/static/swagger-specs/privacy-service.yaml
index 3405e102..071e150e 100644
--- a/static/swagger-specs/privacy-service.yaml
+++ b/static/swagger-specs/privacy-service.yaml
@@ -24,7 +24,13 @@ info:
         - Refer to the Experience Platform API troubleshooting guide for [FAQs](https://experienceleague.adobe.com/docs/experience-platform/landing/troubleshooting.html#faq), [API status codes](https://experienceleague.adobe.com/docs/experience-platform/landing/troubleshooting.html#api-status-codes), and [request header errors](https://experienceleague.adobe.com/docs/experience-platform/landing/troubleshooting.html#request-header-errors).
   version: "1.0"
 servers:
-- url: https://platform.adobe.io/data/core/privacy
+- url: https://{environment}.adobe.io/data/core/privacy
+  variables:
+    environment:
+      default: platform
+      enum: 
+        - platform
+        - platform-stage
 tags:
 - name: (NEW) Interactive API documentation
   description: You can now interact with the Experience Platform API endpoints directly from this API reference page. Get your [authentication credentials](http://www.adobe.com/go/platform-api-authentication-en) and use the **Try it** functionality in the right rail. Note that by using this functionality, you are making real API calls. Keep this in mind when you interact with production sandboxes.
diff --git a/static/swagger-specs/profile.yaml b/static/swagger-specs/profile.yaml
index 0df00ebe..b7a8b93b 100644
--- a/static/swagger-specs/profile.yaml
+++ b/static/swagger-specs/profile.yaml
@@ -29,7 +29,13 @@ info:
       
   version: "1.0"
 servers:
-- url: https://platform.adobe.io/data/core/
+- url: https://{environment}.adobe.io/data/core
+  variables:
+    environment:
+      default: platform
+      enum: 
+        - platform
+        - platform-stage
 tags:
 - name: (NEW) Interactive API documentation
   description: You can now interact with the Experience Platform API endpoints directly from this API reference page. Get your [authentication credentials](http://www.adobe.com/go/platform-api-authentication-en) and use the **Try it** functionality in the right rail. Note that by using this functionality, you are making real API calls. Keep this in mind when you interact with production sandboxes.
diff --git a/static/swagger-specs/query-service.yaml b/static/swagger-specs/query-service.yaml
index 2a2115f1..f5a86a36 100644
--- a/static/swagger-specs/query-service.yaml
+++ b/static/swagger-specs/query-service.yaml
@@ -27,7 +27,13 @@ info:
       * Refer to the Query Service troubleshooting guide for [common query related FAQs](https://experienceleague.adobe.com/docs/experience-platform/query/troubleshooting-guide.html).
   version: "1.0"
 servers:
-- url: //platform.adobe.io/data/foundation/query
+- url: //{environment}.adobe.io/data/foundation/query
+  variables:
+    environment:
+      default: platform
+      enum: 
+        - platform
+        - platform-stage
 tags:
 - name: (NEW) Interactive API documentation
   description: You can now interact with the Experience Platform API endpoints directly from this API reference page. Get your [authentication credentials](http://www.adobe.com/go/platform-api-authentication-en) and use the **Try it** functionality in the right rail. Note that by using this functionality, you are making real API calls. Keep this in mind when you interact with production sandboxes.
diff --git a/static/swagger-specs/sandbox.yaml b/static/swagger-specs/sandbox.yaml
index 24695ef8..ef7042ff 100644
--- a/static/swagger-specs/sandbox.yaml
+++ b/static/swagger-specs/sandbox.yaml
@@ -29,7 +29,13 @@ info:
 
   version: "1.0"
 servers:
-- url: //platform.adobe.io/data/foundation/sandbox-management
+- url: //{environment}.adobe.io/data/foundation/sandbox-management
+  variables:
+    environment:
+      default: platform
+      enum: 
+        - platform
+        - platform-stage
 tags:
 - name: (NEW) Interactive API documentation
   description: You can now interact with the Experience Platform API endpoints directly from this API reference page. Get your [authentication credentials](http://www.adobe.com/go/platform-api-authentication-en) and use the **Try it** functionality in the right rail. Note that by using this functionality, you are making real API calls. Keep this in mind when you interact with production sandboxes.
diff --git a/static/swagger-specs/segmentation.yaml b/static/swagger-specs/segmentation.yaml
index 2952a8cb..efb12881 100644
--- a/static/swagger-specs/segmentation.yaml
+++ b/static/swagger-specs/segmentation.yaml
@@ -28,7 +28,13 @@ info:
 
   version: "1.0"
 servers:
-- url: //platform.adobe.io/data/core/ups
+- url: //{environment}.adobe.io/data/core/ups
+  variables:
+    environment:
+      default: platform
+      enum: 
+        - platform
+        - platform-stage
 tags:
 - name: Audiences
   description: Audiences are a set of people, accounts, households, or other entities that share common characteristics and behaviors. This set can be generated either by using Platform or from external sources. More information about using this set of endpoints can be found in the [audiences endpoint guide](https://experienceleague.adobe.com/docs/experience-platform/segmentation/api/audiences.html).
diff --git a/static/swagger-specs/sensei-machine-learning.yaml b/static/swagger-specs/sensei-machine-learning.yaml
index 49656f7c..0beea8f6 100644
--- a/static/swagger-specs/sensei-machine-learning.yaml
+++ b/static/swagger-specs/sensei-machine-learning.yaml
@@ -7,7 +7,13 @@ info:
     \n**API error handling**: \n  - Refer to the Experience Platform API troubleshooting guide for [FAQs](https://experienceleague.adobe.com/docs/experience-platform/landing/troubleshooting.html#faq), [API status codes](https://experienceleague.adobe.com/docs/experience-platform/landing/troubleshooting.html#api-status-codes), and [request header errors](https://experienceleague.adobe.com/docs/experience-platform/landing/troubleshooting.html#request-header-errors)."
   version: "1.0"
 servers:
-- url: //platform.adobe.io/data/sensei
+- url: //{environment}.adobe.io/data/sensei
+  variables:
+    environment:
+      default: platform
+      enum: 
+        - platform
+        - platform-stage
 tags:
 - name: Engines
   description: "Engines act as an umbrella entity holding all machine learning instances. This is tied to a Docker image, Java archive, or EGG file which contains machine  learning logic to train and score a Model."