diff --git a/docs/sources/alerting/_index.md b/docs/sources/alerting/_index.md
index ac3a4398e98..d94d09cda63 100644
--- a/docs/sources/alerting/_index.md
+++ b/docs/sources/alerting/_index.md
@@ -15,10 +15,11 @@ Grafana 8.0 introduced new and improved alerting that centralizes alerting infor
 
 Grafana alerting is enabled by default for new OSS installations. For older installations, it is still an [opt-in]({{< relref "./unified-alerting/opt-in.md" >}}) feature.
 
-| Release     | Cloud         | Enterprise | OSS                              |
-| ----------- | ------------- | ---------- | -------------------------------- |
-| Grafana 8.2 | On by default | Opt-in     | Opt-in                           |
-| Grafana 8.3 | On by default | Opt-in     | On by default for new installs\* |
+| Release                  | Cloud         | Enterprise    | OSS                              |
+| ------------------------ | ------------- | ------------- | -------------------------------- |
+| Grafana 8.2              | On by default | Opt-in        | Opt-in                           |
+| Grafana 8.3              | On by default | Opt-in        | On by default for new installs\* |
+| Grafana 9.0 (unreleased) | On by default | On by default | On by default                    |
 
 > **Note:** New installs include existing installs which do not have any alerts configured.
 
diff --git a/docs/sources/alerting/old-alerting/_index.md b/docs/sources/alerting/old-alerting/_index.md
index 32695e28573..8d0cd673290 100644
--- a/docs/sources/alerting/old-alerting/_index.md
+++ b/docs/sources/alerting/old-alerting/_index.md
@@ -7,7 +7,7 @@ weight = 114
 
 Grafana alerting is enabled by default for new OSS installations. For older installations, it is still an [opt-in]({{< relref "../unified-alerting/opt-in.md" >}}) feature.
 
-> **Note**: Legacy dashboard alerts is deprecated and will be removed in a future release. We encourage you to migrate to [Grafana alerting]({{< relref "../unified-alerting/_index.md" >}}) for all existing installations.
+> **Note**: Legacy dashboard alerts are deprecated and will be removed in Grafana 9. We encourage you to migrate to [Grafana alerting]({{< relref "../unified-alerting/_index.md" >}}) for all existing installations.
 
 Legacy dashboard alerts have two main components: