diff --git a/datacenter/dtr/2.3/guides/admin/configure/external-storage/index.md b/datacenter/dtr/2.3/guides/admin/configure/external-storage/index.md
index b542e6ea53..0e29caa299 100644
--- a/datacenter/dtr/2.3/guides/admin/configure/external-storage/index.md
+++ b/datacenter/dtr/2.3/guides/admin/configure/external-storage/index.md
@@ -1,8 +1,7 @@
 ---
 title: Configure DTR image storage
 description: Storage configuration for Docker Trusted Registry
-keywords: docker, documentation, about, technology, understanding, configuration,
-  storage, storage drivers, Azure, S3, Swift, enterprise, hub, registry
+keywords: storage drivers, NFS, Azure, S3
 ---
 
 By default DTR uses the local filesystem of the node where it is running to
diff --git a/datacenter/dtr/2.3/guides/admin/configure/license-your-installation.md b/datacenter/dtr/2.3/guides/admin/configure/license-your-installation.md
index 391726e534..6a77473cee 100644
--- a/datacenter/dtr/2.3/guides/admin/configure/license-your-installation.md
+++ b/datacenter/dtr/2.3/guides/admin/configure/license-your-installation.md
@@ -17,8 +17,8 @@ DTR installation:
 
 ## Download your license
 
-Go to [Docker Store](https://store.docker.com/bundles/docker-datacenter) and
-download your license.
+Go to [Docker Store](https://store.docker.com/editions/enterprise/docker-ee-trial)
+and download your license.
 
 ![](../../images/license-1.png)
 
diff --git a/datacenter/dtr/2.3/guides/admin/configure/set-up-vulnerability-scans.md b/datacenter/dtr/2.3/guides/admin/configure/set-up-vulnerability-scans.md
index 7c173ab3df..d2ceb9b91c 100644
--- a/datacenter/dtr/2.3/guides/admin/configure/set-up-vulnerability-scans.md
+++ b/datacenter/dtr/2.3/guides/admin/configure/set-up-vulnerability-scans.md
@@ -153,11 +153,11 @@ To update the CVE database for your DTR instance when it cannot contact the upda
 4. Locate your Docker EE Advanced subscription or trial.
 5. Click **Setup** button.
 
-    ![](../../images/cve-file-1.png){: .with-border}
+    ![](../../images/security-scanning-setup-6.png){: .with-border}
 
 6. Click **Download CVE Vulnerability Database** link to download the database file.
 
-    ![](../../images/cve-file-2.png){: .with-border}
+    ![](../../images/security-scanning-setup-7.png){: .with-border}
 
     If you run into problems, contact us at nautilus-feedback@docker.com for the file.
 
diff --git a/datacenter/dtr/2.3/guides/admin/monitor-and-troubleshoot/index.md b/datacenter/dtr/2.3/guides/admin/monitor-and-troubleshoot/index.md
index f9822686e0..3a743851e8 100644
--- a/datacenter/dtr/2.3/guides/admin/monitor-and-troubleshoot/index.md
+++ b/datacenter/dtr/2.3/guides/admin/monitor-and-troubleshoot/index.md
@@ -10,17 +10,19 @@ containerized applications running on your cluster. One way to monitor
 DTR is using the monitoring capabilities of Docker Universal Control Plane.
 
 In your browser, log in to **Docker Universal Control Plane** (UCP), and
-navigate to the **Applications** page.
-
-To make it easier to find DTR, use the search box to **search for the
-DTR application**. If you have DTR set up for high-availability, then all the
-DTR nodes are displayed.
+navigate to the **Stacks** page.
+If you have DTR set up for high-availability, then all the DTR replicas are
+displayed.
 
 ![](../../images/monitor-1.png)
 
-**Click on the DTR application** to see all of its containers, and if they're
-running. **Click on a container** to see its details, like configurations,
-resources, and logs.
+To check the containers for the DTR replica, **click the replica** you want
+to inspect, click **Inspect Resource**, and choose **Containers**.
+
+![](../../images/monitor-2.png)
+
+Now you can drill into each DTR container to see it's logs and find the root
+cause of the problem.
 
 ![](../../images/monitor-2.png)
 
diff --git a/datacenter/dtr/2.3/guides/images/cache-docker-images-2.png b/datacenter/dtr/2.3/guides/images/cache-docker-images-2.png
index dd60832b44..15e6130890 100644
Binary files a/datacenter/dtr/2.3/guides/images/cache-docker-images-2.png and b/datacenter/dtr/2.3/guides/images/cache-docker-images-2.png differ
diff --git a/datacenter/dtr/2.3/guides/images/cache-docker-images-3.png b/datacenter/dtr/2.3/guides/images/cache-docker-images-3.png
index 62e490bc2e..7e236ee0f1 100644
Binary files a/datacenter/dtr/2.3/guides/images/cache-docker-images-3.png and b/datacenter/dtr/2.3/guides/images/cache-docker-images-3.png differ
diff --git a/datacenter/dtr/2.3/guides/images/cache-docker-images-4.png b/datacenter/dtr/2.3/guides/images/cache-docker-images-4.png
index 93f76f1a78..059734ecba 100644
Binary files a/datacenter/dtr/2.3/guides/images/cache-docker-images-4.png and b/datacenter/dtr/2.3/guides/images/cache-docker-images-4.png differ
diff --git a/datacenter/dtr/2.3/guides/images/configure-external-storage-1.svg b/datacenter/dtr/2.3/guides/images/configure-external-storage-1.svg
index 7656909ea1..9741c337a5 100644
--- a/datacenter/dtr/2.3/guides/images/configure-external-storage-1.svg
+++ b/datacenter/dtr/2.3/guides/images/configure-external-storage-1.svg
@@ -1,24 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="740px" height="250px" viewBox="0 0 740 250" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 44.1 (41455) - http://www.bohemiancoding.com/sketch -->
     <title>architecture-3</title>
     <desc>Created with Sketch.</desc>
     <defs>
         <circle id="path-1" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-1" fill="black"></use>
-        </mask>
+        <circle id="path-2" cx="4" cy="4" r="4"></circle>
         <circle id="path-3" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-4" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-3" fill="black"></use>
-        </mask>
-        <circle id="path-5" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-6" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-5" fill="black"></use>
-        </mask>
     </defs>
     <g id="dtr-diagrams" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="architecture-3">
@@ -38,21 +26,21 @@
                             <path d="M2,4 L33,4" id="Line" stroke="#FFB463" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                             <g id="Oval">
                                 <use fill="#FFB463" fill-rule="evenodd" xlink:href="#path-1"></use>
-                                <use stroke="#F7F8F9" mask="url(#mask-2)" stroke-width="4" xlink:href="#path-1"></use>
+                                <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                             </g>
                         </g>
                         <g id="arrow-copy-3" transform="translate(111.500000, 17.000000) rotate(-90.000000) translate(-111.500000, -17.000000) translate(95.000000, 13.000000)">
                             <path d="M2,4 L33,4" id="Line" stroke="#FFB463" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                             <g id="Oval">
-                                <use fill="#FFB463" fill-rule="evenodd" xlink:href="#path-3"></use>
-                                <use stroke="#F7F8F9" mask="url(#mask-4)" stroke-width="4" xlink:href="#path-3"></use>
+                                <use fill="#FFB463" fill-rule="evenodd" xlink:href="#path-2"></use>
+                                <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                             </g>
                         </g>
                         <g id="arrow-copy-4" transform="translate(4.500000, 17.000000) rotate(-90.000000) translate(-4.500000, -17.000000) translate(-12.000000, 13.000000)">
                             <path d="M2,4 L33,4" id="Line" stroke="#FFB463" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                             <g id="Oval">
-                                <use fill="#FFB463" fill-rule="evenodd" xlink:href="#path-5"></use>
-                                <use stroke="#F7F8F9" mask="url(#mask-6)" stroke-width="4" xlink:href="#path-5"></use>
+                                <use fill="#FFB463" fill-rule="evenodd" xlink:href="#path-3"></use>
+                                <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                             </g>
                         </g>
                     </g>
@@ -68,8 +56,8 @@
                             </g>
                             <g id="engine" transform="translate(1.000000, 79.000000)">
                                 <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                    <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                    <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                 </text>
                             </g>
                             <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -97,8 +85,8 @@
                             </g>
                             <g id="engine" transform="translate(1.000000, 79.000000)">
                                 <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                    <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                    <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                 </text>
                             </g>
                             <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -126,8 +114,8 @@
                             </g>
                             <g id="engine" transform="translate(1.000000, 79.000000)">
                                 <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                    <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                    <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                 </text>
                             </g>
                             <g id="ucp" transform="translate(1.000000, 56.000000)">
diff --git a/datacenter/dtr/2.3/guides/images/configure-external-storage-2.png b/datacenter/dtr/2.3/guides/images/configure-external-storage-2.png
index 92e65206a1..aa4fe15908 100644
Binary files a/datacenter/dtr/2.3/guides/images/configure-external-storage-2.png and b/datacenter/dtr/2.3/guides/images/configure-external-storage-2.png differ
diff --git a/datacenter/dtr/2.3/guides/images/create-and-manage-orgs-1.png b/datacenter/dtr/2.3/guides/images/create-and-manage-orgs-1.png
index 1b242c0148..6cf9cabdf3 100644
Binary files a/datacenter/dtr/2.3/guides/images/create-and-manage-orgs-1.png and b/datacenter/dtr/2.3/guides/images/create-and-manage-orgs-1.png differ
diff --git a/datacenter/dtr/2.3/guides/images/create-and-manage-orgs-2.png b/datacenter/dtr/2.3/guides/images/create-and-manage-orgs-2.png
index 6f010ea345..e7595d35a7 100644
Binary files a/datacenter/dtr/2.3/guides/images/create-and-manage-orgs-2.png and b/datacenter/dtr/2.3/guides/images/create-and-manage-orgs-2.png differ
diff --git a/datacenter/dtr/2.3/guides/images/create-and-manage-orgs-3.png b/datacenter/dtr/2.3/guides/images/create-and-manage-orgs-3.png
index a0793bd592..92e5de41f3 100644
Binary files a/datacenter/dtr/2.3/guides/images/create-and-manage-orgs-3.png and b/datacenter/dtr/2.3/guides/images/create-and-manage-orgs-3.png differ
diff --git a/datacenter/dtr/2.3/guides/images/create-and-manage-teams-1.png b/datacenter/dtr/2.3/guides/images/create-and-manage-teams-1.png
index 3c0c7ac437..4a79b53948 100644
Binary files a/datacenter/dtr/2.3/guides/images/create-and-manage-teams-1.png and b/datacenter/dtr/2.3/guides/images/create-and-manage-teams-1.png differ
diff --git a/datacenter/dtr/2.3/guides/images/create-and-manage-teams-2.png b/datacenter/dtr/2.3/guides/images/create-and-manage-teams-2.png
index 48f69a9c88..5659e1c078 100644
Binary files a/datacenter/dtr/2.3/guides/images/create-and-manage-teams-2.png and b/datacenter/dtr/2.3/guides/images/create-and-manage-teams-2.png differ
diff --git a/datacenter/dtr/2.3/guides/images/create-and-manage-teams-3.png b/datacenter/dtr/2.3/guides/images/create-and-manage-teams-3.png
index 07bcd825e5..da89e922e5 100644
Binary files a/datacenter/dtr/2.3/guides/images/create-and-manage-teams-3.png and b/datacenter/dtr/2.3/guides/images/create-and-manage-teams-3.png differ
diff --git a/datacenter/dtr/2.3/guides/images/create-and-manage-teams-4.png b/datacenter/dtr/2.3/guides/images/create-and-manage-teams-4.png
index 823defa208..07f464c17b 100644
Binary files a/datacenter/dtr/2.3/guides/images/create-and-manage-teams-4.png and b/datacenter/dtr/2.3/guides/images/create-and-manage-teams-4.png differ
diff --git a/datacenter/dtr/2.3/guides/images/create-and-manage-teams-5.png b/datacenter/dtr/2.3/guides/images/create-and-manage-teams-5.png
index d70972364f..cc8a63c170 100644
Binary files a/datacenter/dtr/2.3/guides/images/create-and-manage-teams-5.png and b/datacenter/dtr/2.3/guides/images/create-and-manage-teams-5.png differ
diff --git a/datacenter/dtr/2.3/guides/images/create-manage-users-1.png b/datacenter/dtr/2.3/guides/images/create-manage-users-1.png
index cbf30037c9..177878b701 100644
Binary files a/datacenter/dtr/2.3/guides/images/create-manage-users-1.png and b/datacenter/dtr/2.3/guides/images/create-manage-users-1.png differ
diff --git a/datacenter/dtr/2.3/guides/images/create-manage-users-2.png b/datacenter/dtr/2.3/guides/images/create-manage-users-2.png
index 91360649ab..838432cf45 100644
Binary files a/datacenter/dtr/2.3/guides/images/create-manage-users-2.png and b/datacenter/dtr/2.3/guides/images/create-manage-users-2.png differ
diff --git a/datacenter/dtr/2.3/guides/images/create-repository-1.png b/datacenter/dtr/2.3/guides/images/create-repository-1.png
index ae001963cf..44975b7656 100644
Binary files a/datacenter/dtr/2.3/guides/images/create-repository-1.png and b/datacenter/dtr/2.3/guides/images/create-repository-1.png differ
diff --git a/datacenter/dtr/2.3/guides/images/create-repository-2.png b/datacenter/dtr/2.3/guides/images/create-repository-2.png
index bcd584e7f8..692d0c2e27 100644
Binary files a/datacenter/dtr/2.3/guides/images/create-repository-2.png and b/datacenter/dtr/2.3/guides/images/create-repository-2.png differ
diff --git a/datacenter/dtr/2.3/guides/images/cve-file-1.png b/datacenter/dtr/2.3/guides/images/cve-file-1.png
deleted file mode 100644
index 5d861dbfc3..0000000000
Binary files a/datacenter/dtr/2.3/guides/images/cve-file-1.png and /dev/null differ
diff --git a/datacenter/dtr/2.3/guides/images/cve-file-2.png b/datacenter/dtr/2.3/guides/images/cve-file-2.png
deleted file mode 100644
index ea820ec7b8..0000000000
Binary files a/datacenter/dtr/2.3/guides/images/cve-file-2.png and /dev/null differ
diff --git a/datacenter/dtr/2.3/guides/images/delete-images-1.png b/datacenter/dtr/2.3/guides/images/delete-images-1.png
index d9e8107f0f..97203ec17e 100644
Binary files a/datacenter/dtr/2.3/guides/images/delete-images-1.png and b/datacenter/dtr/2.3/guides/images/delete-images-1.png differ
diff --git a/datacenter/dtr/2.3/guides/images/enable-sso-1.png b/datacenter/dtr/2.3/guides/images/enable-sso-1.png
index ce0891c20f..576360bc59 100644
Binary files a/datacenter/dtr/2.3/guides/images/enable-sso-1.png and b/datacenter/dtr/2.3/guides/images/enable-sso-1.png differ
diff --git a/datacenter/dtr/2.3/guides/images/garbage-collection-1.png b/datacenter/dtr/2.3/guides/images/garbage-collection-1.png
index fad454730e..bdc2891f9e 100644
Binary files a/datacenter/dtr/2.3/guides/images/garbage-collection-1.png and b/datacenter/dtr/2.3/guides/images/garbage-collection-1.png differ
diff --git a/datacenter/dtr/2.3/guides/images/garbage-collection-2.png b/datacenter/dtr/2.3/guides/images/garbage-collection-2.png
index 0351ececed..6f17832893 100644
Binary files a/datacenter/dtr/2.3/guides/images/garbage-collection-2.png and b/datacenter/dtr/2.3/guides/images/garbage-collection-2.png differ
diff --git a/datacenter/dtr/2.3/guides/images/garbage-collection-3.png b/datacenter/dtr/2.3/guides/images/garbage-collection-3.png
index dea2734bee..58c56cf63e 100644
Binary files a/datacenter/dtr/2.3/guides/images/garbage-collection-3.png and b/datacenter/dtr/2.3/guides/images/garbage-collection-3.png differ
diff --git a/datacenter/dtr/2.3/guides/images/immutable-repo-1.png b/datacenter/dtr/2.3/guides/images/immutable-repo-1.png
index 515c7e33bc..2a72636da7 100644
Binary files a/datacenter/dtr/2.3/guides/images/immutable-repo-1.png and b/datacenter/dtr/2.3/guides/images/immutable-repo-1.png differ
diff --git a/datacenter/dtr/2.3/guides/images/install-dtr-0.svg b/datacenter/dtr/2.3/guides/images/install-dtr-0.svg
index e8de51d858..c75df0b051 100644
--- a/datacenter/dtr/2.3/guides/images/install-dtr-0.svg
+++ b/datacenter/dtr/2.3/guides/images/install-dtr-0.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="740px" height="250px" viewBox="0 0 740 250" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 44.1 (41455) - http://www.bohemiancoding.com/sketch -->
     <title>architecture-2</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -22,8 +22,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -45,8 +45,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -70,8 +70,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -99,8 +99,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -128,8 +128,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -159,8 +159,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -182,8 +182,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -205,8 +205,8 @@
                         </g>
                         <g id="engine" transform="translate(1.000000, 79.000000)">
                             <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                            <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                            <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                             </text>
                         </g>
                         <g id="ucp" transform="translate(1.000000, 56.000000)">
diff --git a/datacenter/dtr/2.3/guides/images/install-dtr-1.png b/datacenter/dtr/2.3/guides/images/install-dtr-1.png
index 3d4837c311..e7ccce57d9 100644
Binary files a/datacenter/dtr/2.3/guides/images/install-dtr-1.png and b/datacenter/dtr/2.3/guides/images/install-dtr-1.png differ
diff --git a/datacenter/dtr/2.3/guides/images/install-dtr-2.png b/datacenter/dtr/2.3/guides/images/install-dtr-2.png
index 6795a3939a..8b04d1b80c 100644
Binary files a/datacenter/dtr/2.3/guides/images/install-dtr-2.png and b/datacenter/dtr/2.3/guides/images/install-dtr-2.png differ
diff --git a/datacenter/dtr/2.3/guides/images/install-dtr-3.png b/datacenter/dtr/2.3/guides/images/install-dtr-3.png
index 571dd31cd3..9c8fbce716 100644
Binary files a/datacenter/dtr/2.3/guides/images/install-dtr-3.png and b/datacenter/dtr/2.3/guides/images/install-dtr-3.png differ
diff --git a/datacenter/dtr/2.3/guides/images/install-dtr-4.png b/datacenter/dtr/2.3/guides/images/install-dtr-4.png
index 82228bc4c6..d87014cfee 100644
Binary files a/datacenter/dtr/2.3/guides/images/install-dtr-4.png and b/datacenter/dtr/2.3/guides/images/install-dtr-4.png differ
diff --git a/datacenter/dtr/2.3/guides/images/license-1.png b/datacenter/dtr/2.3/guides/images/license-1.png
index 58539aa40d..3b0b0c07bb 100644
Binary files a/datacenter/dtr/2.3/guides/images/license-1.png and b/datacenter/dtr/2.3/guides/images/license-1.png differ
diff --git a/datacenter/dtr/2.3/guides/images/license-2.png b/datacenter/dtr/2.3/guides/images/license-2.png
index 37dea664cb..bbff97fe76 100644
Binary files a/datacenter/dtr/2.3/guides/images/license-2.png and b/datacenter/dtr/2.3/guides/images/license-2.png differ
diff --git a/datacenter/dtr/2.3/guides/images/monitor-1.png b/datacenter/dtr/2.3/guides/images/monitor-1.png
index e170bed344..06e94f61b0 100644
Binary files a/datacenter/dtr/2.3/guides/images/monitor-1.png and b/datacenter/dtr/2.3/guides/images/monitor-1.png differ
diff --git a/datacenter/dtr/2.3/guides/images/monitor-2.png b/datacenter/dtr/2.3/guides/images/monitor-2.png
index 83a054bb67..7e52625a26 100644
Binary files a/datacenter/dtr/2.3/guides/images/monitor-2.png and b/datacenter/dtr/2.3/guides/images/monitor-2.png differ
diff --git a/datacenter/dtr/2.3/guides/images/monitor-3.png b/datacenter/dtr/2.3/guides/images/monitor-3.png
new file mode 100644
index 0000000000..feb7b4e016
Binary files /dev/null and b/datacenter/dtr/2.3/guides/images/monitor-3.png differ
diff --git a/datacenter/dtr/2.3/guides/images/pull-push-images-1.png b/datacenter/dtr/2.3/guides/images/pull-push-images-1.png
index 915223a75c..9a031b29a4 100644
Binary files a/datacenter/dtr/2.3/guides/images/pull-push-images-1.png and b/datacenter/dtr/2.3/guides/images/pull-push-images-1.png differ
diff --git a/datacenter/dtr/2.3/guides/images/pull-push-images-2.png b/datacenter/dtr/2.3/guides/images/pull-push-images-2.png
index 42ce6033ad..2caf2ca2ca 100644
Binary files a/datacenter/dtr/2.3/guides/images/pull-push-images-2.png and b/datacenter/dtr/2.3/guides/images/pull-push-images-2.png differ
diff --git a/datacenter/dtr/2.3/guides/images/pull-push-images-3.png b/datacenter/dtr/2.3/guides/images/pull-push-images-3.png
index c5dc8e29a9..11c65d496e 100644
Binary files a/datacenter/dtr/2.3/guides/images/pull-push-images-3.png and b/datacenter/dtr/2.3/guides/images/pull-push-images-3.png differ
diff --git a/datacenter/dtr/2.3/guides/images/s3-1.png b/datacenter/dtr/2.3/guides/images/s3-1.png
index f260d54edf..df1ca52183 100644
Binary files a/datacenter/dtr/2.3/guides/images/s3-1.png and b/datacenter/dtr/2.3/guides/images/s3-1.png differ
diff --git a/datacenter/dtr/2.3/guides/images/scan-images-for-vulns-1.png b/datacenter/dtr/2.3/guides/images/scan-images-for-vulns-1.png
new file mode 100644
index 0000000000..b515d4c452
Binary files /dev/null and b/datacenter/dtr/2.3/guides/images/scan-images-for-vulns-1.png differ
diff --git a/datacenter/dtr/2.3/guides/images/scan-images-for-vulns-2.png b/datacenter/dtr/2.3/guides/images/scan-images-for-vulns-2.png
new file mode 100644
index 0000000000..9748dbfa81
Binary files /dev/null and b/datacenter/dtr/2.3/guides/images/scan-images-for-vulns-2.png differ
diff --git a/datacenter/dtr/2.3/guides/images/scan-images-for-vulns-3.png b/datacenter/dtr/2.3/guides/images/scan-images-for-vulns-3.png
new file mode 100644
index 0000000000..6d2d4f1e11
Binary files /dev/null and b/datacenter/dtr/2.3/guides/images/scan-images-for-vulns-3.png differ
diff --git a/datacenter/dtr/2.3/guides/images/scan-images-for-vulns-4.png b/datacenter/dtr/2.3/guides/images/scan-images-for-vulns-4.png
new file mode 100644
index 0000000000..fe0a5d513c
Binary files /dev/null and b/datacenter/dtr/2.3/guides/images/scan-images-for-vulns-4.png differ
diff --git a/datacenter/dtr/2.3/guides/images/scan-images-for-vulns-5.png b/datacenter/dtr/2.3/guides/images/scan-images-for-vulns-5.png
new file mode 100644
index 0000000000..294889667e
Binary files /dev/null and b/datacenter/dtr/2.3/guides/images/scan-images-for-vulns-5.png differ
diff --git a/datacenter/dtr/2.3/guides/images/scanning-images-1.png b/datacenter/dtr/2.3/guides/images/scanning-images-1.png
deleted file mode 100644
index e47437051c..0000000000
Binary files a/datacenter/dtr/2.3/guides/images/scanning-images-1.png and /dev/null differ
diff --git a/datacenter/dtr/2.3/guides/images/scanning-images-2.png b/datacenter/dtr/2.3/guides/images/scanning-images-2.png
deleted file mode 100644
index 827ec79c36..0000000000
Binary files a/datacenter/dtr/2.3/guides/images/scanning-images-2.png and /dev/null differ
diff --git a/datacenter/dtr/2.3/guides/images/scanning-images-3.png b/datacenter/dtr/2.3/guides/images/scanning-images-3.png
deleted file mode 100644
index 1020010c09..0000000000
Binary files a/datacenter/dtr/2.3/guides/images/scanning-images-3.png and /dev/null differ
diff --git a/datacenter/dtr/2.3/guides/images/scanning-images-4.png b/datacenter/dtr/2.3/guides/images/scanning-images-4.png
deleted file mode 100644
index 97bc9ad1f5..0000000000
Binary files a/datacenter/dtr/2.3/guides/images/scanning-images-4.png and /dev/null differ
diff --git a/datacenter/dtr/2.3/guides/images/scanning-images-5.png b/datacenter/dtr/2.3/guides/images/scanning-images-5.png
deleted file mode 100644
index 247da0da52..0000000000
Binary files a/datacenter/dtr/2.3/guides/images/scanning-images-5.png and /dev/null differ
diff --git a/datacenter/dtr/2.3/guides/images/scanning-images-6.png b/datacenter/dtr/2.3/guides/images/scanning-images-6.png
deleted file mode 100644
index a68a69047c..0000000000
Binary files a/datacenter/dtr/2.3/guides/images/scanning-images-6.png and /dev/null differ
diff --git a/datacenter/dtr/2.3/guides/images/security-scanning-setup-1.png b/datacenter/dtr/2.3/guides/images/security-scanning-setup-1.png
index 95db579b57..7db7a312c5 100644
Binary files a/datacenter/dtr/2.3/guides/images/security-scanning-setup-1.png and b/datacenter/dtr/2.3/guides/images/security-scanning-setup-1.png differ
diff --git a/datacenter/dtr/2.3/guides/images/security-scanning-setup-2.png b/datacenter/dtr/2.3/guides/images/security-scanning-setup-2.png
index 8292b755ff..bbff97fe76 100644
Binary files a/datacenter/dtr/2.3/guides/images/security-scanning-setup-2.png and b/datacenter/dtr/2.3/guides/images/security-scanning-setup-2.png differ
diff --git a/datacenter/dtr/2.3/guides/images/security-scanning-setup-3.png b/datacenter/dtr/2.3/guides/images/security-scanning-setup-3.png
index 7dee18592e..d90a56a2f0 100644
Binary files a/datacenter/dtr/2.3/guides/images/security-scanning-setup-3.png and b/datacenter/dtr/2.3/guides/images/security-scanning-setup-3.png differ
diff --git a/datacenter/dtr/2.3/guides/images/security-scanning-setup-4.png b/datacenter/dtr/2.3/guides/images/security-scanning-setup-4.png
index b616bd090a..9a1eaae531 100644
Binary files a/datacenter/dtr/2.3/guides/images/security-scanning-setup-4.png and b/datacenter/dtr/2.3/guides/images/security-scanning-setup-4.png differ
diff --git a/datacenter/dtr/2.3/guides/images/security-scanning-setup-5.png b/datacenter/dtr/2.3/guides/images/security-scanning-setup-5.png
index d6fd310a2a..4e93286bf0 100644
Binary files a/datacenter/dtr/2.3/guides/images/security-scanning-setup-5.png and b/datacenter/dtr/2.3/guides/images/security-scanning-setup-5.png differ
diff --git a/datacenter/dtr/2.3/guides/images/security-scanning-setup-6.png b/datacenter/dtr/2.3/guides/images/security-scanning-setup-6.png
new file mode 100644
index 0000000000..6fc1a38b4e
Binary files /dev/null and b/datacenter/dtr/2.3/guides/images/security-scanning-setup-6.png differ
diff --git a/datacenter/dtr/2.3/guides/images/security-scanning-setup-7.png b/datacenter/dtr/2.3/guides/images/security-scanning-setup-7.png
new file mode 100644
index 0000000000..2acf1ae462
Binary files /dev/null and b/datacenter/dtr/2.3/guides/images/security-scanning-setup-7.png differ
diff --git a/datacenter/dtr/2.3/guides/images/set-up-high-availability-1.svg b/datacenter/dtr/2.3/guides/images/set-up-high-availability-1.svg
index b86fc8f357..4f28043a93 100644
--- a/datacenter/dtr/2.3/guides/images/set-up-high-availability-1.svg
+++ b/datacenter/dtr/2.3/guides/images/set-up-high-availability-1.svg
@@ -1,42 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="740px" height="350px" viewBox="0 0 740 350" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
-    <title>set-up-high-availability-1</title>
+    <!-- Generator: Sketch 44.1 (41455) - http://www.bohemiancoding.com/sketch -->
+    <title>architecture-4</title>
     <desc>Created with Sketch.</desc>
     <defs>
         <circle id="path-1" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-1" fill="black"></use>
-        </mask>
+        <circle id="path-2" cx="4" cy="4" r="4"></circle>
         <circle id="path-3" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-4" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-3" fill="black"></use>
-        </mask>
+        <circle id="path-4" cx="4" cy="4" r="4"></circle>
         <circle id="path-5" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-6" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-5" fill="black"></use>
-        </mask>
-        <circle id="path-7" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-8" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-7" fill="black"></use>
-        </mask>
-        <circle id="path-9" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-10" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-9" fill="black"></use>
-        </mask>
-        <circle id="path-11" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-12" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-11" fill="black"></use>
-        </mask>
+        <circle id="path-6" cx="4" cy="4" r="4"></circle>
     </defs>
     <g id="dtr-diagrams" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="set-up-high-availability-1">
+        <g id="architecture-4">
             <g id="ddc" transform="translate(30.000000, 56.000000)">
                 <g id="swarm-group" transform="translate(0.000000, 42.000000)">
                     <text id="Docker-swarm" font-family="OpenSans-Semibold, Open Sans" font-size="10" font-weight="500" fill="#E0E4E7">
@@ -54,24 +30,24 @@
                         </g>
                         <g id="arrows" transform="translate(43.000000, 21.000000)">
                             <g id="arrow-copy-3" transform="translate(218.500000, 17.000000) scale(1, -1) rotate(-90.000000) translate(-218.500000, -17.000000) translate(202.000000, 13.000000)">
-                                <path d="M2,4 L33,4" id="Line" stroke="#E0E4E7" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
+                                <path d="M2,4 L33,4" id="Line" stroke="#445D6E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                                 <g id="Oval">
-                                    <use fill="#E0E4E7" fill-rule="evenodd" xlink:href="#path-1"></use>
-                                    <use stroke="#F7F8F9" mask="url(#mask-2)" stroke-width="4" xlink:href="#path-1"></use>
+                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-1"></use>
+                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                                 </g>
                             </g>
                             <g id="arrow-copy" transform="translate(111.500000, 17.000000) scale(1, -1) rotate(-90.000000) translate(-111.500000, -17.000000) translate(95.000000, 13.000000)">
-                                <path d="M2,4 L33,4" id="Line" stroke="#E0E4E7" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
+                                <path d="M2,4 L33,4" id="Line" stroke="#445D6E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                                 <g id="Oval">
-                                    <use fill="#E0E4E7" fill-rule="evenodd" xlink:href="#path-3"></use>
-                                    <use stroke="#F7F8F9" mask="url(#mask-4)" stroke-width="4" xlink:href="#path-3"></use>
+                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-2"></use>
+                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                                 </g>
                             </g>
                             <g id="arrow-copy-2" transform="translate(4.500000, 17.000000) scale(1, -1) rotate(-90.000000) translate(-4.500000, -17.000000) translate(-12.000000, 13.000000)">
                                 <path d="M2,4 L33,4" id="Line" stroke="#445D6E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                                 <g id="Oval">
-                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-5"></use>
-                                    <use stroke="#F7F8F9" mask="url(#mask-6)" stroke-width="4" xlink:href="#path-5"></use>
+                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-3"></use>
+                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                                 </g>
                             </g>
                         </g>
@@ -87,30 +63,30 @@
                             <g id="arrow-copy-3" transform="translate(218.500000, 17.000000) scale(1, -1) rotate(-90.000000) translate(-218.500000, -17.000000) translate(202.000000, 13.000000)">
                                 <path d="M2,4 L33,4" id="Line" stroke="#445D6E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                                 <g id="Oval">
-                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-7"></use>
-                                    <use stroke="#F7F8F9" mask="url(#mask-8)" stroke-width="4" xlink:href="#path-7"></use>
+                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-4"></use>
+                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                                 </g>
                             </g>
                             <g id="arrow-copy" transform="translate(111.500000, 17.000000) scale(1, -1) rotate(-90.000000) translate(-111.500000, -17.000000) translate(95.000000, 13.000000)">
                                 <path d="M2,4 L33,4" id="Line" stroke="#445D6E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                                 <g id="Oval">
-                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-9"></use>
-                                    <use stroke="#F7F8F9" mask="url(#mask-10)" stroke-width="4" xlink:href="#path-9"></use>
+                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-5"></use>
+                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                                 </g>
                             </g>
                             <g id="arrow-copy-2" transform="translate(4.500000, 17.000000) scale(1, -1) rotate(-90.000000) translate(-4.500000, -17.000000) translate(-12.000000, 13.000000)">
                                 <path d="M2,4 L33,4" id="Line" stroke="#445D6E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                                 <g id="Oval">
-                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-11"></use>
-                                    <use stroke="#F7F8F9" mask="url(#mask-12)" stroke-width="4" xlink:href="#path-11"></use>
+                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-6"></use>
+                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                                 </g>
                             </g>
                         </g>
                     </g>
                 </g>
-                <g id="swam" transform="translate(22.000000, 34.000000)">
+                <g id="swam" transform="translate(22.000000, 54.000000)">
                     <g id="nodes">
-                        <g id="workers" transform="translate(216.000000, 138.000000)">
+                        <g id="workers" transform="translate(216.000000, 118.000000)">
                             <g id="node-1">
                                 <g id="node">
                                     <g id="node-label">
@@ -122,8 +98,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#A1CFE8" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -145,8 +121,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#A1CFE8" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -159,7 +135,7 @@
                             </g>
                         </g>
                         <g id="workers-dtr" transform="translate(347.000000, 0.000000)">
-                            <g id="node-1-copy-4" transform="translate(0.000000, 20.000000)">
+                            <g id="node-1-copy-4">
                                 <g id="node">
                                     <g id="node-label">
                                         <path d="M0,2.00295631 C0,0.896754086 0.897702336,0 1.99174577,0 L71,0 L71,10.6452381 C71,16.5244408 66.2312425,21.2904762 60.3513837,21.2904762 L0,21.2904762 L0,2.00295631 Z" id="Rectangle-127" fill="#445D6E"></path>
@@ -170,8 +146,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -188,20 +164,66 @@
                                 </g>
                                 <rect id="node-border" stroke="#445D6E" stroke-width="2" x="0" y="0" width="97" height="102" rx="2"></rect>
                             </g>
-                            <g id="node-1-copy" transform="translate(109.000000, 0.000000)">
-                                <rect id="node-border" stroke="#E0E4E7" stroke-width="2" fill="#E0E4E7" x="0" y="20" width="97" height="102" rx="2"></rect>
-                                <text id="+" font-family="OpenSans, Open Sans" font-size="100" font-weight="normal" fill="#F7F8F9">
-                                    <tspan x="20.4111328" y="107">+</tspan>
-                                </text>
+                            <g id="node-1-copy-5" transform="translate(107.000000, 0.000000)">
+                                <g id="node">
+                                    <g id="node-label">
+                                        <path d="M0,2.00295631 C0,0.896754086 0.897702336,0 1.99174577,0 L71,0 L71,10.6452381 C71,16.5244408 66.2312425,21.2904762 60.3513837,21.2904762 L0,21.2904762 L0,2.00295631 Z" id="Rectangle-127" fill="#445D6E"></path>
+                                        <text id="worker-node" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
+                                            <tspan x="6" y="14">worker node</tspan>
+                                        </text>
+                                    </g>
+                                </g>
+                                <g id="engine" transform="translate(1.000000, 79.000000)">
+                                    <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
+                                    </text>
+                                </g>
+                                <g id="ucp" transform="translate(1.000000, 56.000000)">
+                                    <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
+                                    <text id="UCP-worker" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="20.4755859" y="15">UCP worker</tspan>
+                                    </text>
+                                </g>
+                                <g id="ucp-copy" transform="translate(1.000000, 33.000000)">
+                                    <rect id="Rectangle-138" fill="#FFB463" x="0" y="0" width="95" height="22" rx="2"></rect>
+                                    <text id="DTR" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="38.4980469" y="15">DTR</tspan>
+                                    </text>
+                                </g>
+                                <rect id="node-border" stroke="#445D6E" stroke-width="2" x="0" y="0" width="97" height="102" rx="2"></rect>
                             </g>
-                            <g id="node-1-copy-5" transform="translate(216.000000, 0.000000)">
-                                <rect id="node-border" stroke="#E0E4E7" stroke-width="2" fill="#E0E4E7" x="0" y="20" width="97" height="102" rx="2"></rect>
-                                <text id="+" font-family="OpenSans, Open Sans" font-size="100" font-weight="normal" fill="#F7F8F9">
-                                    <tspan x="20.4111328" y="107">+</tspan>
-                                </text>
+                            <g id="node-1-copy-6" transform="translate(214.000000, 0.000000)">
+                                <g id="node">
+                                    <g id="node-label">
+                                        <path d="M0,2.00295631 C0,0.896754086 0.897702336,0 1.99174577,0 L71,0 L71,10.6452381 C71,16.5244408 66.2312425,21.2904762 60.3513837,21.2904762 L0,21.2904762 L0,2.00295631 Z" id="Rectangle-127" fill="#445D6E"></path>
+                                        <text id="worker-node" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
+                                            <tspan x="6" y="14">worker node</tspan>
+                                        </text>
+                                    </g>
+                                </g>
+                                <g id="engine" transform="translate(1.000000, 79.000000)">
+                                    <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
+                                    </text>
+                                </g>
+                                <g id="ucp" transform="translate(1.000000, 56.000000)">
+                                    <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
+                                    <text id="UCP-worker" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="20.4755859" y="15">UCP worker</tspan>
+                                    </text>
+                                </g>
+                                <g id="ucp-copy" transform="translate(1.000000, 33.000000)">
+                                    <rect id="Rectangle-138" fill="#FFB463" x="0" y="0" width="95" height="22" rx="2"></rect>
+                                    <text id="DTR" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="38.4980469" y="15">DTR</tspan>
+                                    </text>
+                                </g>
+                                <rect id="node-border" stroke="#445D6E" stroke-width="2" x="0" y="0" width="97" height="102" rx="2"></rect>
                             </g>
                         </g>
-                        <g id="managers-ucp" transform="translate(0.000000, 20.000000)">
+                        <g id="managers-ucp">
                             <g id="node-1">
                                 <g id="node">
                                     <g id="node-label">
@@ -213,8 +235,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -236,8 +258,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -259,8 +281,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
diff --git a/datacenter/dtr/2.3/guides/images/use-a-cache-1.png b/datacenter/dtr/2.3/guides/images/use-a-cache-1.png
index 93f76f1a78..1404c482cb 100644
Binary files a/datacenter/dtr/2.3/guides/images/use-a-cache-1.png and b/datacenter/dtr/2.3/guides/images/use-a-cache-1.png differ
diff --git a/datacenter/dtr/2.3/guides/images/use-a-load-balancer-1.svg b/datacenter/dtr/2.3/guides/images/use-a-load-balancer-1.svg
index b86fc8f357..4f28043a93 100644
--- a/datacenter/dtr/2.3/guides/images/use-a-load-balancer-1.svg
+++ b/datacenter/dtr/2.3/guides/images/use-a-load-balancer-1.svg
@@ -1,42 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="740px" height="350px" viewBox="0 0 740 350" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
-    <title>set-up-high-availability-1</title>
+    <!-- Generator: Sketch 44.1 (41455) - http://www.bohemiancoding.com/sketch -->
+    <title>architecture-4</title>
     <desc>Created with Sketch.</desc>
     <defs>
         <circle id="path-1" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-1" fill="black"></use>
-        </mask>
+        <circle id="path-2" cx="4" cy="4" r="4"></circle>
         <circle id="path-3" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-4" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-3" fill="black"></use>
-        </mask>
+        <circle id="path-4" cx="4" cy="4" r="4"></circle>
         <circle id="path-5" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-6" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-5" fill="black"></use>
-        </mask>
-        <circle id="path-7" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-8" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-7" fill="black"></use>
-        </mask>
-        <circle id="path-9" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-10" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-9" fill="black"></use>
-        </mask>
-        <circle id="path-11" cx="4" cy="4" r="4"></circle>
-        <mask id="mask-12" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="-2" y="-2" width="12" height="12">
-            <rect x="-2" y="-2" width="12" height="12" fill="white"></rect>
-            <use xlink:href="#path-11" fill="black"></use>
-        </mask>
+        <circle id="path-6" cx="4" cy="4" r="4"></circle>
     </defs>
     <g id="dtr-diagrams" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="set-up-high-availability-1">
+        <g id="architecture-4">
             <g id="ddc" transform="translate(30.000000, 56.000000)">
                 <g id="swarm-group" transform="translate(0.000000, 42.000000)">
                     <text id="Docker-swarm" font-family="OpenSans-Semibold, Open Sans" font-size="10" font-weight="500" fill="#E0E4E7">
@@ -54,24 +30,24 @@
                         </g>
                         <g id="arrows" transform="translate(43.000000, 21.000000)">
                             <g id="arrow-copy-3" transform="translate(218.500000, 17.000000) scale(1, -1) rotate(-90.000000) translate(-218.500000, -17.000000) translate(202.000000, 13.000000)">
-                                <path d="M2,4 L33,4" id="Line" stroke="#E0E4E7" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
+                                <path d="M2,4 L33,4" id="Line" stroke="#445D6E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                                 <g id="Oval">
-                                    <use fill="#E0E4E7" fill-rule="evenodd" xlink:href="#path-1"></use>
-                                    <use stroke="#F7F8F9" mask="url(#mask-2)" stroke-width="4" xlink:href="#path-1"></use>
+                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-1"></use>
+                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                                 </g>
                             </g>
                             <g id="arrow-copy" transform="translate(111.500000, 17.000000) scale(1, -1) rotate(-90.000000) translate(-111.500000, -17.000000) translate(95.000000, 13.000000)">
-                                <path d="M2,4 L33,4" id="Line" stroke="#E0E4E7" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
+                                <path d="M2,4 L33,4" id="Line" stroke="#445D6E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                                 <g id="Oval">
-                                    <use fill="#E0E4E7" fill-rule="evenodd" xlink:href="#path-3"></use>
-                                    <use stroke="#F7F8F9" mask="url(#mask-4)" stroke-width="4" xlink:href="#path-3"></use>
+                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-2"></use>
+                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                                 </g>
                             </g>
                             <g id="arrow-copy-2" transform="translate(4.500000, 17.000000) scale(1, -1) rotate(-90.000000) translate(-4.500000, -17.000000) translate(-12.000000, 13.000000)">
                                 <path d="M2,4 L33,4" id="Line" stroke="#445D6E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                                 <g id="Oval">
-                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-5"></use>
-                                    <use stroke="#F7F8F9" mask="url(#mask-6)" stroke-width="4" xlink:href="#path-5"></use>
+                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-3"></use>
+                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                                 </g>
                             </g>
                         </g>
@@ -87,30 +63,30 @@
                             <g id="arrow-copy-3" transform="translate(218.500000, 17.000000) scale(1, -1) rotate(-90.000000) translate(-218.500000, -17.000000) translate(202.000000, 13.000000)">
                                 <path d="M2,4 L33,4" id="Line" stroke="#445D6E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                                 <g id="Oval">
-                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-7"></use>
-                                    <use stroke="#F7F8F9" mask="url(#mask-8)" stroke-width="4" xlink:href="#path-7"></use>
+                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-4"></use>
+                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                                 </g>
                             </g>
                             <g id="arrow-copy" transform="translate(111.500000, 17.000000) scale(1, -1) rotate(-90.000000) translate(-111.500000, -17.000000) translate(95.000000, 13.000000)">
                                 <path d="M2,4 L33,4" id="Line" stroke="#445D6E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                                 <g id="Oval">
-                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-9"></use>
-                                    <use stroke="#F7F8F9" mask="url(#mask-10)" stroke-width="4" xlink:href="#path-9"></use>
+                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-5"></use>
+                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                                 </g>
                             </g>
                             <g id="arrow-copy-2" transform="translate(4.500000, 17.000000) scale(1, -1) rotate(-90.000000) translate(-4.500000, -17.000000) translate(-12.000000, 13.000000)">
                                 <path d="M2,4 L33,4" id="Line" stroke="#445D6E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
                                 <g id="Oval">
-                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-11"></use>
-                                    <use stroke="#F7F8F9" mask="url(#mask-12)" stroke-width="4" xlink:href="#path-11"></use>
+                                    <use fill="#445D6E" fill-rule="evenodd" xlink:href="#path-6"></use>
+                                    <circle stroke="#F7F8F9" stroke-width="2" cx="4" cy="4" r="5"></circle>
                                 </g>
                             </g>
                         </g>
                     </g>
                 </g>
-                <g id="swam" transform="translate(22.000000, 34.000000)">
+                <g id="swam" transform="translate(22.000000, 54.000000)">
                     <g id="nodes">
-                        <g id="workers" transform="translate(216.000000, 138.000000)">
+                        <g id="workers" transform="translate(216.000000, 118.000000)">
                             <g id="node-1">
                                 <g id="node">
                                     <g id="node-label">
@@ -122,8 +98,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#A1CFE8" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -145,8 +121,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#A1CFE8" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -159,7 +135,7 @@
                             </g>
                         </g>
                         <g id="workers-dtr" transform="translate(347.000000, 0.000000)">
-                            <g id="node-1-copy-4" transform="translate(0.000000, 20.000000)">
+                            <g id="node-1-copy-4">
                                 <g id="node">
                                     <g id="node-label">
                                         <path d="M0,2.00295631 C0,0.896754086 0.897702336,0 1.99174577,0 L71,0 L71,10.6452381 C71,16.5244408 66.2312425,21.2904762 60.3513837,21.2904762 L0,21.2904762 L0,2.00295631 Z" id="Rectangle-127" fill="#445D6E"></path>
@@ -170,8 +146,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -188,20 +164,66 @@
                                 </g>
                                 <rect id="node-border" stroke="#445D6E" stroke-width="2" x="0" y="0" width="97" height="102" rx="2"></rect>
                             </g>
-                            <g id="node-1-copy" transform="translate(109.000000, 0.000000)">
-                                <rect id="node-border" stroke="#E0E4E7" stroke-width="2" fill="#E0E4E7" x="0" y="20" width="97" height="102" rx="2"></rect>
-                                <text id="+" font-family="OpenSans, Open Sans" font-size="100" font-weight="normal" fill="#F7F8F9">
-                                    <tspan x="20.4111328" y="107">+</tspan>
-                                </text>
+                            <g id="node-1-copy-5" transform="translate(107.000000, 0.000000)">
+                                <g id="node">
+                                    <g id="node-label">
+                                        <path d="M0,2.00295631 C0,0.896754086 0.897702336,0 1.99174577,0 L71,0 L71,10.6452381 C71,16.5244408 66.2312425,21.2904762 60.3513837,21.2904762 L0,21.2904762 L0,2.00295631 Z" id="Rectangle-127" fill="#445D6E"></path>
+                                        <text id="worker-node" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
+                                            <tspan x="6" y="14">worker node</tspan>
+                                        </text>
+                                    </g>
+                                </g>
+                                <g id="engine" transform="translate(1.000000, 79.000000)">
+                                    <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
+                                    </text>
+                                </g>
+                                <g id="ucp" transform="translate(1.000000, 56.000000)">
+                                    <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
+                                    <text id="UCP-worker" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="20.4755859" y="15">UCP worker</tspan>
+                                    </text>
+                                </g>
+                                <g id="ucp-copy" transform="translate(1.000000, 33.000000)">
+                                    <rect id="Rectangle-138" fill="#FFB463" x="0" y="0" width="95" height="22" rx="2"></rect>
+                                    <text id="DTR" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="38.4980469" y="15">DTR</tspan>
+                                    </text>
+                                </g>
+                                <rect id="node-border" stroke="#445D6E" stroke-width="2" x="0" y="0" width="97" height="102" rx="2"></rect>
                             </g>
-                            <g id="node-1-copy-5" transform="translate(216.000000, 0.000000)">
-                                <rect id="node-border" stroke="#E0E4E7" stroke-width="2" fill="#E0E4E7" x="0" y="20" width="97" height="102" rx="2"></rect>
-                                <text id="+" font-family="OpenSans, Open Sans" font-size="100" font-weight="normal" fill="#F7F8F9">
-                                    <tspan x="20.4111328" y="107">+</tspan>
-                                </text>
+                            <g id="node-1-copy-6" transform="translate(214.000000, 0.000000)">
+                                <g id="node">
+                                    <g id="node-label">
+                                        <path d="M0,2.00295631 C0,0.896754086 0.897702336,0 1.99174577,0 L71,0 L71,10.6452381 C71,16.5244408 66.2312425,21.2904762 60.3513837,21.2904762 L0,21.2904762 L0,2.00295631 Z" id="Rectangle-127" fill="#445D6E"></path>
+                                        <text id="worker-node" font-family="OpenSans, Open Sans" font-size="8" font-weight="normal" fill="#FFFFFF">
+                                            <tspan x="6" y="14">worker node</tspan>
+                                        </text>
+                                    </g>
+                                </g>
+                                <g id="engine" transform="translate(1.000000, 79.000000)">
+                                    <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
+                                    </text>
+                                </g>
+                                <g id="ucp" transform="translate(1.000000, 56.000000)">
+                                    <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
+                                    <text id="UCP-worker" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="20.4755859" y="15">UCP worker</tspan>
+                                    </text>
+                                </g>
+                                <g id="ucp-copy" transform="translate(1.000000, 33.000000)">
+                                    <rect id="Rectangle-138" fill="#FFB463" x="0" y="0" width="95" height="22" rx="2"></rect>
+                                    <text id="DTR" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="38.4980469" y="15">DTR</tspan>
+                                    </text>
+                                </g>
+                                <rect id="node-border" stroke="#445D6E" stroke-width="2" x="0" y="0" width="97" height="102" rx="2"></rect>
                             </g>
                         </g>
-                        <g id="managers-ucp" transform="translate(0.000000, 20.000000)">
+                        <g id="managers-ucp">
                             <g id="node-1">
                                 <g id="node">
                                     <g id="node-label">
@@ -213,8 +235,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -236,8 +258,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
@@ -259,8 +281,8 @@
                                 </g>
                                 <g id="engine" transform="translate(1.000000, 79.000000)">
                                     <rect id="Rectangle-138" fill="#1488C6" x="0" y="0" width="95" height="22" rx="2"></rect>
-                                    <text id="CS-Docker-Engine" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
-                                        <tspan x="7.26025391" y="15">CS Docker Engine</tspan>
+                                    <text id="Docker-Engine-EE" font-family="OpenSans, Open Sans" font-size="10" font-weight="normal" fill="#FFFFFF">
+                                        <tspan x="7.59716797" y="15">Docker Engine EE</tspan>
                                     </text>
                                 </g>
                                 <g id="ucp" transform="translate(1.000000, 56.000000)">
diff --git a/datacenter/dtr/2.3/guides/images/use-your-certificates-1.png b/datacenter/dtr/2.3/guides/images/use-your-certificates-1.png
index c23e89e2aa..bf841a31f5 100644
Binary files a/datacenter/dtr/2.3/guides/images/use-your-certificates-1.png and b/datacenter/dtr/2.3/guides/images/use-your-certificates-1.png differ
diff --git a/datacenter/dtr/2.3/guides/user/manage-images/index.md b/datacenter/dtr/2.3/guides/user/manage-images/index.md
index f0056fba69..44fa397438 100644
--- a/datacenter/dtr/2.3/guides/user/manage-images/index.md
+++ b/datacenter/dtr/2.3/guides/user/manage-images/index.md
@@ -30,7 +30,7 @@ Click **Save** to create the repository.
 
 When creating a repository in DTR, the full name of the repository becomes
 `<dtr-domain-name>/<user-or-org>/<repository-name>`. In this example, the full
-name of our repository will be `dtr.local:4443/admin/golang`.
+name of our repository will be `dtr.example.org/dave.lauper/golang`.
 
 ## Where to go next
 
diff --git a/datacenter/dtr/2.3/guides/user/manage-images/prevent-tags-from-being-overwritten.md b/datacenter/dtr/2.3/guides/user/manage-images/prevent-tags-from-being-overwritten.md
index e00b2934cf..b402360fe3 100644
--- a/datacenter/dtr/2.3/guides/user/manage-images/prevent-tags-from-being-overwritten.md
+++ b/datacenter/dtr/2.3/guides/user/manage-images/prevent-tags-from-being-overwritten.md
@@ -5,9 +5,14 @@ description: Learn how to make your tags immutable and don't allow users to
 keywords: docker, registry, immutable
 ---
 
+{% assign domain="dtr.example.org" %}
+{% assign org="library" %}
+{% assign repo="wordpress" %}
+{% assign tag="latest" %}
+
 By default, users with access to push to a repository, can push the same tag
 multiple times to the same repository.
-As an example, a user pushes an image to `site/wordpress:4.7`, and later another
+As an example, a user pushes an image to `{{ org }}/{{ repo }}:{{ tag }}`, and later another
 user can push the image with exactly the same name but different functionality.
 This might make it difficult to trace back the image to the build that generated
 it.
@@ -27,8 +32,8 @@ From now on, users will get an error message when trying to push a tag
 that already exists:
 
 ```none
-docker push dtr.example.org/site/wordpress:4.7
-unknown: tag=4.7 cannot be overwritten because dtr.example.org/site/wordpress is an immutable repository
+docker push {{ domain }}/{{ org }}/{{ repo }}:{{ tag }}
+unknown: tag={{ tag }} cannot be overwritten because {{ domain }}/{{ org }}/{{ repo }} is an immutable repository
 ```
 
 ## Where to go next
diff --git a/datacenter/dtr/2.3/guides/user/manage-images/pull-and-push-images.md b/datacenter/dtr/2.3/guides/user/manage-images/pull-and-push-images.md
index 789c1f319e..74a0847114 100644
--- a/datacenter/dtr/2.3/guides/user/manage-images/pull-and-push-images.md
+++ b/datacenter/dtr/2.3/guides/user/manage-images/pull-and-push-images.md
@@ -4,6 +4,11 @@ description: Learn how to pull and push images to Docker Trusted Registry.
 keywords: docker, registry, push, pull
 ---
 
+{% assign domain="dtr.example.org" %}
+{% assign org="library" %}
+{% assign repo="wordpress" %}
+{% assign tag="latest" %}
+
 You interact with Docker Trusted registry in the same way you interact with
 Docker Hub or any other registry:
 
@@ -17,40 +22,40 @@ Pulling an image from Docker Trusted Registry is the same as pulling an image
 from Docker Hub or any other registry. Since DTR is secure by default, you
 always need to authenticate before pulling images.
 
-In this example, DTR can be accessed at dtr.company.org, and the user
-was granted permissions to access the Java, Python, and Golang repositories.
+In this example, DTR can be accessed at {{ domain }}, and the user
+was granted permissions to access the NGINX, and Wordpress repositories.
 
-![](../../images/pull-push-images-1.png)
+![](../../images/pull-push-images-1.png){: .with-border}
 
 Click on the repository to see its details.
 
-![](../../images/pull-push-images-2.png)
+![](../../images/pull-push-images-2.png){: .with-border}
 
-To pull the 1.7 tag of the admin/golang image, run:
+To pull the {{ tag }} tag of the {{ org }}/{{ repo }} image, run:
 
 ```bash
-$ docker login dtr.local:4443
-$ docker pull dtr.local:4443/admin/golang:1.7
+$ docker login {{ domain }}
+$ docker pull {{ domain }}/{{ org }}/{{ repo }}:{{ tag }}
 ```
 
 ## Push an image
 
 Before you can push an image to DTR you need to [create a repository](index.md)
 to store the image. In this example the full name of our repository is
-`dtr.local/admin/golang`.
+`{{ domain }}/{{ org }}/{{ repo }}`.
 
 ### Tag the image
 
-In this example we'll pull the Golang image from Docker Hub and tag with with
+In this example we'll pull the {{ repo }} image from Docker Hub and tag with with
 the full DTR and repository name. A tag defines where the image was pulled
 from, and where it will be pushed to.
 
 ```bash
-# Pull from Docker Hub the 1.7 tag of the golang image
-$ docker pull golang:1.7
+# Pull from Docker Hub the {{ tag }} tag of the {{ repo }} image
+$ docker pull {{ repo }}:{{ tag }}
 
-# Tag the golang:1.7 image with the full repository name we've created in DTR
-$ docker tag golang:1.7 dtr.local:4443/admin/golang:1.7
+# Tag the {{ repo }}:{{ tag }} image with the full repository name we've created in DTR
+$ docker tag {{ repo }}:{{ tag }} {{ domain }}/{{ org }}/{{ repo }}:{{ tag }}
 ```
 
 ### Push the image
@@ -59,13 +64,13 @@ Now that you have tagged the image, you only need to authenticate and push the
 image to DTR.
 
 ```bash
-$ docker login dtr.local:4443
-$ docker push dtr.local:4443/admin/golang:1.7
+$ docker login {{ domain }}
+$ docker push {{ domain }}/{{ org }}/{{ repo }}:{{ tag }}
 ```
 
 Go back to the **DTR web UI** to validate that the tag was successfully pushed.
 
-![](../../images/pull-push-images-3.png)
+![](../../images/pull-push-images-3.png){: .with-border}
 
 ### Windows images
 
diff --git a/datacenter/dtr/2.3/guides/user/manage-images/scan-images-for-vulnerabilities.md b/datacenter/dtr/2.3/guides/user/manage-images/scan-images-for-vulnerabilities.md
index 3ec96aa28b..97cc5d09d4 100644
--- a/datacenter/dtr/2.3/guides/user/manage-images/scan-images-for-vulnerabilities.md
+++ b/datacenter/dtr/2.3/guides/user/manage-images/scan-images-for-vulnerabilities.md
@@ -57,19 +57,9 @@ If your repository owner enabled Docker Security Scanning but disabled automatic
 scanning, you can manually start a scan for images in repositories to which you
 have `write` access.
 
-To start a security scan:
+To start a security scan, navigate to the **tag details**.
 
-1. Navigate to the repository.
-2. Click the **Images** tab.
-3. Locate the image tag that you want to scan.
-4. In the **Vulnerabilities** column, click **Start a scan**.
-![](../../images/scanning-images-1.png){: .with-border}
-
-You can also start a scan from the image details screen:
-
-1. Click **View Details** on the desired image tag.
-2. Click **Scan** on the right-hand side, above the layers table.
-![](../../images/scanning-images-2.png){: .with-border}
+![](../../images/scan-images-for-vulns-1.png){: .with-border}
 
 DTR begins the scanning process. You will need to refresh the page to see the
 results once the scan is complete.
@@ -89,7 +79,7 @@ To change the repository scanning mode:
 1. Navigate to the repository, and click the **Settings** tab.
 2. Scroll down to the **Image scanning** section.
 3. Select the desired scanning mode.
-![](../../images/security-scanning-setup-5.png){: .with-border}
+![](../../images/scan-images-for-vulns-2.png){: .with-border}
 
 ## View security scan results
 
@@ -98,7 +88,7 @@ Once DTR has run a security scan for an image, you can view the results.
 The **Images** tab for each repository includes a summary of the most recent
 scan results for each image.
 
-![](../../images/scanning-images-4.png){: .with-border}
+![](../../images/scan-images-for-vulns-3.png){: .with-border}
 - A green shield icon with a check mark indicates that the scan did not find
 any vulnerabilities.
 - A red or orange shield icon indicates that vulnerabilities were found, and
@@ -127,7 +117,7 @@ by the Dockerfile.
     > **Tip**: The layers view can be long, so be sure
     to scroll down if you don't immediately see the reported vulnerabilities.
 
-   ![](../../images/scanning-images-5.png){: .with-border}
+   ![](../../images/scan-images-for-vulns-4.png){: .with-border}
 
 - The **Components** view lists the individual component libraries indexed by
 the scanning system, in order of severity and number of vulnerabilities found,
@@ -139,7 +129,7 @@ most vulnerable first.
     the scan report provides details on each one. The component details also
     include the license type used by the component, and the filepath to the
     component in the image.
-![](../../images/scanning-images-6.png){: .with-border}
+![](../../images/scan-images-for-vulns-5.png){: .with-border}
 
 ### What do I do next?