diff --git a/source/_components/binary_sensor.digital_ocean.markdown b/source/_components/binary_sensor.digital_ocean.markdown
index 48e17b354d0..e4bc04ac1cb 100644
--- a/source/_components/binary_sensor.digital_ocean.markdown
+++ b/source/_components/binary_sensor.digital_ocean.markdown
@@ -26,7 +26,10 @@ binary_sensor:
       - 'coreos-512mb-nyc3-01'
 ```
 
-Configuration variables:
-
-- **droplets** (*Required*): List of droplets you want to control.
+{% configuration %}
+droplets:
+  description: List of droplets you want to monitor.
+  required: true
+  type: list
+{% endconfiguration %}
 
diff --git a/source/_components/binary_sensor.iss.markdown b/source/_components/binary_sensor.iss.markdown
index b2b2b3d9015..58c98c7c629 100644
--- a/source/_components/binary_sensor.iss.markdown
+++ b/source/_components/binary_sensor.iss.markdown
@@ -25,9 +25,13 @@ binary_sensor:
   - platform: iss
 ```
 
-Configuration variables:
-
-- **show_on_map** (*Optional*): Option to show the position of the ISS on the map. Defaults to `False`.
+{% configuration %}
+show_on_map:
+  description: Option to show the position of the ISS on the map.
+  required: optionsl
+  default: false
+  type: string
+{% endconfiguration %}
 
 <p class='note warning'>
 If you set `show_on_map` `True` then the location attributes are named `latitude` and `longitude`. The default name of the location attributes is `lat` and `long` to avoid showing them on the map.
diff --git a/source/_components/binary_sensor.random.markdown b/source/_components/binary_sensor.random.markdown
index 7376d6254d9..ea8de4b90cc 100644
--- a/source/_components/binary_sensor.random.markdown
+++ b/source/_components/binary_sensor.random.markdown
@@ -25,10 +25,10 @@ binary_sensor:
 ```
 
 {% configuration %}
-  name:
-    description: Name to use in the frontend.
-    required: false
-    type: string
+name:
+  description: Name to use in the frontend.
+  required: false
+  type: string
 {% endconfiguration %}
 
 See the [entity component options](/docs/configuration/platform_options/) to control how often the main component polls the random binary sensor. The default is 30 seconds.
diff --git a/source/_components/digital_ocean.markdown b/source/_components/digital_ocean.markdown
index 6c5c190ba76..c2e26b9aa3b 100644
--- a/source/_components/digital_ocean.markdown
+++ b/source/_components/digital_ocean.markdown
@@ -26,6 +26,10 @@ digital_ocean:
   access_token: YOUR_API_KEY
 ```
 
-Configuration variables:
+{% configuration %}
+access_token:
+  description: Your Digital Ocean API access token.
+  required: true
+  type: string
+{% endconfiguration %}
 
-- **access_token** (*Required*): Your Digital Ocean API access token.
diff --git a/source/_components/sensor.random.markdown b/source/_components/sensor.random.markdown
index ac61331913b..d550d4b88d0 100644
--- a/source/_components/sensor.random.markdown
+++ b/source/_components/sensor.random.markdown
@@ -24,12 +24,27 @@ sensor:
   - platform: random
 ```
 
-Configuration variables:
-
-- **name** (*Optional*): Name of the sensor to use in the frontend. Defaults to `Random Sensor`.
-- **minimum** (*Optional*): Lower limit for the values. Defaults to `0`.
-- **maximum** (*Optional*): Upper limit for the values. Defaults to `20`.
-- **unit_of_measurement** (*Optional*): Defines the units of measurement of the sensor, if any.
+{% configuration %}
+name:
+  description: Name to use in the frontend.
+  required: false
+  type: string
+  default: Random Sensor
+minimum:
+  description: Lower limit for the values.
+  required: false
+  type: string
+  default: 0
+maximum:
+  description: Upper limit for the values.
+  required: false
+  type: int
+  default: 20
+unit_of_measurement:
+  description: Defines the units of measurement of the sensor, if any.
+  required: false
+  type: string
+{% endconfiguration %}
 
 See the [entity component options][entity-docs] to control how often the main component polls the random sensor. The default is 30 seconds.
 
diff --git a/source/_components/switch.digital_ocean.markdown b/source/_components/switch.digital_ocean.markdown
index 7eb640197d1..e17a74ab35c 100644
--- a/source/_components/switch.digital_ocean.markdown
+++ b/source/_components/switch.digital_ocean.markdown
@@ -26,7 +26,10 @@ switch:
       - 'coreos-512mb-nyc3-01'
 ```
 
-Configuration variables:
-
-- **droplets** (*Required*): List of droplets you want to control.
+{% configuration %}
+droplets:
+  description: List of droplets you want to control.
+  required: true
+  type: list
+{% endconfiguration %}
 
diff --git a/source/_components/weather.bom.markdown b/source/_components/weather.bom.markdown
index 03bc747f403..3a9d64c81a3 100644
--- a/source/_components/weather.bom.markdown
+++ b/source/_components/weather.bom.markdown
@@ -22,10 +22,17 @@ weather:
   - platform: bom
 ```
 
-Configuration variables:
-
-- **name** (*Optional*): The name you would like to give to the weather station.
-- **station** (*Optional*): The station ID string; defaults to the closest station.  See the [`sensor.bom` docs](/components/sensor.bom/) for details on how to find the ID of a station.
+{% configuration %}
+name:
+  description:  The name you would like to give to the weather station.
+  required: optional
+  type: string
+station:
+  description: "The station ID string. See the [`sensor.bom` docs](/components/sensor.bom/) for details on how to find the ID of a station."
+  required: optional
+  default: The closest station
+  type: string
+{% endconfiguration %}
 
 <p class='note'>
 This platform is an alternative to the [`bom`](/components/sensor.bom/) sensor.