diff --git a/source/_components/climate.zwave.markdown b/source/_components/climate.zwave.markdown
index b3b913eedf7..3c5f96f7247 100644
--- a/source/_components/climate.zwave.markdown
+++ b/source/_components/climate.zwave.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: z-wave.png
 ha_category: Climate
 ha_release: 0.17
+ha_iot_class: "Local Push"
 ---
 
 
@@ -25,7 +26,7 @@ To enable the climate component for your Z-Wave network, add the following to yo
 
 ```yaml
 climate:
-  platform: zwave
+  - platform: zwave
 ```
 
 Once enabled, any Z-Wave climate devices will be available to Home Assistant. Multiple entities may be created. The following entities are created for a Remotec ZXT-120.
diff --git a/source/_components/cover.zwave.markdown b/source/_components/cover.zwave.markdown
index b01b2af5ab4..b3204b21089 100644
--- a/source/_components/cover.zwave.markdown
+++ b/source/_components/cover.zwave.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: z-wave.png
 ha_category: Cover
 ha_release: 0.23
+ha_iot_class: "Local Push"
 ---
 
 Z-Wave garage doors, blinds, and roller shutters are supported as cover in Home Assistant.
diff --git a/source/_components/fan.zwave.markdown b/source/_components/fan.zwave.markdown
index f49e1004cdc..953620ed3bb 100644
--- a/source/_components/fan.zwave.markdown
+++ b/source/_components/fan.zwave.markdown
@@ -8,7 +8,9 @@ comments: false
 sharing: true
 footer: true
 logo: z-wave.png
+ha_release: 0.38
 ha_category: Fan
+ha_iot_class: "Local Push"
 ---
 
 To get your Z-Wave fans working with Home Assistant, follow the instructions for the general [Z-Wave component](/components/zwave/).
diff --git a/source/_components/light.zwave.markdown b/source/_components/light.zwave.markdown
index 00b3c7b64d3..4053e61f1d3 100644
--- a/source/_components/light.zwave.markdown
+++ b/source/_components/light.zwave.markdown
@@ -9,6 +9,8 @@ sharing: true
 footer: true
 logo: z-wave.png
 ha_category: Light
+ha_release: pre 0.7
+ha_iot_class: "Local Push"
 ---
 
 To get your Z-Wave lights working with Home Assistant, follow the instructions for the general [Z-Wave component](/components/zwave/).
diff --git a/source/_components/lock.zwave.markdown b/source/_components/lock.zwave.markdown
index f3101f33ca7..e1d6fd7b33d 100644
--- a/source/_components/lock.zwave.markdown
+++ b/source/_components/lock.zwave.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: z-wave.png
 ha_category: Lock
 ha_release: 0.19
+ha_iot_class: "Local Push"
 ---
 
 To get your Z-Wave locks working with Home Assistant, follow the instructions for the general [Z-Wave component](/components/zwave/).
diff --git a/source/_components/sensor.zwave.markdown b/source/_components/sensor.zwave.markdown
index 0b4641935a9..2b22c7cce9d 100644
--- a/source/_components/sensor.zwave.markdown
+++ b/source/_components/sensor.zwave.markdown
@@ -9,6 +9,8 @@ sharing: true
 footer: true
 logo: z-wave.png
 ha_category: Sensor
+ha_release: pre 0.7
+ha_iot_class: "Local Push"
 ---
 
 To get your Z-Wave sensors working with Home Assistant, follow the instructions for the general [Z-Wave component](/components/zwave/).
diff --git a/source/_components/switch.zwave.markdown b/source/_components/switch.zwave.markdown
index 3b9f072fa12..2ae97b21807 100644
--- a/source/_components/switch.zwave.markdown
+++ b/source/_components/switch.zwave.markdown
@@ -9,6 +9,8 @@ sharing: true
 footer: true
 logo: z-wave.png
 ha_category: Switch
+ha_release: pre 0.7
+ha_iot_class: "Local Push"
 ---
 
 To get your Z-Wave switches working with Home Assistant, follow the instructions for the general [Z-Wave component](/components/zwave/).
diff --git a/source/_components/zwave.markdown b/source/_components/zwave.markdown
index dd7ba38a0ce..316c2d3bd12 100644
--- a/source/_components/zwave.markdown
+++ b/source/_components/zwave.markdown
@@ -10,6 +10,7 @@ footer: true
 logo: z-wave.png
 ha_category: Hub
 featured: true
+ha_iot_class: "Local Push"
 ---
 
 The [Z-Wave](http://www.z-wave.com/) integration for Home Assistant allows you to observe and control connected Z-Wave devices. Please see the [Z-Wave getting started section](/docs/z-wave/) for in-depth documentation on how to use and setup the Z-Wave component.