diff --git a/package.json b/package.json
index 159e6e24..d76d5432 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "url": "https://github.com/icaraps"
   },
   "dependencies": {
-    "@adobe/gatsby-theme-aio": "4.11.15-rc3",
+    "@adobe/gatsby-theme-aio": "4.11.15-rc4",
     "@adobe/react-spectrum": "^3.35.1",
     "gatsby": "4.22.0",
     "react": "^17.0.2",
diff --git a/src/pages/credential/GetCredentialApiKey.js b/src/pages/credential/GetCredentialApiKey.js
index db28515a..947ee4d6 100644
--- a/src/pages/credential/GetCredentialApiKey.js
+++ b/src/pages/credential/GetCredentialApiKey.js
@@ -101,13 +101,18 @@ const GetCredentialApiKey = () => {
         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 Firefly Services" buttonLabel="Contact us to learn more" buttonLink="#someLink" />
+          <GetCredential.RequestAccess.EdgeCase.NotMember title="Access to Firefly Services APIs is not available at this time." buttonLabel="Learn more about Firefly Services" buttonLink="#someLink" />
+          <GetCredential.RequestAccess.EdgeCase.NotSignUp title="Firefly Services APIs is available as part of the beta program. Sign up for the program or log in to an account that has access." buttonLabel="Sign up for the beta" buttonLink="#someLink" />
+        </GetCredential.RequestAccess.EdgeCase>
         <GetCredential.RequestAccess.RestrictedAccess
           title="Restricted Access"
           buttonLabel="Request access"
         >
-          <GetCredential.RequestAccess.RestrictedAccess.RestrictedAccessProducts label="Included products and services">
-            <GetCredential.RequestAccess.RestrictedAccess.RestrictedAccessProducts.RestrictedAccessProduct label="Adobe Express Embed SDK" icon={creativeCloud} />
-          </GetCredential.RequestAccess.RestrictedAccess.RestrictedAccessProducts>
+          <GetCredential.RequestAccess.RestrictedAccess.Products label="Included products and services">
+            <GetCredential.RequestAccess.RestrictedAccess.Products.Product label="Adobe Express Embed SDK" icon={creativeCloud} />
+          </GetCredential.RequestAccess.RestrictedAccess.Products>
         </GetCredential.RequestAccess.RestrictedAccess>
         <GetCredential.RequestAccess.RequestAccessSide>
           <div style="display : flex ; gap : 16px ; flex-direction : column;">
@@ -120,8 +125,6 @@ const GetCredentialApiKey = () => {
         </GetCredential.RequestAccess.RequestAccessSide>
       </GetCredential.RequestAccess>
 
-      <GetCredential.NoDeveloperAccessError title='Get Credentials' docsLinkText="How do I get developer permissions for the [Firefly - Firefly and Creative Cloud Automation API]?" docsLink="" />
-
       <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/credential/GetCredentialOAuthS2s.js b/src/pages/credential/GetCredentialOAuthS2s.js
index 2ad3c404..49cb522f 100644
--- a/src/pages/credential/GetCredentialOAuthS2s.js
+++ b/src/pages/credential/GetCredentialOAuthS2s.js
@@ -160,24 +160,27 @@ const GetCredentialOAuthS2s = () => {
         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 Firefly Services" buttonLabel="Contact us to learn more" buttonLink="#someLink" />
+          <GetCredential.RequestAccess.EdgeCase.Type1User title="Access to Firefly Services is only available to enterprise accounts at this time." buttonLabel="Learn more about Firefly Services" buttonLink="#someLink" />
+          <GetCredential.RequestAccess.EdgeCase.NotMember title="Access to Firefly Services APIs is not available at this time." buttonLabel="Learn more about Firefly Services" buttonLink="#someLink" />
+          <GetCredential.RequestAccess.EdgeCase.NotSignUp title="Firefly Services APIs is available as part of the beta program. Sign up for the program or log in to an account that has access." buttonLabel="Sign up for the beta" buttonLink="#someLink" />
+        </GetCredential.RequestAccess.EdgeCase>
+
         <GetCredential.RequestAccess.RestrictedAccess
           title="Restricted Access"
           buttonLabel="Request access"
         >
-          <GetCredential.RequestAccess.RestrictedAccess.RestrictedAccessProducts label="Included products and services">
-            <GetCredential.RequestAccess.RestrictedAccess.RestrictedAccessProducts.RestrictedAccessProduct
+          <GetCredential.RequestAccess.RestrictedAccess.Products label="Included products and services">
+            <GetCredential.RequestAccess.RestrictedAccess.Products.Product
               icon={firefly}
               label="Firefly API - Firefly Services"
             />
-            <GetCredential.RequestAccess.RestrictedAccess.RestrictedAccessProducts.RestrictedAccessProduct
-              icon={ps}
-              label="Adobe Photoshop API - Firefly Services"
-            />
-            <GetCredential.RequestAccess.RestrictedAccess.RestrictedAccessProducts.RestrictedAccessProduct
+            <GetCredential.RequestAccess.RestrictedAccess.Products.Product
               icon={ps}
               label="Adobe Photoshop API - Firefly Services"
             />
-          </GetCredential.RequestAccess.RestrictedAccess.RestrictedAccessProducts>
+          </GetCredential.RequestAccess.RestrictedAccess.Products>
         </GetCredential.RequestAccess.RestrictedAccess>
         <GetCredential.RequestAccess.RequestAccessSide>
           <div style={{ display: "flex", gap: "32px", flexDirection: "column" }}>
diff --git a/yarn.lock b/yarn.lock
index 225ea83c..370f085b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -40,9 +40,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@adobe/gatsby-theme-aio@npm:4.11.15-rc3":
-  version: 4.11.15-rc3
-  resolution: "@adobe/gatsby-theme-aio@npm:4.11.15-rc3"
+"@adobe/gatsby-theme-aio@npm:4.11.15-rc4":
+  version: 4.11.15-rc4
+  resolution: "@adobe/gatsby-theme-aio@npm:4.11.15-rc4"
   dependencies:
     "@adobe/focus-ring-polyfill": ^0.1.5
     "@adobe/gatsby-source-github-file-contributors": ^0.3.1
@@ -138,7 +138,7 @@ __metadata:
     gatsby: ^4.22.0
     react: ^17.0.2
     react-dom: ^17.0.2
-  checksum: b958a5c6c0f7fb799c803aada20236474b827dc8eecd2d5d3b5864e8c3e63536c6afcf0a549236d83c67e29d67fd7efee8cdf5f436f434404b141752c7859c66
+  checksum: 9819edc08b9a3b86b8bac013466f9ebe529967121ea7a8107705e6ef8110ef665d93482b2f1e137a74c75c80374596acb8696a756f85534159a52919bd464d82
   languageName: node
   linkType: hard
 
@@ -8407,7 +8407,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "adobe-dev-console@workspace:."
   dependencies:
-    "@adobe/gatsby-theme-aio": 4.11.15-rc3
+    "@adobe/gatsby-theme-aio": 4.11.15-rc4
     "@adobe/react-spectrum": ^3.35.1
     gatsby: 4.22.0
     react: ^17.0.2