diff --git a/linux/keyman-config/keyman_config/sentry_handling.py b/linux/keyman-config/keyman_config/sentry_handling.py
index 48cc8255b97..20134685893 100644
--- a/linux/keyman-config/keyman_config/sentry_handling.py
+++ b/linux/keyman-config/keyman_config/sentry_handling.py
@@ -134,6 +134,15 @@ def _sentry_sdk_initialize(self):
             scope.set_tag("platform", platform.platform())
             scope.set_tag("system", platform.system())
             scope.set_tag("tier", __tier__)
+            scope.set_tag("device", platform.node())
+            try:
+                os_release = platform.freedesktop_os_release()
+                scope.set_tag('os', os_release['PRETTY_NAME'])
+                scope.set_tag('os.name', os_release['NAME'])
+                if 'VERSION' in os_release:
+                    scope.set_tag('os.version', os_release['VERSION'])
+            except OSError as e:
+                logging.debug(f'System does not have os_release file: {e.strerror}')
         logging.info("Initialized Sentry error reporting")
 
     def _raven_initialize(self):