diff --git a/src/openapi/.redocly.yaml b/src/openapi/.redocly.yaml
deleted file mode 100644
index f3190981..00000000
--- a/src/openapi/.redocly.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# See https://docs.redoc.ly/cli/configuration/ for more information.
-organization: adobe-developers
-extends:
-    - minimal
-apis:
-  Data Ingestion@1.0:
-    root: src/openapi/openapi/data-ingestion-schema-v1.yaml
-    labels:
-      - main
-  Data Ingestion@1.0.0:
-    root: src/openapi/data-ingestion-schema-v1.yaml
-theme:
-  openapi:
-    pagination: section
-    hideHostname: true
-    sortPropsAlphabetically: false
-    pathInMiddlePanel: true
-    hideDownloadButton: false
-    hideTryItPanel: true
-    layout: stacked
-    showExtensions: true
-    nativeScrollbars: true
-    ctrlFHijack: true
-    scrollYOffset: 64
-    disableSidebar: true
-    disableDeepLinks: false
\ No newline at end of file
diff --git a/src/pages/credential/GetCredentialOAuthS2s.js b/src/pages/credential/GetCredentialOAuthS2s.js
new file mode 100644
index 00000000..bde13dd4
--- /dev/null
+++ b/src/pages/credential/GetCredentialOAuthS2s.js
@@ -0,0 +1,173 @@
+import React from 'react'
+import { GetCredential } from '@adobe/gatsby-theme-aio/src/components/GetCredential';
+import commerce from "./images/commerce.svg";
+
+const GetCredentialOAuthS2s = () => {
+
+  return (
+
+    <GetCredential className="getCredentialContainer" templateId="6887db51a6867b6202ef2f9c" productName='Adobe Commerce Optimizer' >
+
+      <GetCredential.SignIn title="Get credentials" paragraph="After signing in, you can create credentials that can be used to call the catalog data ingestion REST API." buttonText="Sign in" />
+
+      <GetCredential.Form title="Get credentials" paragraph="Create credentials that you can use to call the catalog data ingestion REST API. You also need the sandbox tenant ID to call the API." className="formClass">
+
+        <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 Commerce Optimizer" icon={commerce} />
+        </GetCredential.Form.Products>
+
+        <GetCredential.Form.AdobeDeveloperConsole label='By checking this box, you agree to' linkText="Adobe Developer Terms of Use" href="https://wwwimages2.adobe.com/content/dam/cc/en/legal/servicetou/Adobe-Developer-Additional-Terms_en-US_20230822.pdf" />
+
+        <GetCredential.Form.Side>
+          <div style={{ display: "flex", gap: "32px", flexDirection: "column" }}>
+            <div style={{ display: "flex", gap: "16px", flexDirection: "column" }}>
+              <h3 className="spectrum-Heading spectrum-Heading--sizeS side-header">
+                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.
+              </p>
+              <p className="spectrum-Body spectrum-Body--sizeM">
+                This credential only provides an access token. It does not return the tenant ID associated with your Adobe Commerce Optimizer sandbox environment, which is required for API calls. In addition to the access token, you must manually copy and paste a tenant ID from the Commerce Cloud Manager into the <code>tenantID</code> field in the <strong>Try it</strong> panel below. See the <a href="https://developer.adobe.com/commerce/services/optimizer/data-ingestion/using-the-api/">Get started</a> documentation for help finding your tenant ID.
+              </p>
+            </div>
+            <div style={{ display: "flex", gap: "16px", flexDirection: "column" }}>
+              <h3 className="spectrum-Heading spectrum-Heading--sizeS side-header">
+                Learn more
+              </h3>
+              <a style={{ color: "#0265DC" }} href="https://developer.adobe.com/commerce/services/optimizer/data-ingestion/authentication/">
+                Authentication documentation
+              </a>
+            </div>
+          </div>
+        </GetCredential.Form.Side>
+
+      </GetCredential.Form>
+
+      <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" isCollapsable="true">
+
+        <GetCredential.Card.Side>
+          <div style={{ display: "flex", gap: "32px", flexDirection: "column" }}>
+            <div style={{ display: "flex", gap: "16px", flexDirection: "column" }}>
+              <h3 className="spectrum-Heading spectrum-Heading--sizeS side-header">
+                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.
+              </p>
+            </div>
+            <div style={{ display: "flex", gap: "16px", flexDirection: "column" }}>
+              <h3 className="spectrum-Heading spectrum-Heading--sizeS side-header">
+                Learn more
+              </h3>
+              <a style={{ color: "#0265DC" }} href="https://developer.adobe.com/commerce/services/optimizer/data-ingestion/authentication/">
+                Authentication documentation
+              </a>
+            </div>
+          </div>
+        </GetCredential.Card.Side>
+
+        <GetCredential.Card.Products label="Included products and services">
+          <GetCredential.Card.Product label="Adobe Commerce Optimizer" icon={commerce} />
+        </GetCredential.Card.Products>
+
+        <GetCredential.Card.ProjectsDropdown label="Projects" subHeading="Only your projects that contain credentials are shown" />
+
+        <GetCredential.Card.ManageDeveloperConsole label="Manage all your projects and credentials on Adobe Developer Console" direction='/console' />
+
+        <GetCredential.Card.DevConsoleLink heading="Developer Console Project" />
+
+        <GetCredential.Card.AccessToken helpText="" buttonLabel="Generate and copy token" heading={(<>Access token<br/><br/> <span style="font-weight:normal"><small>Paste the access token into the <strong>Authorization</strong> header in the <strong>Try it</strong> panel below. Then, add the <a href="https://developer.adobe.com/commerce/services/optimizer/data-ingestion/using-the-api/#base-url">tenant ID</a> to the <strong>tenant ID</strong> field. You only need to do this once; future requests reuse the values automatically.</small></span></>)}/>
+
+        <GetCredential.Card.CredentialDetails heading={(<>Credential details<br/><br/> <span style="font-weight:normal"><small>The following Client ID and Organization ID are used to generate the access token:</small></span></>)} orderBy="ClientId,ImsOrgID">
+          <GetCredential.Card.CredentialDetails.ClientId heading="Client ID (x-api-key)" />
+          <GetCredential.Card.CredentialDetails.ImsOrgID heading="Organization ID (x-gw-ims-org-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 Commerce Optimizer." className="card_developer_console" isCollapsable="true">
+
+        <GetCredential.Return.Side>
+          <GetCredential.Return.Side.Custom>
+            <div style={{ display: "flex", gap: "30px", flexDirection: "column", width: "100%" }}>
+              <h3 className='spectrum-Heading spectrum-Heading--sizeM'>Welcome back</h3>
+              <p className="spectrum-Body spectrum-Body--sizeM">You can either re-use an existing credential or create a new credential.</p>
+            </div>
+          </GetCredential.Return.Side.Custom>
+          <GetCredential.Return.Side.NewCredential heading="Need another credential?" buttonLabel="Create new credential" />
+        </GetCredential.Return.Side>
+
+        <GetCredential.Return.CredentialDetails heading={(<>Credential details<br/><br/> <span style="font-weight:normal"><small>The following Client ID and Organization ID are used to generate the access token:</small></span></>)} orderBy="ClientId,ImsOrgID">
+          <GetCredential.Return.CredentialDetails.ClientId heading="Client ID (x-api-key)" />
+          <GetCredential.Return.CredentialDetails.ImsOrgID heading="Organization ID (x-gw-ims-org-id)" />
+          <GetCredential.Return.CredentialDetails.Scopes heading="Scopes" scope="openid,session,AdobeID,read_organizations,additional_info.projectedProductContext" />
+        </GetCredential.Return.CredentialDetails>
+
+        <GetCredential.Return.ProjectsDropdown label="Projects" subHeading="Only your projects that contain credentials are shown" />
+
+        <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<br/><br/> <span style="font-weight:normal"><small>Paste the access token into the <strong>Authorization</strong> header in the <strong>Try it</strong> panel below. Then, add the <a href="https://developer.adobe.com/commerce/services/optimizer/data-ingestion/using-the-api/#base-url">tenant ID</a> to the <strong>tenant ID</strong> field. You only need to do this once; future requests reuse the values automatically.</small></span></>)} />
+
+        <GetCredential.Return.DevConsoleLink heading="Developer Console project" />
+
+        <GetCredential.Return.Products label="Included products and services">
+          <GetCredential.Return.Product label="Adobe Commerce Optimizer" icon={commerce} />
+        </GetCredential.Return.Products>
+
+      </GetCredential.Return>
+
+      <GetCredential.RequestAccess
+        title="Get credentials"
+        paragraph="Create unique credentials that you will use to call multiple APIs from your application."
+      >
+        <GetCredential.RequestAccess.EdgeCase>
+          <GetCredential.RequestAccess.EdgeCase.NoProduct title="Your organization does not have access to Adobe Commerce Optimizer." />
+          <GetCredential.RequestAccess.EdgeCase.Type1User title="You do not have access to Adobe Commerce Optimizer. Please use another organization and try again." />
+          <GetCredential.RequestAccess.EdgeCase.NotMember title="You do not have access to Adobe Commerce Optimizer. Please use another organization and try again." />
+        </GetCredential.RequestAccess.EdgeCase>
+
+        <GetCredential.RequestAccess.RestrictedAccess
+          title="Restricted Access"
+          buttonLabel="Request access"
+        >
+          <GetCredential.RequestAccess.RestrictedAccess.Products label="Included products and services">
+            <GetCredential.RequestAccess.RestrictedAccess.Products.Product
+              icon={commerce}
+              label="Adobe Commerce Optimizer"
+            />
+          </GetCredential.RequestAccess.RestrictedAccess.Products>
+        </GetCredential.RequestAccess.RestrictedAccess>
+        <GetCredential.RequestAccess.RequestAccessSide>
+          <div style={{ display: "flex", gap: "32px", flexDirection: "column" }}>
+            <div style={{ display: "flex", gap: "16px", flexDirection: "column" }}>
+              <h3 className="spectrum-Heading spectrum-Heading--sizeS side-header">
+                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.
+              </p>
+            </div>
+            <div style={{ display: "flex", gap: "16px", flexDirection: "column" }}>
+              <h3 className="spectrum-Heading spectrum-Heading--sizeS side-header">
+                Learn more
+              </h3>
+              <a style={{ color: "#0265DC" }} href="https://developer.adobe.com/commerce/webapi/rest/authentication/">
+                Authentication documentation
+              </a>
+            </div>
+          </div>
+        </GetCredential.RequestAccess.RequestAccessSide>
+      </GetCredential.RequestAccess>
+    </GetCredential>
+
+  )
+}
+
+export default GetCredentialOAuthS2s;
diff --git a/src/pages/credential/images/commerce.svg b/src/pages/credential/images/commerce.svg
new file mode 100644
index 00000000..4b22c80c
--- /dev/null
+++ b/src/pages/credential/images/commerce.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="42" height="42"><g data-name="42px@Circle"><circle data-name="Ellipse 10213-5" cx="21" cy="21" r="21" fill="#3da64e"/></g><path d="m32.854 17.49-1.75-6.127a.5.5 0 0 0-.481-.363H11.377a.5.5 0 0 0-.48.363L9.145 17.49a.4.4 0 0 0 .384.51h22.94a.4.4 0 0 0 .384-.51zM12.5 17h-2l1.5-5h2l-1.5 5zm4.75 0h-2l.75-5h2l-.75 5zM22 17h-2v-5h2v5zm2.75 0L24 12h2l.75 5h-2zm4.75 0L28 12h2l1.5 5h-2zm1.5 2v11a1 1 0 0 1-1 1H18V19h2v6h9v-6h2zM13 31h-1a1 1 0 0 1-1-1V19h2v12z" fill="#fff" data-name="24px@Icons"/></svg>
\ No newline at end of file
diff --git a/src/pages/optimizer/data-ingestion/api-reference.md b/src/pages/optimizer/data-ingestion/api-reference.md
deleted file mode 100644
index d270740e..00000000
--- a/src/pages/optimizer/data-ingestion/api-reference.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: Data Ingestion API Reference (REST)
-description: Learn about the Data Ingestion Rest API for Adobe Commerce Optimizer.
-layout: none
----
-
-# API Reference
-
-<RedoclyAPIBlock src="https://raw.githubusercontent.com/AdobeDocs/commerce-services/refs/heads/main/src/openapi/data-ingestion-schema-v1.yaml" width="600px" disableSidebar="false" scrollYOffset={64} hideTryItPanel="true" nativeScrollbars="true" ctrlFHijack="true" layout="stacked"/>
diff --git a/src/pages/optimizer/merchandising-services/api-reference.md b/src/pages/optimizer/merchandising-services/api-reference.md
deleted file mode 100644
index b1a467d9..00000000
--- a/src/pages/optimizer/merchandising-services/api-reference.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: Merchandising API Reference
-edition: saas
-description: Get information about the storefront APIs to retrieve product and catalog data to create storefront experiences.
-keywords:
-  - GraphQL
-  - Services
-  - Search
-  - Recommendations
-frameSrc: /graphql-api/merchandising-api/index.html
----
diff --git a/src/pages/reference/rest/index.md b/src/pages/reference/rest/index.md
index 64893043..62690825 100644
--- a/src/pages/reference/rest/index.md
+++ b/src/pages/reference/rest/index.md
@@ -9,6 +9,8 @@ keywords:
 layout: none
 ---
 
-# API Reference
+import GetCredentialOAuthS2s from '/src/pages/credential/GetCredentialOAuthS2s.js'
 
-<RedoclyAPIBlock src="https://raw.githubusercontent.com/AdobeDocs/commerce-services/refs/heads/main/src/openapi/data-ingestion-schema-v1.yaml" scrollYOffset={64} hideTryItPanel="true" nativeScrollbars="true" />
+<GetCredentialOAuthS2s />
+
+<RedoclyAPIBlock src='/commerce/services/rest/data-ingestion-schema-v1.yaml' hideLoading />
diff --git a/src/openapi/README.md b/static/rest/README.md
similarity index 100%
rename from src/openapi/README.md
rename to static/rest/README.md
diff --git a/src/openapi/data-ingestion-schema-v1.yaml b/static/rest/data-ingestion-schema-v1.yaml
similarity index 99%
rename from src/openapi/data-ingestion-schema-v1.yaml
rename to static/rest/data-ingestion-schema-v1.yaml
index 92c53ddd..1f7b5a5d 100644
--- a/src/openapi/data-ingestion-schema-v1.yaml
+++ b/static/rest/data-ingestion-schema-v1.yaml
@@ -15,9 +15,10 @@ info:
     - <strong>[Prices](#tag/Prices)</strong>—define and manage product SKU prices and their associated price books.
   version: 1.0.0
 servers:
-  - url: https://na1-sandbox.api.commerce.adobe.com/<TENANT_ID>
-    description: Production endpoint. The TENANT_ID value is the identifier of the Adobe Commerce instance. See [Adobe Commerce Cloud Manager](https://experience.adobe.com/#/commerce/cloud-service/instances) to see your available instances.
-
+  - url: https://na1-stage.api.commerce.adobe.com/{tenantId}
+    variables:
+      tenantId:
+        default: string
 tags:
   - name: Metadata
     description: |
@@ -183,8 +184,8 @@ paths:
 
       operationId: createProductMetadata
       parameters:
-        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/Authorization"
+        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/ContentEncoding"
       responses:
         "200":
@@ -300,8 +301,8 @@ paths:
         When the update is processed, the merge strategy is used to apply changes to `scalar` and `object` type fields. The replace strategy is used to apply changes for fields in an `array`.
       operationId: updateProductMetadata
       parameters:
-        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/Authorization"
+        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/ContentEncoding"
       responses:
         "200":
@@ -351,8 +352,8 @@ paths:
       description: Remove product attribute metadata resources from the catalog data.
       operationId: deleteProductMetadata
       parameters:
-        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/Authorization"
+        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/ContentEncoding"
       responses:
         "200":
@@ -485,8 +486,8 @@ paths:
         * Use the [Delete products API](#operation/deleteProducts) to remove items from the bundle
       operationId: createProducts
       parameters:
-        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/Authorization"
+        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/ContentEncoding"
       responses:
         "200":
@@ -890,8 +891,8 @@ paths:
         The replace strategy is used to apply changes for fields in an `array`.
       operationId: updateProducts
       parameters:
-        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/Authorization"
+        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/ContentEncoding"
       responses:
         "200":
@@ -1055,8 +1056,8 @@ paths:
         Delete products with specified `sku`` and `source`` values
       operationId: deleteProducts
       parameters:
-        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/Authorization"
+        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/ContentEncoding"
       responses:
         "200":
@@ -1101,8 +1102,8 @@ paths:
         <strong>Note:</strong> After you assign a `parentId` to a price book, you cannot change the parentId value using the update operation. If you want to define a different parent-child relationship, delete the child price book and create a new one with the desired parent-child relationship.
       operationId: createPriceBooks
       parameters:
-        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/Authorization"
+        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/ContentEncoding"
       responses:
         "200":
@@ -1151,8 +1152,8 @@ paths:
         When you submit the update request for a child price book, include the correct `parentId`. If the request includes a different `parentId`, the value is ignored.
       operationId: updatePriceBooks
       parameters:
-        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/Authorization"
+        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/ContentEncoding"
       responses:
         "200":
@@ -1195,8 +1196,8 @@ paths:
         If a price book is deleted by mistake, you have up to one week to restore the deleted price books and their associated prices. Restoring is done by recreating the top-level parent price book that was deleted, using the same payload submitted in the original create price book request. The state of the price books and prices are restored to the status and price values assigned when the price book was deleted.
       operationId: deletePriceBooks
       parameters:
-        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/Authorization"
+        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/ContentEncoding"
       responses:
         "200":
@@ -1261,8 +1262,8 @@ paths:
 
       operationId: createPrices
       parameters:
-        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/Authorization"
+        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/ContentEncoding"
       responses:
         "200":
@@ -1417,8 +1418,8 @@ paths:
 
       operationId: updatePrices
       parameters:
-        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/Authorization"
+        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/ContentEncoding"
       responses:
         "200":
@@ -1485,8 +1486,8 @@ paths:
 
       operationId: deletePrices
       parameters:
-        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/Authorization"
+        - $ref: "#/components/parameters/ContentType"
         - $ref: "#/components/parameters/ContentEncoding"
       responses:
         "200":
@@ -1566,20 +1567,19 @@ components:
           schema:
             $ref: "#/components/schemas/429Response"
   parameters:
-    ContentType:
-      name: Content-Type
+    Authorization:
+      name: Authorization
       in: header
       required: true
       schema:
         type: string
-        enum: [application/json]
-    Authorization:
-      name: Authorization
+    ContentType:
+      name: Content-Type
       in: header
       required: true
       schema:
         type: string
-      description: Authorization Bearer token
+        enum: [application/json]
     ContentEncoding:
       name: Content-Encoding
       in: header
@@ -1588,7 +1588,6 @@ components:
         type: string
         enum: [gzip]
       description: Use this header if the payload is compressed with gzip.
-
   schemas:
     FeedItemFailedValidationResult:
       title: FeedItemFailedValidationResult