diff --git a/_data/toc.yaml b/_data/toc.yaml
index df546ffca9..cfb97a7d95 100644
--- a/_data/toc.yaml
+++ b/_data/toc.yaml
@@ -142,12 +142,8 @@ guides:
       title: Configure and run Docker
     - path: /config/daemon/systemd/
       title: Control Docker with systemd
-  - sectiontitle: Work with external tools
-    section:
-    - path: /config/thirdparty/
-      title: Third-party monitoring tools
-    - path: /config/thirdparty/prometheus/
-      title: Collect Docker metrics with Prometheus
+  - path: /config/daemon/prometheus/
+    title: Collect metrics with Prometheus
   - sectiontitle: Configure containers
     section:
     - path: /config/containers/start-containers-automatically/
@@ -196,16 +192,6 @@ guides:
           title: Journald logging driver
         - path: /config/containers/logging/splunk/
           title: Splunk logging driver
-    - sectiontitle: Work with external tools
-      section:
-      - path: /config/thirdparty/dsc/
-        title: PowerShell DSC usage
-      - path: /config/thirdparty/ansible/
-        title: Ansible
-      - path: /config/thirdparty/chef/
-        title: Chef
-      - path: /config/thirdparty/puppet/
-        title: Puppet
     - sectiontitle: Security
       section:
       - path: /engine/security/security/
diff --git a/config/thirdparty/images/prometheus-graph_idle.png b/config/daemon/images/prometheus-graph_idle.png
similarity index 100%
rename from config/thirdparty/images/prometheus-graph_idle.png
rename to config/daemon/images/prometheus-graph_idle.png
diff --git a/config/thirdparty/images/prometheus-graph_load.png b/config/daemon/images/prometheus-graph_load.png
similarity index 100%
rename from config/thirdparty/images/prometheus-graph_load.png
rename to config/daemon/images/prometheus-graph_load.png
diff --git a/config/thirdparty/images/prometheus-targets.png b/config/daemon/images/prometheus-targets.png
similarity index 100%
rename from config/thirdparty/images/prometheus-targets.png
rename to config/daemon/images/prometheus-targets.png
diff --git a/config/daemon/index.md b/config/daemon/index.md
index fbcb564737..be0df42906 100644
--- a/config/daemon/index.md
+++ b/config/daemon/index.md
@@ -2,10 +2,23 @@
 description: Configuring and troubleshooting the Docker daemon
 keywords: docker, daemon, configuration, troubleshooting
 redirect_from:
+- /engine/articles/chef/
 - /engine/articles/configuring/
+- /engine/articles/dsc/
+- /engine/articles/puppet/
 - /engine/admin/configuring/
 - /engine/admin/
+- /engine/admin/ansible/
+- /engine/admin/chef/
+- /engine/admin/dsc/
+- /engine/admin/puppet/
 - /engine/userguide/
+- /config/thirdparty/
+- /config/thirdparty/ansible/
+- /config/thirdparty/chef/
+- /config/thirdparty/dsc/
+- /config/thirdparty/puppet/
+
 title: Configure and troubleshoot the Docker daemon
 ---
 
diff --git a/config/thirdparty/prometheus.md b/config/daemon/prometheus.md
similarity index 99%
rename from config/thirdparty/prometheus.md
rename to config/daemon/prometheus.md
index 4a2946e0c2..5b3b7b3374 100644
--- a/config/thirdparty/prometheus.md
+++ b/config/daemon/prometheus.md
@@ -4,6 +4,8 @@ keywords: prometheus, metrics
 title: Collect Docker metrics with Prometheus
 redirect_from:
 - /engine/admin/prometheus/
+- /config/thirdparty/monitoring/
+- /config/thirdparty/prometheus/
 ---
 
 [Prometheus](https://prometheus.io/) is an open-source systems monitoring and
diff --git a/config/thirdparty/ansible.md b/config/thirdparty/ansible.md
deleted file mode 100644
index c71fb0d88d..0000000000
--- a/config/thirdparty/ansible.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-description: Installation and using Docker via Ansible
-keywords: ansible, installation, usage, docker, documentation
-title: Use Ansible
-redirect_from:
-- /engine/admin/ansible/
----
-
-Docker no longer maintains specific documentation about using Ansible from within
-Docker. To use Ansible within Docker, see the
-[Ansible documentation](https://www.ansible.com/integrations/containers/docker).
diff --git a/config/thirdparty/chef.md b/config/thirdparty/chef.md
deleted file mode 100644
index 4966b7f7fc..0000000000
--- a/config/thirdparty/chef.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-description: Installation and using Docker via Chef
-keywords: chef, installation, usage, docker, documentation
-redirect_from:
-- /engine/articles/chef/
-- /engine/admin/chef/
-title: Use Chef
----
-
-Docker no longer maintains specific documentation about using Chef from within
-Docker. To use Chef within Docker, see the
-[Chef documentation](https://supermarket.chef.io/cookbooks/docker).
diff --git a/config/thirdparty/dsc.md b/config/thirdparty/dsc.md
deleted file mode 100644
index 1b382bb587..0000000000
--- a/config/thirdparty/dsc.md
+++ /dev/null
@@ -1,170 +0,0 @@
----
-description: Using DSC to configure a new Docker host
-keywords: powershell, dsc, installation, usage, docker,  documentation
-redirect_from:
-- /engine/articles/dsc/
-- /engine/admin/dsc/
-title: Use PowerShell DSC
----
-
-Windows PowerShell Desired State Configuration (DSC) is a configuration
-management tool that extends the existing functionality of Windows PowerShell.
-DSC uses a declarative syntax to define the state in which a target should be
-configured. More information about PowerShell DSC can be found at
-[http://technet.microsoft.com/en-us/library/dn249912.aspx](http://technet.microsoft.com/en-us/library/dn249912.aspx).
-
-## Requirements
-
-To use this guide you need a Windows host with PowerShell v4.0 or newer.
-
-The included DSC configuration script also uses the official PPA so
-only an Ubuntu target is supported. The Ubuntu target must already have the
-required OMI Server and PowerShell DSC for Linux providers installed. More
-information can be found at [https://github.com/MSFTOSSMgmt/WPSDSCLinux](https://github.com/MSFTOSSMgmt/WPSDSCLinux).
-The source repository listed below also includes PowerShell DSC for Linux
-installation and init scripts along with more detailed installation information.
-
-## Installation
-
-The DSC configuration example source is available in the following repository:
-[https://github.com/anweiss/DockerClientDSC](https://github.com/anweiss/DockerClientDSC). It can be cloned with:
-
-    $ git clone https://github.com/anweiss/DockerClientDSC.git
-
-## Usage
-
-The DSC configuration utilizes a set of shell scripts to determine whether or
-not the specified Docker components are configured on the target node(s). The
-source repository also includes a script (`RunDockerClientConfig.ps1`) that can
-be used to establish the required CIM session(s) and execute the
-`Set-DscConfiguration` cmdlet.
-
-More detailed usage information can be found at
-[https://github.com/anweiss/DockerClientDSC](https://github.com/anweiss/DockerClientDSC).
-
-### Install Docker
-The Docker installation configuration is equivalent to running:
-
-```
-apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys\
-36A1D7869245C8950F966E92D8576A8BA88D21E9
-sh -c "echo deb https://apt.dockerproject.org/repo ubuntu-trusty main\
-> /etc/apt/sources.list.d/docker.list"
-apt-get update
-apt-get install docker-engine
-```
-
-Ensure that your current working directory is set to the `DockerClientDSC`
-source and load the DockerClient configuration into the current PowerShell
-session
-
-```powershell
-. .\DockerClient.ps1
-```
-
-Generate the required DSC configuration .mof file for the targeted node
-
-```powershell
-DockerClient -Hostname "myhost"
-```
-
-A sample DSC configuration data file has also been included and can be modified
-and used in conjunction with or in place of the `Hostname` parameter:
-
-```powershell
-DockerClient -ConfigurationData .\DockerConfigData.psd1
-```
-
-Start the configuration application process on the targeted node
-
-```powershell
-.\RunDockerClientConfig.ps1 -Hostname "myhost"
-```
-
-The `RunDockerClientConfig.ps1` script can also parse a DSC configuration data
-file and execute configurations against multiple nodes as such:
-
-```powershell
-.\RunDockerClientConfig.ps1 -ConfigurationData .\DockerConfigData.psd1
-```
-
-### Images
-Image configuration is equivalent to running: `docker pull [image]` or
-`docker image rm -f [IMAGE]`.
-
-Using the same steps defined above, execute `DockerClient` with the `Image`
-parameter and apply the configuration:
-
-```powershell
-DockerClient -Hostname "myhost" -Image "node"
-.\RunDockerClientConfig.ps1 -Hostname "myhost"
-```
-
-You can also configure the host to pull multiple images:
-
-```powershell
-DockerClient -Hostname "myhost" -Image "node","mongo"
-.\RunDockerClientConfig.ps1 -Hostname "myhost"
-```
-
-To remove images, use a hashtable as follows:
-
-```powershell
-DockerClient -Hostname "myhost" -Image @{Name="node"; Remove=$true}
-.\RunDockerClientConfig.ps1 -Hostname $hostname
-```
-
-### Containers
-Container configuration is equivalent to running:
-
-```
-docker run -d --name="[containername]" -p '[port]' -e '[env]' --link '[link]'\
-'[image]' '[command]'
-```
-or
-
-```
-docker container rm -f [containername]
-```
-
-To create or remove containers, you can use the `Container` parameter with one
-or more hashtables. The hashtable(s) passed to this parameter can have the
-following properties:
-
-- Name (required)
-- Image (required unless Remove property is set to `$true`)
-- Port
-- Env
-- Link
-- Command
-- Remove
-
-For example, create a hashtable with the settings for your container:
-
-```powershell
-$webContainer = @{Name="web"; Image="anweiss/docker-platynem"; Port="80:80"}
-```
-
-Then, using the same steps defined above, execute
-`DockerClient` with the `-Image` and `-Container` parameters:
-
-```powershell
-DockerClient -Hostname "myhost" -Image node -Container $webContainer
-.\RunDockerClientConfig.ps1 -Hostname "myhost"
-```
-
-Existing containers can also be removed as follows:
-
-```powershell
-$containerToRemove = @{Name="web"; Remove=$true}
-DockerClient -Hostname "myhost" -Container $containerToRemove
-.\RunDockerClientConfig.ps1 -Hostname "myhost"
-```
-
-Here is a hashtable with all of the properties that can be used to create a
-container:
-
-```powershell
-$containerProps = @{Name="web"; Image="node:latest"; Port="80:80"; `
-Env="PORT=80"; Link="db:db"; Command="grunt"}
-```
diff --git a/config/thirdparty/index.md b/config/thirdparty/index.md
deleted file mode 100644
index ac0c196f63..0000000000
--- a/config/thirdparty/index.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-description: Third-party configuration tools
-keywords: third-party, tools, monitoring, configuration, usage, docker, daemon
-redirect_from:
-- /config/thirdparty/monitoring/
-title: Work with third-party monitoring tools
----
-
-You can configure Docker to use third-party monitoring tools. This topic lists various third-party tools you can use to monitor Docker.
-
-* [Collect Docker metrics using Prometheus](/config/thirdparty/prometheus/)
-
-* [Sysdig Monitoring Solution Brief for Docker Enterprise Edition](https://success.docker.com/article/sysdig-monitoring)
-
-* [Datadog Monitoring Solution Brief for Docker Enterprise Edition](https://success.docker.com/article/datadog-monitoring)
-
-   >**Note**: Docker no longer maintains the previously listed documentation about using Sysdig and Datadog from within Docker.
diff --git a/config/thirdparty/puppet.md b/config/thirdparty/puppet.md
deleted file mode 100644
index 9ee5cce168..0000000000
--- a/config/thirdparty/puppet.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-description: Installing and using Puppet
-keywords: puppet, installation, usage, docker, documentation
-redirect_from:
-- /engine/articles/puppet/
-- /engine/admin/puppet/
-title: Use Puppet
----
-
-Docker no longer maintains documentation specific to using Puppet within
-Docker. To use Puppet within Docker, see
-[Puppet's documentation](https://puppet.com/blog/puppet-docker-running-puppet-container-centric-infrastructure).