diff --git a/ee/get-support.md b/ee/get-support.md
index 5a5ae87388..8c7e921e10 100644
--- a/ee/get-support.md
+++ b/ee/get-support.md
@@ -23,7 +23,7 @@ support dump:
 
 1. Log into the UCP web UI with an administrator account.
 2. In the top-left menu, click your username and choose
-   **Download Logs**.
+   **Support Dump**. It may take a few minutes for the download to complete.
 
 ![](images/get-support-1.png){: .with-border}
 
diff --git a/ee/images/docker-ee-overview-1.png b/ee/images/docker-ee-overview-1.png
index deb29c4574..87219c3988 100644
Binary files a/ee/images/docker-ee-overview-1.png and b/ee/images/docker-ee-overview-1.png differ
diff --git a/ee/images/docker-ee-overview-2.png b/ee/images/docker-ee-overview-2.png
index 9cdea63566..c9587d0a7a 100644
Binary files a/ee/images/docker-ee-overview-2.png and b/ee/images/docker-ee-overview-2.png differ
diff --git a/ee/images/try-ddc-1.png b/ee/images/try-ddc-1.png
index 8e90691454..e53149b17a 100644
Binary files a/ee/images/try-ddc-1.png and b/ee/images/try-ddc-1.png differ
diff --git a/ee/images/try-ddc-2.png b/ee/images/try-ddc-2.png
index f4d9fa16e4..0b00904607 100644
Binary files a/ee/images/try-ddc-2.png and b/ee/images/try-ddc-2.png differ
diff --git a/ee/images/try-ddc-3.png b/ee/images/try-ddc-3.png
index bd74c0e7d4..d6237294b9 100644
Binary files a/ee/images/try-ddc-3.png and b/ee/images/try-ddc-3.png differ
diff --git a/ee/ucp/admin/configure/add-labels-to-cluster-nodes.md b/ee/ucp/admin/configure/add-labels-to-cluster-nodes.md
index f63bd38154..036fb92565 100644
--- a/ee/ucp/admin/configure/add-labels-to-cluster-nodes.md
+++ b/ee/ucp/admin/configure/add-labels-to-cluster-nodes.md
@@ -1,6 +1,6 @@
 ---
-title: Add labels to swarm nodes
-description: Learn how to add metadata to swarm nodes that can be used to specify constraints when deploying services.
+title: Add labels to cluster nodes
+description: Learn how to add metadata to cluster nodes that can be used to specify constraints when deploying services.
 keywords: cluster, node, label, swarm, metadata
 ---
 
@@ -52,12 +52,13 @@ scheduled only on a node that has a label that fulfills all of the constraints
 you specify.
 
 In this example, when users deploy a service, they can add a constraint for the
-service to be scheduled only on nodes that have SSD storage.
+service to be scheduled only on nodes that have SSD storage:
+`node.labels.disk == ssd`.
 
 Navigate to the **Stacks** page. Name the new stack "wordpress", and in the
-**Mode** dropdown, check **Services**.
+**Mode** dropdown, check **Swarm Services**.
 
-In the **Compose.yml** editor, paste the following stack file.
+In the **docker-compose.yml** editor, paste the following stack file.
 
 ```
 version: "3.1"
@@ -120,7 +121,7 @@ WordPress containers scheduled on the node. Dismiss the filter.
 
 ## Add a constraint to a service by using the UCP web UI
 
-You can declare the deployment constraints in your docker-stack.yml file or
+You can declare the deployment constraints in your docker-compose.yml file or
 when you're creating a stack. Also, you can apply them when you're creating
 a service.
 
@@ -128,8 +129,9 @@ To check if a service has deployment constraints, navigate to the
 **Services** page and choose the service that you want to check.
 In the details pane, click **Constraints** to list the constraint labels.
 
-To edit the labels on the service, click **Configure** and select
-**Environment**. 
+To edit the constraints on the service, click **Configure** and select
+**Details** to open the **Update Service** page. Click **Scheduling** to
+view the constraints. 
 
 ![](../../images/add-constraint-to-service.png)
 
diff --git a/ee/ucp/admin/configure/add-sans-to-cluster.md b/ee/ucp/admin/configure/add-sans-to-cluster.md
index 7415b8150e..00726d3166 100644
--- a/ee/ucp/admin/configure/add-sans-to-cluster.md
+++ b/ee/ucp/admin/configure/add-sans-to-cluster.md
@@ -24,15 +24,16 @@ also add them after installation.
 
 1.  In the UCP web UI, log in with administrator credentials and navigate to
     the **Nodes** page.
-2.  Click on a manager node, and in the details pane, click **Configure**. 
+2.  Click on a manager node, and in the details pane, click **Configure** and 
+    select **Details**. 
 3.  In the **SANs** section, click **Add SAN**, and enter one or more SANs
     for the cluster.
     ![](../../images/add-sans-to-cluster-1.png){: .with-border}
 4.  Once you're done, click **Save**.
 
-You will have to do this on every manager node in the cluster, but once you
-have done so, the SANs are applied automatically to any new manager nodes
-that join the cluster.
+You will have to do this on every existsing manager node in the cluster,
+but once you have done so, the SANs are applied automatically to any new
+manager nodes that join the cluster.
 
 You can also do this from the CLI by first running:
 
diff --git a/ee/ucp/admin/configure/external-auth/index.md b/ee/ucp/admin/configure/external-auth/index.md
index 964852d0d2..6404ab2d50 100644
--- a/ee/ucp/admin/configure/external-auth/index.md
+++ b/ee/ucp/admin/configure/external-auth/index.md
@@ -156,7 +156,7 @@ Click **Confirm** to add your LDAP domain.
 | Full name attribute                      | The LDAP attribute to use as the user's full name for display purposes. If left empty, UCP will not create new users with a full name value.                                                                                                                                                                                                                                                                                                                                                                                                                                                  |                                        |
 | Filter                                   | The LDAP search filter used to find users. If you leave this field empty, all directory entries in the search scope with valid username attributes are created as users.                                                                                                                                                                                                                                                                                                                                                                                                                      |                                        |
 | Search subtree instead of just one level | Whether to perform the LDAP search on a single level of the LDAP tree, or search through the full LDAP tree starting at the Base DN.                                                                                                                                                                                                                                                                                                                                                                                                                                                          |                                        |
-| Select Group Members                     | Whether to further filter users by selecting those who are also members of a specific group on the directory server. This feature is helpful if the LDAP server does not support `memberOf` search filters.                                                                                                                                                                                                                                                                                                                                                                                   |                                        |
+| Match Group Members                     | Whether to further filter users by selecting those who are also members of a specific group on the directory server. This feature is helpful if the LDAP server does not support `memberOf` search filters.                                                                                                                                                                                                                                                                                                                                                                                   |                                        |
 | Iterate through group members            | If `Select Group Members` is selected, this option searches for users by first iterating over the target group's membership, making a separate LDAP query for each member. as opposed to first querying for all users which match the above search query and intersecting those with the set of group members. This option can be more efficient in situations where the number of members of the target group is significantly smaller than the number of users which would match the above search filter, or if your directory server does not support simple pagination of search results. |                                        |
 | Group DN                                 | If `Select Group Members` is selected, this specifies the distinguished name of the group from which to select users.                                                                                                                                                                                                                                                                                                                                                                                                                                                                         |                                        |
 | Group Member Attribute                   | If `Select Group Members` is selected, the value of this group attribute corresponds to the distinguished names of the members of the group.                                                                                                                                                                                                                                                                                                                                                                                                                                                  |                                        |
diff --git a/ee/ucp/admin/configure/run-only-the-images-you-trust.md b/ee/ucp/admin/configure/run-only-the-images-you-trust.md
index df157e3bdb..ab805997de 100644
--- a/ee/ucp/admin/configure/run-only-the-images-you-trust.md
+++ b/ee/ucp/admin/configure/run-only-the-images-you-trust.md
@@ -42,14 +42,8 @@ applications if they use images you trust.
 With this setting, UCP allows deploying any image as long as the image has
 been signed. It doesn't matter who signed the image.
 
-To enforce that the image needs to be signed by specific teams, click the
-dropdown and select those teams from the list.
-
-> Team must be in docker-datacenter
->
-> You need to select a team that's part of the `docker-datacenter` organization
-> in order to use this feature.
-{: .important}
+To enforce that the image needs to be signed by specific teams, click **Add Team**
+and select those teams from the list.
 
 ![UCP settings](../../images/run-only-the-images-you-trust-3.png){: .with-border}
 
diff --git a/ee/ucp/admin/configure/set-orchestrator-type.md b/ee/ucp/admin/configure/set-orchestrator-type.md
index 15144a5630..4d1086afc0 100644
--- a/ee/ucp/admin/configure/set-orchestrator-type.md
+++ b/ee/ucp/admin/configure/set-orchestrator-type.md
@@ -29,7 +29,8 @@ Change a node's orchestrator type on the **Edit node** page:
 1.  Log in to the Docker EE web UI with an administrator account.
 2.  Navigate to the **Nodes** page, and click the node that you want to assign
     to a different orchestrator.
-3.  In the details pane, click **Configure** to open the **Edit node** page.
+3.  In the details pane, click **Configure** and select **Details** to open
+    the **Edit node** page.
 4.  In the **Orchestrator properties** section, click the orchestrator type
     for the node.
 5.  Click **Save** to assign the node to the selected orchestrator.
diff --git a/ee/ucp/admin/configure/set-session-timeout.md b/ee/ucp/admin/configure/set-session-timeout.md
index 2a8e01cd72..19d6cb9375 100644
--- a/ee/ucp/admin/configure/set-session-timeout.md
+++ b/ee/ucp/admin/configure/set-session-timeout.md
@@ -16,6 +16,6 @@ To configure UCP login sessions, go to the UCP web UI, navigate to the
 
 |          Field          |                                                                                                                                                                                                                                             Description                                                                                                                                                                                                                                             |
 | :---------------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Lifetime Hours          | The initial lifetime of a login session, from the time UCP generates it. When this time expires, UCP invalidates the session, and the user must authenticate again to establish a new session. The default is 72 hours.                                                                                                                                                                                                                                                                             |
-| Renewal Threshold Hours | The time before session expiration when UCP extends an active session. UCP extends the session by the number of hours specified in **Lifetime Hours**. The threshold value can't be greater than **Lifetime Hours**. The default is 24 hours. To specify that sessions are extended with every use, set the threshold equal to the lifetime. To specify that sessions are never extended, set the threshold to zero. This may cause users to be logged out unexpectedly while using the UCP web UI. |
+| Lifetime Minutes          | The initial lifetime of a login session, from the time UCP generates it. When this time expires, UCP invalidates the session, and the user must authenticate again to establish a new session. The default is 4320 minutes, which is 72 hours.                                                                                                                                                                                                                                                                             |
+| Renewal Threshold Minutes | The time before session expiration when UCP extends an active session. UCP extends the session by the number of hours specified in **Lifetime Hours**. The threshold value can't be greater than **Lifetime Hours**. The default is 1440 minutes, which is 24 hours. To specify that sessions are extended with every use, set the threshold equal to the lifetime. To specify that sessions are never extended, set the threshold to zero. This may cause users to be logged out unexpectedly while using the UCP web UI. |
 | Per User Limit          | The maximum number of simultaneous logins for a user. If creating a new session exceeds this limit, UCP deletes the least recently used session. To disable the limit, set the value to zero.                                                                                                                                                                                                                                                                                                       |
diff --git a/ee/ucp/admin/configure/store-logs-in-an-external-system.md b/ee/ucp/admin/configure/store-logs-in-an-external-system.md
index d4c5b354aa..95175442f3 100644
--- a/ee/ucp/admin/configure/store-logs-in-an-external-system.md
+++ b/ee/ucp/admin/configure/store-logs-in-an-external-system.md
@@ -10,7 +10,7 @@ You can configure UCP for sending logs to a remote logging service:
 1. Log in to UCP with an administrator account.
 2. Navigate to the **Admin Settings** page.
 3. Set the information about your logging server, and click
-   **Enable Remote Logging**.
+   **Save**.
 
 ![](../../images/configure-logs-1.png){: .with-border}
 
diff --git a/ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-with-logs.md b/ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-with-logs.md
index 93ab9fd0f5..0566ce7a35 100644
--- a/ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-with-logs.md
+++ b/ee/ucp/admin/monitor-and-troubleshoot/troubleshoot-with-logs.md
@@ -13,8 +13,8 @@ see information about UCP system containers.
 
 To see the logs of the UCP system containers, navigate to the **Containers**
 page of UCP. By default, the UCP system containers are hidden. Click
-**Settings** and check **Show system containers** for the UCP system containers
-to be listed as well.
+the Settings icon and check **Show system resources** for the UCP system
+containers to be listed as well.
 
 ![](../../images/troubleshoot-with-logs-1.png){: .with-border}
 
diff --git a/ee/ucp/authorization/create-users-and-teams-manually.md b/ee/ucp/authorization/create-users-and-teams-manually.md
index 417fe66450..3e50436b91 100644
--- a/ee/ucp/authorization/create-users-and-teams-manually.md
+++ b/ee/ucp/authorization/create-users-and-teams-manually.md
@@ -77,7 +77,8 @@ To manually create users in UCP:
 2. Click **Create User**.
 3. Input username, password, and full name.
 4. Click **Create**.
-5. [optional] Check "Is a Docker EE Admin".
+5. Optionally, check "Is a Docker EE Admin" to give the user administrator 
+   privileges.
 
 > A `Docker EE Admin` can grant users permission to change the cluster
 > configuration and manage grants, roles, and resource sets.
diff --git a/ee/ucp/authorization/migrate-kubernetes-roles.md b/ee/ucp/authorization/migrate-kubernetes-roles.md
index e5d8cebdf1..5c7b4530fd 100644
--- a/ee/ucp/authorization/migrate-kubernetes-roles.md
+++ b/ee/ucp/authorization/migrate-kubernetes-roles.md
@@ -98,7 +98,7 @@ UCP web UI.
 3.  In the **Type** section, click **Namespaces** and ensure that **default** is selected.
 4.  In the left pane, click **Roles**, and in the **Role** dropdown, select **pod-reader**.
 5.  In the left pane, click **Subjects**, and click **All Users**.
-6.  In the **Users** dropdown, select **jane**.
+6.  In the **User** dropdown, select **jane**.
 7.  Click **Create**. 
 
 ![](../images/migrate-kubernetes-roles-2.png){: .with-border}
diff --git a/ee/ucp/authorization/reset-user-password.md b/ee/ucp/authorization/reset-user-password.md
index 0732a05171..2248df02d6 100644
--- a/ee/ucp/authorization/reset-user-password.md
+++ b/ee/ucp/authorization/reset-user-password.md
@@ -9,8 +9,8 @@ Docker EE administrators can reset user passwords managed in UCP:
 1. Log in to UCP with administrator credentials.
 2. Click **Users** under **User Management**.
 3. Select the user whose password you want to change.
-4. Select **Configure > Security**.
-5. Enter the new password, confirm, and **Save**.
+4. Select **Configure** and select **Security**.
+5. Enter the new password, confirm, and click **Update Password**.
 
 Users passwords managed with an LDAP service must be changed on the LDAP server.
 
diff --git a/ee/ucp/images/add-constraint-to-service.png b/ee/ucp/images/add-constraint-to-service.png
index 8c934ae73b..45331b548b 100644
Binary files a/ee/ucp/images/add-constraint-to-service.png and b/ee/ucp/images/add-constraint-to-service.png differ
diff --git a/ee/ucp/images/add-labels-to-cluster-nodes-2.png b/ee/ucp/images/add-labels-to-cluster-nodes-2.png
index 2c0fa4d066..1cffa9c320 100644
Binary files a/ee/ucp/images/add-labels-to-cluster-nodes-2.png and b/ee/ucp/images/add-labels-to-cluster-nodes-2.png differ
diff --git a/ee/ucp/images/add-node-ucp.png b/ee/ucp/images/add-node-ucp.png
index b987c583dd..5e6b28bb2a 100644
Binary files a/ee/ucp/images/add-node-ucp.png and b/ee/ucp/images/add-node-ucp.png differ
diff --git a/ee/ucp/images/add-sans-to-cluster-1.png b/ee/ucp/images/add-sans-to-cluster-1.png
index b1ee53c00a..b775768ee6 100644
Binary files a/ee/ucp/images/add-sans-to-cluster-1.png and b/ee/ucp/images/add-sans-to-cluster-1.png differ
diff --git a/ee/ucp/images/authentication-authorization.png b/ee/ucp/images/authentication-authorization.png
index 32e65e51be..6986edd6a9 100644
Binary files a/ee/ucp/images/authentication-authorization.png and b/ee/ucp/images/authentication-authorization.png differ
diff --git a/ee/ucp/images/change-orchestrator-for-node-1.png b/ee/ucp/images/change-orchestrator-for-node-1.png
index f5c79d9673..d625a5cd8e 100644
Binary files a/ee/ucp/images/change-orchestrator-for-node-1.png and b/ee/ucp/images/change-orchestrator-for-node-1.png differ
diff --git a/ee/ucp/images/cli-based-access-1.png b/ee/ucp/images/cli-based-access-1.png
index e4c977f4f4..57452b631a 100644
Binary files a/ee/ucp/images/cli-based-access-1.png and b/ee/ucp/images/cli-based-access-1.png differ
diff --git a/ee/ucp/images/cli-based-access-2.png b/ee/ucp/images/cli-based-access-2.png
index d66c8237fe..c4067603d9 100644
Binary files a/ee/ucp/images/cli-based-access-2.png and b/ee/ucp/images/cli-based-access-2.png differ
diff --git a/ee/ucp/images/cli-based-access-3.png b/ee/ucp/images/cli-based-access-3.png
index dc3ae086a6..5d274e7207 100644
Binary files a/ee/ucp/images/cli-based-access-3.png and b/ee/ucp/images/cli-based-access-3.png differ
diff --git a/ee/ucp/images/configure-logs-1.png b/ee/ucp/images/configure-logs-1.png
index c32ba9cd2c..7621118ed8 100644
Binary files a/ee/ucp/images/configure-logs-1.png and b/ee/ucp/images/configure-logs-1.png differ
diff --git a/ee/ucp/images/create-service-account-1.png b/ee/ucp/images/create-service-account-1.png
index 889d0d3d07..e850b04384 100644
Binary files a/ee/ucp/images/create-service-account-1.png and b/ee/ucp/images/create-service-account-1.png differ
diff --git a/ee/ucp/images/create-service-account-2.png b/ee/ucp/images/create-service-account-2.png
index 28287257d1..278ed3da9b 100644
Binary files a/ee/ucp/images/create-service-account-2.png and b/ee/ucp/images/create-service-account-2.png differ
diff --git a/ee/ucp/images/create-service-account-3.png b/ee/ucp/images/create-service-account-3.png
index e6b64f7852..f1bba1a46a 100644
Binary files a/ee/ucp/images/create-service-account-3.png and b/ee/ucp/images/create-service-account-3.png differ
diff --git a/ee/ucp/images/custom-role-30.png b/ee/ucp/images/custom-role-30.png
index 59f9973872..6143991782 100644
Binary files a/ee/ucp/images/custom-role-30.png and b/ee/ucp/images/custom-role-30.png differ
diff --git a/ee/ucp/images/deploy-a-service-1.png b/ee/ucp/images/deploy-a-service-1.png
index 0aab01c513..31698ddc28 100644
Binary files a/ee/ucp/images/deploy-a-service-1.png and b/ee/ucp/images/deploy-a-service-1.png differ
diff --git a/ee/ucp/images/deploy-a-service-2.png b/ee/ucp/images/deploy-a-service-2.png
index ba8cbffd52..3e6fd7fcd0 100644
Binary files a/ee/ucp/images/deploy-a-service-2.png and b/ee/ucp/images/deploy-a-service-2.png differ
diff --git a/ee/ucp/images/deploy-a-service-3.png b/ee/ucp/images/deploy-a-service-3.png
new file mode 100644
index 0000000000..f886770245
Binary files /dev/null and b/ee/ucp/images/deploy-a-service-3.png differ
diff --git a/ee/ucp/images/deploy-a-service-4.png b/ee/ucp/images/deploy-a-service-4.png
index af6324524b..a2f2b0c1c9 100644
Binary files a/ee/ucp/images/deploy-a-service-4.png and b/ee/ucp/images/deploy-a-service-4.png differ
diff --git a/ee/ucp/images/deploy-a-service-5.png b/ee/ucp/images/deploy-a-service-5.png
new file mode 100644
index 0000000000..8e465aa42f
Binary files /dev/null and b/ee/ucp/images/deploy-a-service-5.png differ
diff --git a/ee/ucp/images/deploy-stack-to-collection-1.png b/ee/ucp/images/deploy-stack-to-collection-1.png
new file mode 100644
index 0000000000..06ee08c838
Binary files /dev/null and b/ee/ucp/images/deploy-stack-to-collection-1.png differ
diff --git a/ee/ucp/images/deploy-stack-to-collection-2.png b/ee/ucp/images/deploy-stack-to-collection-2.png
new file mode 100644
index 0000000000..6741c4fd46
Binary files /dev/null and b/ee/ucp/images/deploy-stack-to-collection-2.png differ
diff --git a/ee/ucp/images/deploy-stack-to-collection.png b/ee/ucp/images/deploy-stack-to-collection.png
deleted file mode 100644
index 06e70f9c06..0000000000
Binary files a/ee/ucp/images/deploy-stack-to-collection.png and /dev/null differ
diff --git a/ee/ucp/images/isolate-nodes-1.png b/ee/ucp/images/isolate-nodes-1.png
index 66c5cd6acd..d9558ca34a 100644
Binary files a/ee/ucp/images/isolate-nodes-1.png and b/ee/ucp/images/isolate-nodes-1.png differ
diff --git a/ee/ucp/images/join-nodes-to-cluster-1.png b/ee/ucp/images/join-nodes-to-cluster-1.png
index e3162f478c..c522d4d64d 100644
Binary files a/ee/ucp/images/join-nodes-to-cluster-1.png and b/ee/ucp/images/join-nodes-to-cluster-1.png differ
diff --git a/ee/ucp/images/join-nodes-to-cluster-2.png b/ee/ucp/images/join-nodes-to-cluster-2.png
index 78f487e51e..7e07794d2e 100644
Binary files a/ee/ucp/images/join-nodes-to-cluster-2.png and b/ee/ucp/images/join-nodes-to-cluster-2.png differ
diff --git a/ee/ucp/images/join-nodes-to-cluster-3.png b/ee/ucp/images/join-nodes-to-cluster-3.png
index cec0e87211..b2a475e2b5 100644
Binary files a/ee/ucp/images/join-nodes-to-cluster-3.png and b/ee/ucp/images/join-nodes-to-cluster-3.png differ
diff --git a/ee/ucp/images/join-windows-nodes-to-cluster-1.png b/ee/ucp/images/join-windows-nodes-to-cluster-1.png
index 31eeb344c1..3519ffb121 100644
Binary files a/ee/ucp/images/join-windows-nodes-to-cluster-1.png and b/ee/ucp/images/join-windows-nodes-to-cluster-1.png differ
diff --git a/ee/ucp/images/ldap-integration-1.png b/ee/ucp/images/ldap-integration-1.png
index f934ac0b05..706bd1e7e5 100644
Binary files a/ee/ucp/images/ldap-integration-1.png and b/ee/ucp/images/ldap-integration-1.png differ
diff --git a/ee/ucp/images/ldap-integration-2.png b/ee/ucp/images/ldap-integration-2.png
index ffc73081fb..8a150fa037 100644
Binary files a/ee/ucp/images/ldap-integration-2.png and b/ee/ucp/images/ldap-integration-2.png differ
diff --git a/ee/ucp/images/license-ucp-1.png b/ee/ucp/images/license-ucp-1.png
index d38973b24d..ddd871f7a4 100644
Binary files a/ee/ucp/images/license-ucp-1.png and b/ee/ucp/images/license-ucp-1.png differ
diff --git a/ee/ucp/images/license-ucp-2.png b/ee/ucp/images/license-ucp-2.png
index 3b60406134..dccb3f7c36 100644
Binary files a/ee/ucp/images/license-ucp-2.png and b/ee/ucp/images/license-ucp-2.png differ
diff --git a/ee/ucp/images/manage-secrets-1.png b/ee/ucp/images/manage-secrets-1.png
index c248fa8083..e7df70e6da 100755
Binary files a/ee/ucp/images/manage-secrets-1.png and b/ee/ucp/images/manage-secrets-1.png differ
diff --git a/ee/ucp/images/manage-secrets-2.png b/ee/ucp/images/manage-secrets-2.png
index 05e83bc8a0..9914f9b413 100755
Binary files a/ee/ucp/images/manage-secrets-2.png and b/ee/ucp/images/manage-secrets-2.png differ
diff --git a/ee/ucp/images/manage-secrets-3.png b/ee/ucp/images/manage-secrets-3.png
index a7024e9489..1a766d6d5b 100755
Binary files a/ee/ucp/images/manage-secrets-3.png and b/ee/ucp/images/manage-secrets-3.png differ
diff --git a/ee/ucp/images/manage-secrets-4.png b/ee/ucp/images/manage-secrets-4.png
index f74bd6b6ef..fbc5183c5f 100755
Binary files a/ee/ucp/images/manage-secrets-4.png and b/ee/ucp/images/manage-secrets-4.png differ
diff --git a/ee/ucp/images/manage-secrets-4a.png b/ee/ucp/images/manage-secrets-4a.png
new file mode 100644
index 0000000000..adb5d85db2
Binary files /dev/null and b/ee/ucp/images/manage-secrets-4a.png differ
diff --git a/ee/ucp/images/manage-secrets-5.png b/ee/ucp/images/manage-secrets-5.png
index 03ad09079a..99976bea0f 100755
Binary files a/ee/ucp/images/manage-secrets-5.png and b/ee/ucp/images/manage-secrets-5.png differ
diff --git a/ee/ucp/images/migrate-kubernetes-roles-1.png b/ee/ucp/images/migrate-kubernetes-roles-1.png
index 2c26f996b1..3bb600c12f 100644
Binary files a/ee/ucp/images/migrate-kubernetes-roles-1.png and b/ee/ucp/images/migrate-kubernetes-roles-1.png differ
diff --git a/ee/ucp/images/migrate-kubernetes-roles-2.png b/ee/ucp/images/migrate-kubernetes-roles-2.png
index 56526bfb45..d609ab7f76 100644
Binary files a/ee/ucp/images/migrate-kubernetes-roles-2.png and b/ee/ucp/images/migrate-kubernetes-roles-2.png differ
diff --git a/ee/ucp/images/monitor-ucp-0.png b/ee/ucp/images/monitor-ucp-0.png
index 2a2311571f..e0a971b22c 100644
Binary files a/ee/ucp/images/monitor-ucp-0.png and b/ee/ucp/images/monitor-ucp-0.png differ
diff --git a/ee/ucp/images/monitor-ucp-1.png b/ee/ucp/images/monitor-ucp-1.png
index b26503a704..df52318960 100644
Binary files a/ee/ucp/images/monitor-ucp-1.png and b/ee/ucp/images/monitor-ucp-1.png differ
diff --git a/ee/ucp/images/nodes-page-ucp.png b/ee/ucp/images/nodes-page-ucp.png
index 59efe0289d..5d1f9d8c00 100644
Binary files a/ee/ucp/images/nodes-page-ucp.png and b/ee/ucp/images/nodes-page-ucp.png differ
diff --git a/ee/ucp/images/overview-1.png b/ee/ucp/images/overview-1.png
index 871ddde631..7bb908139f 100644
Binary files a/ee/ucp/images/overview-1.png and b/ee/ucp/images/overview-1.png differ
diff --git a/ee/ucp/images/overview-2.png b/ee/ucp/images/overview-2.png
index f4d9fa16e4..22261dd985 100644
Binary files a/ee/ucp/images/overview-2.png and b/ee/ucp/images/overview-2.png differ
diff --git a/ee/ucp/images/overview-3.png b/ee/ucp/images/overview-3.png
index a99470efb0..b15bd322fc 100644
Binary files a/ee/ucp/images/overview-3.png and b/ee/ucp/images/overview-3.png differ
diff --git a/ee/ucp/images/recover-a-user-password-1.png b/ee/ucp/images/recover-a-user-password-1.png
index 3f4ef51f7f..4b7ac8b950 100644
Binary files a/ee/ucp/images/recover-a-user-password-1.png and b/ee/ucp/images/recover-a-user-password-1.png differ
diff --git a/ee/ucp/images/restrict-services-to-worker-nodes-1.png b/ee/ucp/images/restrict-services-to-worker-nodes-1.png
index f6bfc289f9..70c3382297 100644
Binary files a/ee/ucp/images/restrict-services-to-worker-nodes-1.png and b/ee/ucp/images/restrict-services-to-worker-nodes-1.png differ
diff --git a/ee/ucp/images/run-only-the-images-you-trust-2.png b/ee/ucp/images/run-only-the-images-you-trust-2.png
index dbb8acc175..104cc8a2d1 100644
Binary files a/ee/ucp/images/run-only-the-images-you-trust-2.png and b/ee/ucp/images/run-only-the-images-you-trust-2.png differ
diff --git a/ee/ucp/images/run-only-the-images-you-trust-3.png b/ee/ucp/images/run-only-the-images-you-trust-3.png
index 48e26b3dfa..03942bbe1a 100644
Binary files a/ee/ucp/images/run-only-the-images-you-trust-3.png and b/ee/ucp/images/run-only-the-images-you-trust-3.png differ
diff --git a/ee/ucp/images/troubleshoot-with-logs-1.png b/ee/ucp/images/troubleshoot-with-logs-1.png
index 5e81aaf8cd..136e702b73 100644
Binary files a/ee/ucp/images/troubleshoot-with-logs-1.png and b/ee/ucp/images/troubleshoot-with-logs-1.png differ
diff --git a/ee/ucp/images/troubleshoot-with-logs-2.png b/ee/ucp/images/troubleshoot-with-logs-2.png
index c32ba9cd2c..bb1af8fc70 100644
Binary files a/ee/ucp/images/troubleshoot-with-logs-2.png and b/ee/ucp/images/troubleshoot-with-logs-2.png differ
diff --git a/ee/ucp/images/ucp_usermgmt_users_create01.png b/ee/ucp/images/ucp_usermgmt_users_create01.png
index e28792bdbf..685c9d8c92 100644
Binary files a/ee/ucp/images/ucp_usermgmt_users_create01.png and b/ee/ucp/images/ucp_usermgmt_users_create01.png differ
diff --git a/ee/ucp/images/ucp_usermgmt_users_create02.png b/ee/ucp/images/ucp_usermgmt_users_create02.png
index 4c3533bd81..936dae2e59 100644
Binary files a/ee/ucp/images/ucp_usermgmt_users_create02.png and b/ee/ucp/images/ucp_usermgmt_users_create02.png differ
diff --git a/ee/ucp/images/use-constraints-in-stack-deployment-2.png b/ee/ucp/images/use-constraints-in-stack-deployment-2.png
index 67b0e5d299..3d58cd0675 100644
Binary files a/ee/ucp/images/use-constraints-in-stack-deployment-2.png and b/ee/ucp/images/use-constraints-in-stack-deployment-2.png differ
diff --git a/ee/ucp/images/use-constraints-in-stack-deployment.png b/ee/ucp/images/use-constraints-in-stack-deployment.png
index 0c041d16c2..358d15996b 100644
Binary files a/ee/ucp/images/use-constraints-in-stack-deployment.png and b/ee/ucp/images/use-constraints-in-stack-deployment.png differ
diff --git a/ee/ucp/images/use-externally-signed-certs-2.png b/ee/ucp/images/use-externally-signed-certs-2.png
index 071cd1e10b..b08d65659b 100644
Binary files a/ee/ucp/images/use-externally-signed-certs-2.png and b/ee/ucp/images/use-externally-signed-certs-2.png differ
diff --git a/ee/ucp/images/web-based-access-1.png b/ee/ucp/images/web-based-access-1.png
index 871ddde631..fb7304147d 100644
Binary files a/ee/ucp/images/web-based-access-1.png and b/ee/ucp/images/web-based-access-1.png differ
diff --git a/ee/ucp/images/web-based-access-2.png b/ee/ucp/images/web-based-access-2.png
index 65313e945a..00437d1c22 100644
Binary files a/ee/ucp/images/web-based-access-2.png and b/ee/ucp/images/web-based-access-2.png differ
diff --git a/ee/ucp/kubernetes/create-service-account.md b/ee/ucp/kubernetes/create-service-account.md
index 859d96c827..3e7336fd62 100644
--- a/ee/ucp/kubernetes/create-service-account.md
+++ b/ee/ucp/kubernetes/create-service-account.md
@@ -36,13 +36,16 @@ account.
 
     ![](../images/create-service-account-1.png){: .with-border}
 
+5.  Click the **Set context for all namespaces** toggle and click **Confirm**.
+
 ## Create a service account
 
 Create a service account named `nginx-service-account` in the `nginx`
 namespace.
 
 1.  Navigate to the **Service Accounts** page and click **Create**.
-2.  In the **Object YAML** editor, paste the following text.
+2.  In the **Namespace** dropdown, select **nginx**.
+3.  In the **Object YAML** editor, paste the following text.
     ```yaml
     apiVersion: v1
     kind: ServiceAccount
diff --git a/ee/ucp/swarm/deploy-to-collection.md b/ee/ucp/swarm/deploy-to-collection.md
index 9a23057feb..878653837b 100644
--- a/ee/ucp/swarm/deploy-to-collection.md
+++ b/ee/ucp/swarm/deploy-to-collection.md
@@ -77,11 +77,13 @@ To deploy the application:
 
 1. In the UCP web UI, navigate to the **Stacks** page and click **Create Stack**.
 2. Name the app "wordpress".
-3. From the **Mode** dropdown, select **Services**.
-4. Copy and paste the previous compose file into the **Compose.yml** editor.
+3. From the **Mode** dropdown, select **Swarm Services**.
+4. Copy and paste the previous compose file into the **docker-compose.yml** editor.
 5. Click **Create** to deploy the application, and click **Done** when the
    deployment completes.
 
+   ![](../images/deploy-stack-to-collection-1.png){: .with-border}
+
 If the `/Shared/wordpress` collection doesn't exist, or if you don't have
 a grant for accessing it, UCP reports an error.
 
@@ -92,7 +94,7 @@ To confirm that the service deployed to the `/Shared/wordpress` collection:
 3. On the **Services** page, click **wordpress_mysql**. In the details pane,
    make sure that the **Collection** is `/Shared/wordpress`.
 
-![](../images/deploy-stack-to-collection.png){: .with-border}
+![](../images/deploy-stack-to-collection-2.png){: .with-border}
 
 ## Where to go next
 
diff --git a/ee/ucp/swarm/index.md b/ee/ucp/swarm/index.md
index b7f50ad2a6..95bc4df151 100644
--- a/ee/ucp/swarm/index.md
+++ b/ee/ucp/swarm/index.md
@@ -26,12 +26,12 @@ Fill in the following fields:
 In the left pane, click **Network**. In the **Ports** section,
 click **Publish Port** and fill in the following fields:
 
-| Field         | Value   |
-|:--------------|:--------|
-| Internal port | 80      |
-| Protocol      | tcp     |
-| Publish mode  | Ingress |
-| Public port   | 8000    |
+| Field          | Value   |
+|:---------------|:--------|
+| Target port    | 80      |
+| Protocol       | tcp     |
+| Publish mode   | Ingress |
+| Published port | 8000    |
 
 ![](../images/deploy-a-service-2.png){: .with-border}
 
@@ -40,11 +40,19 @@ Click **Confirm** to map the ports for the NGINX service.
 Once you've specified the service image and ports, click **Create** to
 deploy the service into the UCP cluster.
 
+![](../images/deploy-a-service-3.png){: .with-border}
+
 Once the service is up and running, you'll be able to see the default NGINX
-page, by going to `http://<node-ip>:8000`.
+page, by going to `http://<node-ip>:8000`. In the **Services** list, click the
+**nginx** service, and in the details pane, click the link under
+**Published Endpoints**. 
 
 ![](../images/deploy-a-service-4.png){: .with-border}
 
+Clicking the link opens a new tab that shows the default NGINX home page. 
+
+![](../images/deploy-a-service-5.png){: .with-border}
+
 ## Use the CLI to deploy the service
 
 You can also deploy the same service from the CLI. Once you've set up your
diff --git a/ee/ucp/swarm/use-secrets.md b/ee/ucp/swarm/use-secrets.md
index b69ffc8779..ae53cde42e 100644
--- a/ee/ucp/swarm/use-secrets.md
+++ b/ee/ucp/swarm/use-secrets.md
@@ -36,9 +36,7 @@ persist data. When the service stops, the data is lost.
 
 ## Create a secret
 
-In the UCP web UI, navigate to **Secrets** page and click **Create Secret**
-to create a new secret. Once you create the secret you won't be able to edit
-it or see the secret data again.
+In the UCP web UI, open the **Swarm** section and click **Secrets**.
 
 ![](../images/manage-secrets-1.png){: .with-border}
 
@@ -49,10 +47,10 @@ you won't be able to edit it or see the secret data again.
 
 Assign a unique name to the secret and set its value. You can optionally define
 a permission label so that other users have permission to use this secret. Also
-note that a service and secret must have the same permission label (or both
-must have no permission label at all) in order to be used together.
+note that a service and secret must have the same permission label, or both
+must have no permission label at all, in order to be used together.
 
-In this example our secret is named `wordpress-password-v1`, to make it easier
+In this example, the secret is named `wordpress-password-v1`, to make it easier
 to track which version of the password our services are using.
 
 
@@ -62,7 +60,7 @@ Before creating the MySQL and WordPress services, we need to create the network
 that they're going to use to communicate with one another.
 
 Navigate to the **Networks** page, and create the `wordpress-network` with the
-default configurations.
+default settings.
 
 ![](../images/manage-secrets-3.png){: .with-border}
 
@@ -78,7 +76,7 @@ Now create the MySQL service:
 4. In the **Secrets** section, click **Use Secret**, and in the **Secret Name**
    dropdown, select **wordpress-password-v1**. Click **Confirm** to associate
    the secret with the service.
-5. In the **Environment Variable**, click **Add Environment Variable** and enter
+5. In the **Environment Variable** section, click **Add Environment Variable** and enter
    the string "MYSQL_ROOT_PASSWORD_FILE=/run/secrets/wordpress-password-v1" to
    create an environment variable that holds the path to the password file in
    the container.
@@ -121,6 +119,8 @@ uses MySQL as a storage backend:
    label, then this service also can't have a permission label.
 8. Click **Create** to deploy the WordPress service.
 
+![](../images/manage-secrets-4a.png){: .with-border}
+
 This creates the WordPress service attached to the same network as the MySQL
 service so that they can communicate, and maps the port 80 of the service to
 port 8000 of the cluster routing mesh.