diff --git a/src/ceph-volume/ceph_volume/devices/raw/list.py b/src/ceph-volume/ceph_volume/devices/raw/list.py
index bb15bf199012b..7af049e017dc3 100644
--- a/src/ceph-volume/ceph_volume/devices/raw/list.py
+++ b/src/ceph-volume/ceph_volume/devices/raw/list.py
@@ -78,13 +78,13 @@ def generate(self, devs=None):
                 # ignore non-main devices, for now
                 continue
             whoami = oj[dev]['whoami']
-            result[whoami] = {
+            result[oj[dev]['osd_uuid']] = {
                 'type': 'bluestore',
                 'osd_id': int(whoami),
+                'osd_uuid': oj[dev]['osd_uuid'],
+                'ceph_fsid': oj[dev]['ceph_fsid'],
+                'dev': dev
             }
-            for f in ['osd_uuid', 'ceph_fsid']:
-                result[whoami][f] = oj[dev][f]
-            result[whoami]['device'] = dev
         return result
 
     @decorators.needs_root