diff --git a/metadata.yaml b/metadata.yaml
index 47cc9b41..7033834f 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -7,7 +7,9 @@ description: |
  in conjunction by Nova to deliver images from object stores, such as
  OpenStack's Swift service, to Nova's compute nodes.
 tags:
-  - miscellaneous
+  - openstack
+  - storage
+  - misc
 provides:
   nrpe-external-master:
     interface: nrpe-external-master