diff --git a/docs/auto-discovery/cloud-auto-discovery/aws-autodiscovery.mdx b/docs/auto-discovery/cloud-auto-discovery/aws-autodiscovery.mdx
index 6bf543f6b..9a4ed6961 100644
--- a/docs/auto-discovery/cloud-auto-discovery/aws-autodiscovery.mdx
+++ b/docs/auto-discovery/cloud-auto-discovery/aws-autodiscovery.mdx
@@ -70,7 +70,7 @@ For more information, see [Best Practices for Managing AWS Access Keys](https://
- Select **Discover Main Account** to discover the main AWS account in addition to any AWS Roles accounts you select.
- Select the **Available AWS Roles** for the account(s) you want to discover using the arrow to add them to the **Chosen AWS Roles** list.
-**Note:** See [Defining AWS Roles](#addedit-aws-roles) below for instructions on creating the AWS Roles that Devices42 displays for AWS cloud autodiscovery jobs.
+**Note:** See [Defining AWS Roles](#add-and-edit-aws-roles) below for instructions on creating the AWS Roles that Devices42 displays for AWS cloud autodiscovery jobs.
- Choose one or more Amazon regions to search.
diff --git a/docs/integration/external-integrations/jira-integrations/device42-jira-assets-integration.mdx b/docs/integration/external-integrations/jira-integrations/device42-jira-assets-integration.mdx
index 954aa6b8a..c78ca4a47 100644
--- a/docs/integration/external-integrations/jira-integrations/device42-jira-assets-integration.mdx
+++ b/docs/integration/external-integrations/jira-integrations/device42-jira-assets-integration.mdx
@@ -15,20 +15,43 @@ Support for the 'external' JSM Assets integration app [ended on December 30, 202
The instructions below describe the initial setup process of integrating Device42 with your JSM Cloud account.
+## Integrate Device42 and Jira Service Management
+
+With just a few minutes of setup, your Device42-Jira integration will allow you to link assets between the two systems.
+
### Prerequisites
This integration requires that you have:
-* admin privileges to a running Device42 virtual appliance
-* a Jira Service Management Cloud Premium or Enterprise account
+* Admin privileges to a running Device42 virtual appliance [Update your software](https://device42.com/update/) or [download a free trial](https://device42.com/download/).
+* A Jira Service Management Cloud Premium or Enterprise account.
+* A network setup that allows the browser to access `jsm.device42.io`. Ensure outbound communication is not blocked by WAF or other network and security controls.
+
+### Configure Cloud Services
+
+We'll start by preparing Device42 for cloud service integrations. Navigate to **Tools > Integrations > Cloud Services**, and complete the following fields:
+
+* **D42 URL for SaaS apps:** This is the hostname your Device42 instance is accessible on.
+* **Company Name:** Your company name.
+* **Email:** Your email address.
+
+
### Add an External Integration to Device42
Create an External Integration in Device42 by going to the **Tools > Integrations > External Integration** page. Click the **Create** button on the top left corner to open a form.
-Fill in the URL you chose when creating your Jira account and select **Insight in JSM Cloud** as the **Type**.
+- Fill in the URL you chose when creating your Jira account and select **Insight in JSM Cloud** as the **Type**.
+- Click **Save**
+- Copy the Device42 **Verification Token** from the External Integration.
-Copy the Device42 **Verification Token** from the External Integration.
+Note: The verification token changes after saving. Use the Token after saving the External Integration.
-### Add the Device42 Assets App to Jira
+ED NOTE: when does this happen?
+### Connect the Integration App with Device42
Install the [Device42 for Jira Service Management Assets](https://marketplace.atlassian.com/search?query=device42) app from the Atlassian Marketplace.
-Next, open the Device42 Insight Connect app and configure it by clicking on the **Settings** tab. In the "Device42 Cloud Connector" field type in `connect.device42.io`. Paste the verification token that you copied from the Device42 external integration into the "Device42 Verification Token" field. Click on the **Save** button.
+Next, open the Device42 Insight Connect app and configure it by clicking on the **Settings** tab.
+
+Navigate to the **Settings** tab and complete the two required fields.
+1. **Device42 Cloud Connector** Enter URL of the Device42 connector here, for example, `connect.device42.io`.
+2. **Device42 Verification Token** To get the verification token from your Device42 instance, follow these steps:
+ * In Device42, navigate to **Tools -> Integrations -> External integrations -> Add External integration**.
+ * Copy the token.
+ * Return to the app and paste the token into the verification token field.
+
+TODO: update/remove image

+Click the **Save** button and the app will attempt to connect to Device42.
+
A successful connection will display the green "Connection Enabled" status.

-See the [JSM solution guide](solution-guides/jira-service-management-integration.mdx) for information on connection statuses, using object schema imports, and setting user permissions.
+Following the app attempting to connect to Device42, the app displays one of six states:
+
+* Connection enabled.
+* Connection not enabled.
+* Credentials do not exist.
+* Error in verifying Device42 account.
+* Request URL not found.
+* An error occurred on Device42.
+
+## Connect the Device42 for Jira Service Management Assets App
+
+Install the Device42 for Jira Service Management Assets app and connect to Device42.
+
+1. From the Jira Administration page, go to the **Connected apps** page and select **View app details**.
+
+[Connected apps](/assets/images/jsm-assets-integration/connected-apps.png)
+
+2. Go to **App settings** > **Set access token**.
+
+[Set access token](/assets/images/jsm-assets-integration/set-access-token.png)
+
+3. Paste in the Device42 Verification Token from the External Integration.
+
+[Access token](/assets/images/jsm-assets-integration/access-token.png)
+
diff --git a/docs/solution-guides/jira-service-management-integration.mdx b/docs/solution-guides/jira-service-management-integration.mdx
index fb687f800..528bcda90 100644
--- a/docs/solution-guides/jira-service-management-integration.mdx
+++ b/docs/solution-guides/jira-service-management-integration.mdx
@@ -32,23 +32,6 @@ With just a few minutes of setup, your Device42-Jira integration will allow you
* Administrator privileges to a running Device42 virtual appliance. [Update your software](https://device42.com/update/) or [download a free trial](https://device42.com/download/).
* Administrator privileges to a JSM Cloud account.
-* A network setup that allows the browser to access `jsm.device42.io`. Ensure outbound communication is not blocked by WAF or other network and security controls.
-
-### Setting Up Device42
-
-We'll start by preparing Device42 for cloud service integrations. Navigate to **Tools > Integrations > Cloud Services**, and complete the following fields:
-
-* **D42 URL for SaaS apps:** This is the hostname your Device42 instance is accessible on.
-* **Company Name:** Your company name.
-* **Email:** Your email address.
-
-
Next, we'll set up a Jira integration. Navigate to **Tools > Integrations > External Integrations** and add a new external integration. Set the URL as the hostname for your Jira Cloud instance, like this:
@@ -60,6 +43,7 @@ Next, we'll set up a Jira integration. Navigate to **Tools > Integrations > Exte
}}
/>
+NOTE: This is deprecated, no more JSM app
### Installing the Device42 JSM App
The next step is to configure Jira.
@@ -80,6 +64,7 @@ Once you’ve entered your verification token in the Jira configuration and save

+ED NOTE: I suspect this feature is also deprecated and have not added it to the other page.
### Configuring Jira Issue Type Fields
Now we need to configure the Jira fields to use the data in Device42.
@@ -106,6 +91,9 @@ Click **View in Device42** to view the full details of the record in Device42.

+
+
+#TODO: verify if this is still a thing without the JSM Cloud integration app thing (without assets)
### Customizing Syncing Device42 Record Types with Jira
It's important to note that, by default, only a subset of Device42 information is synchronized with Jira. This is controlled by a DOQL query and is customizable. You can change the DOQL queries in your Jira integration settings in **Device42 at Tools > Integrations > External Integrations**:
@@ -149,7 +137,8 @@ Click the **Save** button and the app will attempt to connect to Device42.

-Following the app attempting to connect to Device42, the connection will display one of six states in the **Settings** tab:
+Following the a
+pp attempting to connect to Device42, the connection will display one of six states in the **Settings** tab:
* Connection enabled.
* Connection not enabled.
diff --git a/static/assets/images/jsm-assets-integration/access-token.png b/static/assets/images/jsm-assets-integration/access-token.png
new file mode 100644
index 000000000..1ba624fa9
Binary files /dev/null and b/static/assets/images/jsm-assets-integration/access-token.png differ
diff --git a/static/assets/images/jsm-assets-integration/connected-apps.png b/static/assets/images/jsm-assets-integration/connected-apps.png
new file mode 100644
index 000000000..6044a9d9a
Binary files /dev/null and b/static/assets/images/jsm-assets-integration/connected-apps.png differ
diff --git a/static/assets/images/jsm-assets-integration/set-access-token.png b/static/assets/images/jsm-assets-integration/set-access-token.png
new file mode 100644
index 000000000..a29fe3c4d
Binary files /dev/null and b/static/assets/images/jsm-assets-integration/set-access-token.png differ