diff --git a/source/_components/binary_sensor.upcloud.markdown b/source/_components/binary_sensor.upcloud.markdown
deleted file mode 100644
index 2723cefa5bf..00000000000
--- a/source/_components/binary_sensor.upcloud.markdown
+++ /dev/null
@@ -1,36 +0,0 @@
----
-layout: page
-title: UpCloud Binary Sensor
-description: Instructions on how to set up UpCloud binary sensors within Home Assistant.
-date: 2018-01-28 20:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-ha_category: System Monitor
-logo: upcloud.png
-ha_release: 0.65
-ha_iot_class: Cloud Polling
----
-
-The `upcloud` binary sensor platform allows you to monitor your UpCloud servers.
-
-## {% linkable_title Configuration %}
-
-To use your UpCloud servers, you first have to set up your [UpCloud hub](/components/upcloud/) and then add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-binary_sensor:
-  - platform: upcloud
-    servers:
-      - 002167b7-4cb1-44b7-869f-e0900ddeeae1
-      - 00886296-6137-4074-afe3-068e16d89d00
-```
-
-{% configuration %}
-servers:
-  description: List of servers you want to monitor.
-  required: true
-  type: list
-{% endconfiguration %}
diff --git a/source/_components/switch.upcloud.markdown b/source/_components/switch.upcloud.markdown
deleted file mode 100644
index bdd03f6af5e..00000000000
--- a/source/_components/switch.upcloud.markdown
+++ /dev/null
@@ -1,36 +0,0 @@
----
-layout: page
-title: UpCloud Switch
-description: Instructions on how to set up UpCloud switches within Home Assistant.
-date: 2018-01-28 20:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: upcloud.png
-ha_category: System Monitor
-ha_release: 0.65
-ha_iot_class: Cloud Polling
----
-
-The `upcloud` switch platform allows you to control (start/stop) your UpCloud servers.
-
-## {% linkable_title Configuration %}
-
-To use your UpCloud servers, you first have to set up your [UpCloud hub](/components/upcloud/) and then add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-switch:
-  - platform: upcloud
-    servers:
-      - 002167b7-4cb1-44b7-869f-e0900ddeeae1
-      - 00886296-6137-4074-afe3-068e16d89d00
-```
-
-{% configuration %}
-servers:
-  description: List of servers you want to control.
-  required: true
-  type: list
-{% endconfiguration %}
diff --git a/source/_components/upcloud.markdown b/source/_components/upcloud.markdown
index 9b5807e536b..517f2ed39d3 100644
--- a/source/_components/upcloud.markdown
+++ b/source/_components/upcloud.markdown
@@ -7,14 +7,25 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-ha_category: System Monitor
+ha_category:
+  - System Monitor
+  - Binary Sensor
+  - Switch
 ha_release: 0.65
 logo: upcloud.png
 ha_iot_class: Cloud Polling
+redirect_from:
+  - /components/binary_sensor.upcloud/
+  - /components/switch.upcloud/
 ---
 
 The `upcloud` component allows you to access the information about your [UpCloud](https://www.upcloud.com/) servers from Home Assistant.
 
+There is currently support for the following device types within Home Assistant:
+
+- [Binary Sensor](#binary-sensor)
+- [Switch](#switch)
+
 ## {% linkable_title Setup %}
 
 Set up your API user credentials in your [UpCloud control panel](https://my.upcloud.com/).
@@ -45,3 +56,47 @@ scan_interval:
   type: integer
   default: 60
 {% endconfiguration %}
+
+## {% linkable_title Binary Sensor %}
+
+The `upcloud` binary sensor platform allows you to monitor your UpCloud servers.
+
+To use your UpCloud servers, you first have to set up your [UpCloud hub](#configuration) and then add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+binary_sensor:
+  - platform: upcloud
+    servers:
+      - 002167b7-4cb1-44b7-869f-e0900ddeeae1
+      - 00886296-6137-4074-afe3-068e16d89d00
+```
+
+{% configuration %}
+servers:
+  description: List of servers you want to monitor.
+  required: true
+  type: list
+{% endconfiguration %}
+
+## {% linkable_title Switch %}
+
+The `upcloud` switch platform allows you to control (start/stop) your UpCloud servers.
+
+To use your UpCloud servers, you first have to set up your [UpCloud hub](#configuration) and then add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+switch:
+  - platform: upcloud
+    servers:
+      - 002167b7-4cb1-44b7-869f-e0900ddeeae1
+      - 00886296-6137-4074-afe3-068e16d89d00
+```
+
+{% configuration %}
+servers:
+  description: List of servers you want to control.
+  required: true
+  type: list
+{% endconfiguration %}