diff --git a/docs/docs-content/user-management/saml-sso/palette-sso-with-okta-saml.md b/docs/docs-content/user-management/saml-sso/palette-sso-with-okta-saml.md
new file mode 100644
index 0000000000..0ad75ce7d4
--- /dev/null
+++ b/docs/docs-content/user-management/saml-sso/palette-sso-with-okta-saml.md
@@ -0,0 +1,178 @@
+---
+sidebar_label: 'Palette SSO with Okta SAML'
+title: 'Enable SSO with Okta SAML'
+description: 'Set up Palette SSO with Okta SAML'
+icon: ""
+hide_table_of_contents: false
+sidebar_position: 30
+hiddenFromNav: false
+tags: ["user-management", "saml-sso", "okta"]
+---
+
+Single Sign-On (SSO) is an authentication method that enables users to log in to multiple applications and websites with one set of credentials. SSO uses certificates to establish and maintain a trust relationship between the Service Provider (SP) and an Identity Provider (IdP). Palette supports SSO based on either the Security Assertion Markup Language (SAML) or OpenID Connect (OIDC).
+
+The following steps will guide you on how to enable Palette SSO with [Okta Workforce Identity Cloud](https://www.okta.com/products/single-sign-on/) based on SAML.
+
+
+## Prerequisites
+
+- You need to have either a free or paid subscription with Okta. Okta provides free [developer subscriptions](https://developer.okta.com/signup/) for testing purposes.
+
+
+## Enablement
+
+### Create Teams in Palette
+
+This step is to create teams in Palette that will be used for Okta SAML, this will give them the appropriate permissions. For this example, you will create the `Okta Team` team and give it **Tenant Admin** permissions. You can repeat this for any other team that you configured with group claims.
+
+1. Open a web browser and navigate to your Palette subscription. Navigate to **Tenant Settings** --> **Users & Teams** --> **Teams** tab, and click **+ Create Team**.
+
+![Create Palette Team](/palette-sso-with-adfs-images/how-to_palette-sso-with-adfs_create-team.png)
+
+
+
+2. Specify `Okta Team` in the **Team name** field. You don't need to set any members now, as this will happen automatically from the SSO. Click **Confirm** to create the team.
+
+![Name Palette Team](/palette-sso-with-adfs-images/how-to_palette-sso-with-adfs_name-team.png)
+
+
+
+3. The list of teams displays again. Select the newly created **Okta Team** team to review its details. To give this team administrative access to the entire tenant and all the projects in it, assign the **Tenant Admin** role. Select **Tenant Roles** and click **+ Add Tenant Role**:
+
+![Palette Tenant Roles](/palette-sso-with-adfs-images/how-to_palette-sso-with-adfs_tenant-roles.png)
+
+
+
+4. Click on **Tenant Admin** to enable the role. Click **Confirm** to add the role.
+
+![Add Tenant Role](/palette-sso-with-adfs-images/how-to_palette-sso-with-adfs_add-tenant-role.png)
+
+
+
+You will receive a message stating **Roles have been updated**. Repeat this procedure for any other teams, taking care to ensure they are given the appropriate permissions.
+
+5. Click the **X** next to **Team Details** in the top left corner to exit this screen.
+
+### Create the Okta Application
+
+1. Log in to your Okta Admin console and navigate to **Applications** --> **Applications**. Click the **Create App Integration** button.
+
+
+
+ :::info
+
+ Your Okta login URL has the following format,
+ `https://{your-okta-account-id}-admin.okta.com/admin/getting-started`.
+ Replace `{your-okta-account-id}` with your Okta account ID.
+
+ :::
+
+
+
+2. In the screen that opens, select **SAML 2.0** for the sign-in method. Then click **Next**.
+
+
+
+ ![Create Okta Application](/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_create-application.png)
+
+
+
+1. The following screen allows you to configure the new App Integration. On the **App name** field, change the name from `My Web App` to `Spectro Cloud Palette SAML`. If desired, you can also upload a logo for the application.
+
+
+
+ ![Configure Okta General Settings](/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_general-settings.png)
+
+
+
+4. Open a web browser and navigate to your Palette subscription. Navigate to **Tenant Settings** --> **SSO** and click **SAML**. Click the button next to **Login URL** to copy the value to the clipboard.
+
+5. Set the value of **Service** to **Okta**.
+
+
+
+ ![Configure General SSO Settings](/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_palette-manage-sso-okta-saml.png)
+
+
+
+6. Switch back to your Okta Admin console and paste the copied value to the **Single sign-on URL** and **Audience URI (SP Entity ID)**.
+
+7. Specify values within **Attribute Statements** and **Group Attribute Statements** to link user values from Okta to SpectroCloud.
+
+Under **Attribute Statements (Optional)** specify the below values.
+
+| Name | Name Format | Value |
+| -- | -- | -- |
+| `FirstName` | `Unspecified` | `user.firstName` |
+| `LastName` | `Unspecified` | `user.lastName` |
+| `Email` | `Unspecified` | `user.email` |
+
+Under **Group Attribute Statements (Optional)** specify the below values.
+
+| Name | Name Format | Filter | Value |
+| -- | -- | -- | -- |
+| `SpectroTeam` | `Unspecified` | `Matches Regex` | Blank |
+
+
+
+ ![Configure Attribute Statements](/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_attribute-statements.png)
+
+
+
+8. Finish the creation of the application with default values.
+
+9. Once brought to main application page, copy the **Metadata URL**, open it up in a separate page, then copy of the contents of the XML.
+
+
+
+ ![Copy Okta SAML Metadata](/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_metadata-url.png)
+
+
+
+10. Go back to Palette SSO settings then paste the contents of the Okta SAML Metadata into **Identity Provider Metadata**.
+
+
+
+ ![Paste Metadata in Palette SSO Manager](/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_palette-manage-sso-okta-saml.png)
+
+
+
+11. Under **Default Teams**, search for then click the Palette team we created called **Okta Team**. This connects all Okta users with the team and the team permissions we set earlier.
+
+12. When all the information has been entered, click Enable to activate SSO. You will receive a message stating SAML configured successfully.
+
+### Validate
+
+1. Log in to Palette through SSO as an Okta user who is a member of the Okta application to verify SSO. If you are still logged into Palette with a non-SSO user, log out by selecting **Logout** in the **User Menu** at the top right.
+
+
+
+ ![User Logout](/oidc-okta-images/oidc-okta_user-logout.png)
+
+
+
+
+2. The Palette login screen now displays a **Sign in** button and no longer presents a username and password field. Below the **Sign In** button, there is an **SSO issues? --> Use your password** link. This link can be used to bypass SSO and log in with a local Palette account in case there is an issue with SSO and you need to access Palette without SSO. Click on the **Sign in** button to log in via SSO.
+
+
+
+ ![User SSO Login](/oidc-okta-images/oidc-okta_palette-login.png)
+
+
+
+3. If this is the first time you are logging in with SSO, you will be redirected to the Okta login page. Depending on your organization's SSO settings, this could be a simple login form or require MFA (Multi-Factor Authentication).
+
+
+
+4. You are now automatically added to the `Okta Team` team in Palette. To verify, navigate to the left **Main Menu**, select **Tenant Settings** --> **Users & Teams** --> **Teams** tab. Click on the **Okta Team** team and view the team members section.
+
+
+## Resources
+
+- [Okta Workforce Identity Cloud](https://www.okta.com/products/single-sign-on/)
+
+
+- [Palette User Management](../user-management.md)
+
+
+- [Palette SSO](saml-sso.md)
\ No newline at end of file
diff --git a/docs/docs-content/user-management/saml-sso/palette-sso-with-okta.md b/docs/docs-content/user-management/saml-sso/palette-sso-with-okta.md
index 9d98c69cd9..05ccdfc0d1 100644
--- a/docs/docs-content/user-management/saml-sso/palette-sso-with-okta.md
+++ b/docs/docs-content/user-management/saml-sso/palette-sso-with-okta.md
@@ -1,20 +1,15 @@
---
-sidebar_label: 'Palette SSO with Okta'
-title: 'Set up Palette SSO with Okta'
-description: 'Set up Palette SSO with Okta'
+sidebar_label: 'Palette SSO with Okta OIDC'
+title: 'Enable SSO with Okta OIDC'
+description: 'Set up Palette SSO with Okta OIDC'
icon: ""
hide_table_of_contents: false
sidebar_position: 30
hiddenFromNav: false
-tags: ["user-management", "saml-sso"]
+tags: ["user-management", "oidc-sso", "okta"]
---
-
-
-
-# Enable SSO with Okta
-
Single Sign-On (SSO) is an authentication method that enables users to log in to multiple applications and websites with one set of credentials. SSO uses certificates to establish and maintain a trust relationship between the Service Provider (SP) and an Identity Provider (IdP). Palette supports SSO based on either the Security Assertion Markup Language (SAML) or OpenID Connect (OIDC).
The following steps will guide you on how to enable Palette SSO with [Okta Workforce Identity Cloud](https://www.okta.com/products/single-sign-on/) based on OIDC.
@@ -28,8 +23,9 @@ The following steps will guide you on how to enable Palette SSO with [Okta Workf
- If you want to use the same Okta application for OIDC-based SSO into your Kubernetes cluster itself, you need to install [kubelogin](https://github.com/int128/kubelogin) on your local workstation to handle retrieval of access tokens for your cluster.
-## Enablement
-## Create the Okta Application
+## Okta with OIDC
+
+### Create the Okta Application
1. Log in to your Okta Admin console and navigate to **Applications** --> **Applications**. Click the **Create App Integration** button.
@@ -124,7 +120,7 @@ The following steps will guide you on how to enable Palette SSO with [Okta Workf
-## Create an Okta Authorization Server
+### Create an Okta Authorization Server
To ensure Okta issues OIDC tokens with the correct claims, you must create a custom Authorization Server. A custom Authorization Server is required to customize the authorization tokens issued by Okta so that they contain the necessary OIDC claims required by Palette and Kubernetes.
@@ -220,7 +216,7 @@ To ensure Okta issues OIDC tokens with the correct claims, you must create a cus
You have now completed all configuration steps in Okta.
-## Enable OIDC SSO in Palette
+### Enable OIDC SSO in Palette
22. Open a web browser and navigate to your [Palette](https://console.spectrocloud.com) subscription.
@@ -247,7 +243,8 @@ Navigate to **Tenant Settings** --> **SSO** and click on **OIDC**. Enter the fol
23. When all the information has been entered, click **Enable** to activate SSO. You will receive a message stating **OIDC configured successfully**.
-## Create Teams in Palette
+###
+ Create Teams in Palette
The remaining step is to create teams in Palette for the group that you allowed to be passed in the OIDC ticket in Okta, and give them the appropriate permissions. For this example, you will create the `palette-tenant-admins` team and give it **Tenant Admin** permissions. You can repeat this for any other team that you have a matching Okta group for.
@@ -290,7 +287,7 @@ You will receive a message stating **Roles have been updated**. Repeat this proc
You have now successfully configured Palette SSO based on OIDC with Okta.
-## Validate
+### Validate
1. Log in to Palette through SSO as a user that is a member of the `palette-tenant-admins` group in Okta to verify that users are automatically added to the `palette-tenant-admins` group in Palette. If you're still logged into Palette with a non-SSO user, log out by selecting **Logout** in the **User Drop-down Menu** at the top right.
@@ -325,6 +322,7 @@ You have now successfully configured Palette SSO based on OIDC with Okta.
+
## Resources
- [Okta Workforce Identity Cloud](https://www.okta.com/products/single-sign-on/)
@@ -333,4 +331,4 @@ You have now successfully configured Palette SSO based on OIDC with Okta.
- [Palette User Management](../user-management.md)
-- [Palette SSO](./saml-sso.md)
+- [Palette SSO](./saml-sso.md)
\ No newline at end of file
diff --git a/docs/docs-content/user-management/saml-sso/saml-sso.md b/docs/docs-content/user-management/saml-sso/saml-sso.md
index 2400d096f8..a627cf84d5 100644
--- a/docs/docs-content/user-management/saml-sso/saml-sso.md
+++ b/docs/docs-content/user-management/saml-sso/saml-sso.md
@@ -32,4 +32,7 @@ Enable SSO by following our [Enable SSO in Palette](enable-saml.md) guide.
- [Enable SSO with Microsoft Active Directory Federation Service (AD FS)](palette-sso-with-adfs.md)
-- [Palette SSO with Okta](palette-sso-with-okta.md)
+- [Palette SSO with Okta OIDC](palette-sso-with-okta.md)
+
+
+- [Palette SSO with Okta SAML](palette-sso-with-okta-saml.md)
diff --git a/static/assets/docs/images/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_attribute-statements.png b/static/assets/docs/images/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_attribute-statements.png
new file mode 100644
index 0000000000..a81d6964d4
Binary files /dev/null and b/static/assets/docs/images/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_attribute-statements.png differ
diff --git a/static/assets/docs/images/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_create-application.png b/static/assets/docs/images/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_create-application.png
new file mode 100644
index 0000000000..7c0b440546
Binary files /dev/null and b/static/assets/docs/images/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_create-application.png differ
diff --git a/static/assets/docs/images/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_general-settings.png b/static/assets/docs/images/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_general-settings.png
new file mode 100644
index 0000000000..ee1fd780e4
Binary files /dev/null and b/static/assets/docs/images/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_general-settings.png differ
diff --git a/static/assets/docs/images/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_metadata-url.png b/static/assets/docs/images/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_metadata-url.png
new file mode 100644
index 0000000000..ac2ccb0047
Binary files /dev/null and b/static/assets/docs/images/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_metadata-url.png differ
diff --git a/static/assets/docs/images/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_palette-manage-sso-okta-metadata.png b/static/assets/docs/images/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_palette-manage-sso-okta-metadata.png
new file mode 100644
index 0000000000..67c76bb657
Binary files /dev/null and b/static/assets/docs/images/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_palette-manage-sso-okta-metadata.png differ
diff --git a/static/assets/docs/images/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_palette-manage-sso-okta-saml.png b/static/assets/docs/images/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_palette-manage-sso-okta-saml.png
new file mode 100644
index 0000000000..55566462c0
Binary files /dev/null and b/static/assets/docs/images/saml-okta-images/user-management_saml-sso_palette-sso-with-okta-saml_palette-manage-sso-okta-saml.png differ