diff --git a/doc/source/openstack-charms.rst b/doc/source/openstack-charms.rst
index 5243439a..44472a82 100644
--- a/doc/source/openstack-charms.rst
+++ b/doc/source/openstack-charms.rst
@@ -6,34 +6,73 @@ Charms
OpenStack Charms
~~~~~~~~~~~~~~~~
+These charms have stable releases with ongoing maintenance and testing.
+
+* `aodh `_
* `ceilometer `_
* `ceilometer-agent `_
* `cinder `_
* `cinder-backup `_
* `cinder-ceph `_
+* `designate `_
* `glance `_
* `heat `_
* `keystone `_
* `neutron-api `_
-* `neutron-api-odl `_
* `neutron-gateway `_
* `neutron-openvswitch `_
* `nova-cloud-controller `_
* `nova-compute `_
* `openstack-dashboard `_
-* `openvswitch-odl `_
* `swift-proxy `_
* `swift-storage `_
Other Supporting Charms
~~~~~~~~~~~~~~~~~~~~~~~
+These charms have stable releases with ongoing maintenance and testing. They're
+classified differently because the payload of each is not technically an OpenStack project.
+
* `percona-cluster `_
* `rabbitmq-server `_
-* `odl-controller `_
* `lxd `_
-* `ceph `_
* `ceph-osd `_
* `ceph-mon `_
* `ceph-radosgw `_
* `hacluster `_
+* `designate-bind `_
+* `gnocchi `_
+
+Development / Preview Charms
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+These charms are either in development or are released as a beta/preview. This
+is to indicate that additional validation, and further work may be necessary to
+make a stable release for production use.
+
+* `barbican `_
+* `barbican-softhsm `_
+* `ceph-fs `_
+* `cinder-backup `_
+* `keystone-ldap `_
+* `manila `_
+* `manila-generic `_
+* `tempest `_
+
+Maintenance-Mode Charms
+~~~~~~~~~~~~~~~~~~~~~~~
+
+These charms are in maintenance mode, meaning that new features and new releases
+are not actively being added or tested with them. Generally, these were produced
+for demo, PoC, or as examples.
+
+* `neutron-api-odl `_
+* `openvswitch-odl `_
+* `odl-controller `_
+
+Deprecated Charms
+~~~~~~~~~~~~~~~~~
+
+These charms have reached EOL and are deprecated.
+
+* `ceph `_ - Use ceph-osd + ceph-mon instead.