diff --git a/ceilometer/api/controllers/v2.py b/ceilometer/api/controllers/v2.py
index 9c0d830ec..2a2fdd969 100644
--- a/ceilometer/api/controllers/v2.py
+++ b/ceilometer/api/controllers/v2.py
@@ -2591,9 +2591,12 @@ class Capabilities(_Base):
                                                  'complex': True}}},
                 'events': {'query': {'simple': True}},
             }),
-            storage=_flatten_capabilities({'production_ready': True}),
-            alarm_storage=_flatten_capabilities({'production_ready': True}),
-            event_storage=_flatten_capabilities({'production_ready': True}),
+            storage=_flatten_capabilities(
+                {'storage': {'production_ready': True}}),
+            alarm_storage=_flatten_capabilities(
+                {'storage': {'production_ready': True}}),
+            event_storage=_flatten_capabilities(
+                {'storage': {'production_ready': True}}),
         )