diff --git a/source/_components/ecobee.markdown b/source/_components/ecobee.markdown
index 217922806b2..8a73869f5b6 100644
--- a/source/_components/ecobee.markdown
+++ b/source/_components/ecobee.markdown
@@ -51,10 +51,17 @@ ecobee:
   api_key: asdfghjklqwertyuiopzxcvbnm 
 ```
 
-Configuration variables:
-
-- **api_key** (*Required*): Your ecobee API key. This is only needed for the initial setup of the component. Once registered it can be removed. If you revoke the key in the ecobee portal you will need to update this again and remove the ecobee.conf file in the `.homeassistant` configuration path.
-- **hold_temp** (*Optional*): True/False whether or not to hold changes indefinitely (True) or until the next scheduled event. Defaults to `False`.
+{% configuration %}
+api_key:
+  description: Your ecobee API key. This is only needed for the initial setup of the component. Once registered it can be removed. If you revoke the key in the ecobee portal you will need to update this again and remove the ecobee.conf file in the `.homeassistant` configuration path.
+  required: true
+  type: string
+hold_temp:
+  description: True/False whether or not to hold changes indefinitely (True) or until the next scheduled event.
+  required: false
+  default: "`false`"
+  type: boolean
+{% endconfiguration %}
 
 <p class='img'>
   <img src='{{site_root}}/images/screenshots/ecobee-sensor-badges.png' />
diff --git a/source/_components/notify.ecobee.markdown b/source/_components/notify.ecobee.markdown
index 53f97f69d12..0dbdf6b8ade 100644
--- a/source/_components/notify.ecobee.markdown
+++ b/source/_components/notify.ecobee.markdown
@@ -23,9 +23,12 @@ notify:
     platform: ecobee
 ```
 
-Configuration variables:
-
-- **name** (*Optional*): Setting the optional parameter `name` allows multiple notifiers to be created. The default value is `notify`. The notifier will bind to the service `notify.NOTIFIER_NAME`.
+{% configuration %}
+name:
+  description: Setting the optional parameter `name` allows multiple notifiers to be created. The notifier will bind to the service `notify.NOTIFIER_NAME`.
+  required: false
+  default: "`notify`"
+  type: string
+{% endconfiguration %}
 
 To use notifications, please see the [getting started with automation page](/getting-started/automation/).
-