diff --git a/core/mondoo-linux-inventory.mql.yaml b/core/mondoo-linux-inventory.mql.yaml
index b3990aa..0331a5a 100644
--- a/core/mondoo-linux-inventory.mql.yaml
+++ b/core/mondoo-linux-inventory.mql.yaml
@@ -4,7 +4,7 @@
 packs:
   - uid: mondoo-linux-inventory
     name: Linux Inventory Pack
-    version: 1.6.1
+    version: 1.7.0
     license: BUSL-1.1
     authors:
       - name: Mondoo, Inc
@@ -152,14 +152,14 @@ packs:
           asset.family.contains('linux')
           packages.where(name == /xorg|xserver|wayland/i).any(installed)
         mql: |
-          lsblk.list.where(fstype == /crypt/) {command('cryptsetup luksDump /dev/' + name).stdout}
+          lsblk.list.where(fstype == /crypt/) {parse.json(content: command('cryptsetup --dump-json-metadata luksDump /dev/' + name).stdout).params}
       - uid: mondoo-linux-workstation-security-disk-encryption-metadata
         title: Disk encryption metadata
         filters: |
           asset.family.contains('linux')
           packages.where(name == /xorg|xserver|wayland/i).any(installed)
         mql: |
-          command('lsblk').stdout
+          parse.json(content: command('lsblk --json').stdout).params
       - uid: mondoo-linux-logged-in-users
         title: Logged-in users
-        mql: command('users').stdout
+        mql: command('w -h').stdout
diff --git a/core/mondoo-macos-inventory.mql.yaml b/core/mondoo-macos-inventory.mql.yaml
index 99f852c..272ac72 100644
--- a/core/mondoo-macos-inventory.mql.yaml
+++ b/core/mondoo-macos-inventory.mql.yaml
@@ -4,7 +4,7 @@
 packs:
   - uid: mondoo-macos-inventory
     name: macOS Inventory Pack
-    version: 1.5.0
+    version: 1.6.0
     license: BUSL-1.1
     authors:
       - name: Mondoo, Inc
@@ -131,7 +131,7 @@ packs:
           parse.json(content: command('system_profiler SPConfigurationProfileDataType -json').stdout).params
       - uid: mondoo-macos-logged-in-users
         title: Logged-in users
-        mql: command('users').stdout
+        mql: command('w -h').stdout
       - uid: mondoo-macos-system-extensions
         title: macOS System Extensions
         mql: macos.systemExtensions { active enabled identifier state version }