diff --git a/source/_docs/z-wave/control-panel.markdown b/source/_docs/z-wave/control-panel.markdown
index a60590740fd..e3b2f5e6def 100644
--- a/source/_docs/z-wave/control-panel.markdown
+++ b/source/_docs/z-wave/control-panel.markdown
@@ -10,7 +10,7 @@ The Z-Wave control panel is available via **Configuration** → **Integration
 
 <div class='note'>
 
-The current Z-Wave integration will eventually be deprecated and replaced with a [new implementation based on OpenZWave Daemon](https://developers.home-assistant.io/blog/2020/02/04/new-zwave/); it's currently in beta, and you can [try it now](/integrations/ozw/).
+This Z-Wave integration is deprecated and replaced with a [new implementation based on Z-Wave JS](/integrations/zwave_js); it's currently in beta, and you can [try it now](/integrations/zwave_js/).
 
 </div>
 
diff --git a/source/_integrations/zwave.markdown b/source/_integrations/zwave.markdown
index 69a4fa880a0..026de32f162 100644
--- a/source/_integrations/zwave.markdown
+++ b/source/_integrations/zwave.markdown
@@ -29,13 +29,13 @@ ha_platforms:
   - switch
 ---
 
-<p class='note warning'>
+<div class='note warning'>
 
 This integration is deprecated. We recommend using [the Z-Wave JS integration](/integrations/zwave_js).
 
 The Z-Wave integration will no longer receive any updates. It will not be removed unless it becomes incompatible with a future version of Python.
 
-</p>
+</div>
 
 The [Z-Wave](https://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.