diff --git a/source/_components/camera.netatmo.markdown b/source/_components/camera.netatmo.markdown
index e452d26b413..eb11c1a1a49 100644
--- a/source/_components/camera.netatmo.markdown
+++ b/source/_components/camera.netatmo.markdown
@@ -29,11 +29,19 @@ camera:
   - platform: netatmo
 ```
 
-Configuration variables:
-
-- **home** (*Optional*): Will display the cameras of this home only.
-- **cameras** array (*Optional*): Cameras to use. Multiple entities allowed.
-    - **camera_name**: Name of the camera to display.
+{% configuration %}
+home:
+  description: Will display the cameras of this home only.
+  required: false
+  type: string
+cameras:
+  description: Cameras to use. Multiple entities allowed.
+  required: false
+  type: list
+  keys:
+    camera_name:
+      description: Name of the camera to display.
+{% endconfiguration %}
 
 If **home** and **cameras** are not provided, all cameras will be displayed. For more control over your cameras check the configuration sample below.
 
diff --git a/source/_components/climate.netatmo.markdown b/source/_components/climate.netatmo.markdown
index a90a1f4353c..bb9e538de08 100644
--- a/source/_components/climate.netatmo.markdown
+++ b/source/_components/climate.netatmo.markdown
@@ -26,11 +26,19 @@ climate:
   - platform: netatmo
 ```
 
-Configuration variables:
-
-- **relay** (*Optional*): Will display the thermostats of this relay only.
-- **thermostat** array (*Optional*): Thermostat to use.
-  - **thermostat_name**: Name of the thermostat to display.
+{% configuration %}
+relay:
+  description: Will display the thermostats of this relay only.
+  required: false
+  type: string
+thermostat:
+  description: Thermostat to use.
+  required: false
+  type: list
+  keys:
+    thermostat_name:
+      description: Name of the thermostat to display.
+{% endconfiguration %}
 
 If **relay** and **thermostat** are not provided, all thermostats will be displayed.