diff --git a/ceilometer/files/queens/event_definitions.yaml b/ceilometer/files/queens/event_definitions.yaml
index 83b4650..0814e2a 100644
--- a/ceilometer/files/queens/event_definitions.yaml
+++ b/ceilometer/files/queens/event_definitions.yaml
@@ -83,9 +83,9 @@
     created_at:
       fields: payload.created_at
     image_id:
-      fields: payload.glance_metadata[?key=image_id][0].value
+      fields: payload.glance_metadata[?key=image_id].value
     instance_id:
-      fields: payload.volume_attachment[0].server_id
+      fields: payload.volume_attachment[0].instance_uuid
 - event_type: ['volume.exists', 'volume.retype', 'volume.create.*', 'volume.delete.*', 'volume.resize.*', 'volume.attach.*', 'volume.detach.*', 'volume.update.*']
   traits:
     <<: *cinder_traits