diff --git a/source/_components/binary_sensor.digital_ocean.markdown b/source/_components/binary_sensor.digital_ocean.markdown
deleted file mode 100644
index d4e6c15cb62..00000000000
--- a/source/_components/binary_sensor.digital_ocean.markdown
+++ /dev/null
@@ -1,36 +0,0 @@
----
-layout: page
-title: "Digital Ocean Binary Sensor"
-description: "Instructions on how to set up Digital Ocean binary sensors within Home Assistant."
-date: 2016-09-24 08:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-ha_category: System Monitor
-logo: digital_ocean.png
-ha_release: "0.30"
-ha_iot_class: "Local Polling"
----
-
-The `digital_ocean` binary sensor platform allows you to monitor your Digital Ocean droplets.
-
-## {% linkable_title Configuration %}
-
-To use your Digital Ocean droplets, you first have to set up your [Digital Ocean hub](/components/digital_ocean/) and then add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-binary_sensor:
-  - platform: digital_ocean
-    droplets:
-      - 'fedora-512mb-nyc3-01'
-      - 'coreos-512mb-nyc3-01'
-```
-
-{% configuration %}
-droplets:
-  description: List of droplets you want to monitor.
-  required: true
-  type: list
-{% endconfiguration %}
diff --git a/source/_components/digital_ocean.markdown b/source/_components/digital_ocean.markdown
index c0dc3175c29..8826e929604 100644
--- a/source/_components/digital_ocean.markdown
+++ b/source/_components/digital_ocean.markdown
@@ -7,15 +7,25 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-ha_category: System Monitor
+ha_category:
+  - System Monitor
+  - Binary Sensor
+  - Switch
 ha_release: "0.30"
 logo: digital_ocean.png
 ha_iot_class: "Local Polling"
+redirect_from:
+  - /components/binary_sensor.digital_ocean/
+  - /components/switch.digital_ocean/
 ---
 
-
 The `digital_ocean` component allows you to access the information about your [Digital Ocean](https://www.digitalocean.com/) droplets from Home Assistant.
 
+There is currently support for the following device types within Home Assistant:
+
+- [Binary Sensor](/components/digital_ocean/#binary-sensor)
+- [Switch](/components/digital_ocean/#switch)
+
 ## {% linkable_title Setup %}
 
 Obtain your API key from your [Digital Ocean dashboard](https://cloud.digitalocean.com/settings/api/tokens).
@@ -37,3 +47,50 @@ access_token:
   type: string
 {% endconfiguration %}
 
+## {% linkable_title Binary Sensor %}
+
+The `digital_ocean` binary sensor platform allows you to monitor your Digital Ocean droplets.
+
+### {% linkable_title Configuration %}
+
+To use your Digital Ocean droplets, you first have to set up your [Digital Ocean hub](/components/digital_ocean/) and then add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+binary_sensor:
+  - platform: digital_ocean
+    droplets:
+      - 'fedora-512mb-nyc3-01'
+      - 'coreos-512mb-nyc3-01'
+```
+
+{% configuration %}
+droplets:
+  description: List of droplets you want to monitor.
+  required: true
+  type: list
+{% endconfiguration %}
+
+## {% linkable_title Switch %}
+
+The `digital_ocean` switch platform allows you to control (start/stop) your Digital Ocean droplets.
+
+### {% linkable_title Configuration %}
+
+To use your Digital Ocean droplets, you first have to set up your [Digital Ocean hub](/components/digital_ocean/) and then add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+switch:
+  - platform: digital_ocean
+    droplets:
+      - 'fedora-512mb-nyc3-01'
+      - 'coreos-512mb-nyc3-01'
+```
+
+{% configuration %}
+droplets:
+  description: List of droplets you want to control.
+  required: true
+  type: list
+{% endconfiguration %}
diff --git a/source/_components/switch.digital_ocean.markdown b/source/_components/switch.digital_ocean.markdown
deleted file mode 100644
index dc59db6f96e..00000000000
--- a/source/_components/switch.digital_ocean.markdown
+++ /dev/null
@@ -1,37 +0,0 @@
----
-layout: page
-title: "Digital Ocean Switch"
-description: "Instructions on how to set up Digital Ocean switches within Home Assistant."
-date: 2016-09-24 08:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: digital_ocean.png
-ha_category: System Monitor
-ha_release: "0.30"
-ha_iot_class: "Local Polling"
----
-
-The `digital_ocean` switch platform allows you to control (start/stop) your Digital Ocean droplets.
-
-### {% linkable_title Configuration %}
-
-To use your Digital Ocean droplets, you first have to set up your [Digital Ocean hub](/components/digital_ocean/) and then add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-switch:
-  - platform: digital_ocean
-    droplets:
-      - 'fedora-512mb-nyc3-01'
-      - 'coreos-512mb-nyc3-01'
-```
-
-{% configuration %}
-droplets:
-  description: List of droplets you want to control.
-  required: true
-  type: list
-{% endconfiguration %}
-