diff --git a/README.md b/README.md
index 4262ecc..549c26a 100644
--- a/README.md
+++ b/README.md
@@ -55,10 +55,6 @@ systems that have installed Home Assistant.
 
     Voice assistant powered by Home Assistant.
 
-- **[HomeMatic](/homematic/README.md)**
-
-    HomeMatic central based on OCCU.
-
 - **[Let's Encrypt](/letsencrypt/README.md)**
 
     Manage an create certificates from Let's Encrypt.
@@ -91,10 +87,24 @@ systems that have installed Home Assistant.
 
     TellStick and TellStick Duo service.
 
+- **[Z-Wave JS](/zwave_js/README.md)**
+
+    Allow Home Assistant to talk to a Z-Wave Network via a USB Controller.
+
+### Deprecated Add-ons
+
+- **[HomeMatic](/homematic/README.md)**
+
+    HomeMatic central based on OCCU.
+
+    Deprecated in favor of the much more advanced third-party [RaspberryMatic CCU](https://github.com/jens-maus/RaspberryMatic/tree/master/home-assistant-addon).
+
 - **[OpenZWave](/zwave/README.md)**
 
     Allow Home Assistant to talk to a Z-Wave Network via a USB Controller.
 
+    Deprecated in favor of [Z-Wave JS](/zwave_js/README.md)
+
 ## Support
 
 Got questions?
diff --git a/homematic/config.yaml b/homematic/config.yaml
index eb9dbb1..246225d 100644
--- a/homematic/config.yaml
+++ b/homematic/config.yaml
@@ -47,5 +47,6 @@ schema:
       key: str
       serial: str
   wired_enable: bool
+stage: deprecated
 startup: system
 timeout: 15
diff --git a/zwave/README.md b/zwave/README.md
index 22a7817..4ea4422 100644
--- a/zwave/README.md
+++ b/zwave/README.md
@@ -1,5 +1,9 @@
 # Home Assistant Add-on: OpenZWave
 
+**WARNING: This add-on is deprecated. We recommend using the [Z-Wave JS
+add-on](/zwave_js/README.md) along with its integration. The OpenZWave
+add-on will no longer receive any updates.**
+
 Allow Home Assistant to talk to a Z-Wave Network via a USB Controller.
 
 ![Supports aarch64 Architecture][aarch64-shield] ![Supports amd64 Architecture][amd64-shield] ![Supports armhf Architecture][armhf-shield] ![Supports armv7 Architecture][armv7-shield] ![Supports i386 Architecture][i386-shield]
diff --git a/zwave/config.yaml b/zwave/config.yaml
index 69234f6..92e0743 100644
--- a/zwave/config.yaml
+++ b/zwave/config.yaml
@@ -33,5 +33,5 @@ schema:
   network_key: password
 services:
   - mqtt:want
-stage: experimental
+stage: deprecated
 startup: services