diff --git a/_config.yml b/_config.yml
index 48abe3afc5..ecc690c3d8 100644
--- a/_config.yml
+++ b/_config.yml
@@ -157,7 +157,7 @@ defaults:
     values:
       dtr_org: "docker"
       dtr_repo: "dtr"
-      dtr_version: "2.5.0-beta2"
+      dtr_version: "2.5.0-beta3"
   - scope:
       path: "datacenter/dtr/2.4"
     values:
diff --git a/_config_authoring.yml b/_config_authoring.yml
index ae21446dcc..0e9f90909a 100644
--- a/_config_authoring.yml
+++ b/_config_authoring.yml
@@ -62,6 +62,8 @@ tablabels:
   ucp-2.2: Universal Control Plane 2.2
   dtr-2.5: Docker Trusted Registry 2.5
   dtr-2.4: Docker Trusted Registry 2.4
+  engine-17.06: Docker EE Engine 17.06
+  engine-17.03: Docker EE Engine 17.03
   docker-cli-linux: Docker CLI on Mac/Linux
   docker-cli-win: Docker CLI on Windows
   kubectl: Kubernetes CLI
@@ -81,13 +83,26 @@ defaults:
   - scope:
       path: "engine"
     values:
-      win_server_zip_url: "https://download.docker.com/components/engine/windows-server/17.06/docker-17.06.2-ee-4.zip"
+      win_latest_build: "docker-17.06.2-ee-6"
   - scope:
       path: "datacenter"
     values:
-      ucp_latest_image: "docker/ucp:3.0.0-beta1"
-      dtr_latest_image: "docker/dtr:2.5.0"
+      ucp_latest_image: "docker/ucp:3.0.0-beta2"
+      dtr_latest_image: "docker/dtr:2.5.0-beta3"
       enterprise: true
+  - scope:
+      path: "ee/dtr"
+    values:
+      dtr_org: "docker"
+      dtr_repo: "dtr"
+      dtr_version: "2.5.0-beta3"
+  - scope:
+      path: "datacenter/dtr/2.4"
+    values:
+      hide_from_sitemap: true
+      dtr_org: "docker"
+      dtr_repo: "dtr"
+      dtr_version: "2.4.1"
   - scope:
       path: "datacenter/dtr/2.3"
     values:
@@ -110,9 +125,16 @@ defaults:
     values:
       ucp_version: "1.1"
       dtr_version: "2.0"
+  - scope:
+      path: "ee/ucp"
+    values:
+      ucp_org: "docker"
+      ucp_repo: "ucp"
+      ucp_version: "3.0.0-beta2"
   - scope:
       path: "datacenter/ucp/2.2"
     values:
+      hide_from_sitemap: true
       ucp_org: "docker"
       ucp_repo: "ucp"
       ucp_version: "2.2.3"