diff --git a/packages/frinx-inventory-client/src/__generated__/graphql.ts b/packages/frinx-inventory-client/src/__generated__/graphql.ts
index 44428f93e..18970bcfc 100644
--- a/packages/frinx-inventory-client/src/__generated__/graphql.ts
+++ b/packages/frinx-inventory-client/src/__generated__/graphql.ts
@@ -659,6 +659,7 @@ export type Device = Node & {
   name: Scalars['String']['output'];
   port: Maybe<Scalars['Int']['output']>;
   serviceState: DeviceServiceState;
+  software: Maybe<Scalars['String']['output']>;
   source: DeviceSource;
   updatedAt: Scalars['String']['output'];
   vendor: Maybe<Scalars['String']['output']>;
@@ -687,6 +688,11 @@ export type DeviceEdge = {
   node: Device;
 };
 
+export type DeviceListUsage = {
+  __typename?: 'DeviceListUsage';
+  devicesUsage: Array<Maybe<DevicesUsage>>;
+};
+
 export type DeviceOrderByInput = {
   direction: SortDirection;
   sortKey: SortDeviceBy;
@@ -707,6 +713,19 @@ export type DeviceSource =
   | 'IMPORTED'
   | 'MANUAL';
 
+export type DeviceUsage = {
+  __typename?: 'DeviceUsage';
+  cpuLoad: Scalars['Float']['output'];
+  memoryLoad: Scalars['Float']['output'];
+};
+
+export type DevicesUsage = {
+  __typename?: 'DevicesUsage';
+  cpuLoad: Scalars['Float']['output'];
+  deviceName: Scalars['String']['output'];
+  memoryLoad: Scalars['Float']['output'];
+};
+
 export type DiffData = {
   __typename?: 'DiffData';
   data: Scalars['String']['output'];
@@ -1075,13 +1094,12 @@ export type OutputParameters = {
   value: Scalars['String']['output'];
 };
 
-/** Holds information about the requested pagination page */
 export type PageInfo = {
   __typename?: 'PageInfo';
-  endCursor: Maybe<Scalars['Cursor']['output']>;
+  endCursor: Maybe<Scalars['String']['output']>;
   hasNextPage: Scalars['Boolean']['output'];
   hasPreviousPage: Scalars['Boolean']['output'];
-  startCursor: Maybe<Scalars['Cursor']['output']>;
+  startCursor: Maybe<Scalars['String']['output']>;
 };
 
 export type PaginationArgs = {
@@ -3329,10 +3347,24 @@ export type DeviceInventoryQueryZonesArgs = {
 
 export type DeviceInventorySubscription = {
   __typename?: 'deviceInventorySubscription';
+  deviceUsage: Maybe<DeviceUsage>;
+  devicesUsage: Maybe<DeviceListUsage>;
   uniconfigShell: Maybe<Scalars['String']['output']>;
 };
 
 
+export type DeviceInventorySubscriptionDeviceUsageArgs = {
+  deviceName: Scalars['String']['input'];
+  refreshEverySec?: InputMaybe<Scalars['Int']['input']>;
+};
+
+
+export type DeviceInventorySubscriptionDevicesUsageArgs = {
+  deviceNames: Array<Scalars['String']['input']>;
+  refreshEverySec?: InputMaybe<Scalars['Int']['input']>;
+};
+
+
 export type DeviceInventorySubscriptionUniconfigShellArgs = {
   input?: InputMaybe<Scalars['String']['input']>;
   sessionId: Scalars['String']['input'];
@@ -3956,7 +3988,7 @@ export type DevicesQueryVariables = Exact<{
 }>;
 
 
-export type DevicesQuery = { __typename?: 'Query', deviceInventory: { __typename?: 'deviceInventoryQuery', devices: { __typename?: 'DeviceConnection', edges: Array<{ __typename?: 'DeviceEdge', node: { __typename?: 'Device', id: string, name: string, createdAt: string, isInstalled: boolean, serviceState: DeviceServiceState, zone: { __typename?: 'Zone', id: string, name: string } } }>, pageInfo: { __typename?: 'PageInfo', startCursor: any | null, endCursor: any | null, hasNextPage: boolean, hasPreviousPage: boolean } } } };
+export type DevicesQuery = { __typename?: 'Query', deviceInventory: { __typename?: 'deviceInventoryQuery', devices: { __typename?: 'DeviceConnection', edges: Array<{ __typename?: 'DeviceEdge', node: { __typename?: 'Device', id: string, name: string, createdAt: string, isInstalled: boolean, serviceState: DeviceServiceState, version: string | null, model: string | null, software: string | null, zone: { __typename?: 'Zone', id: string, name: string } } }>, pageInfo: { __typename?: 'PageInfo', startCursor: string | null, endCursor: string | null, hasNextPage: boolean, hasPreviousPage: boolean } } } };
 
 export type InstallDeviceMutationVariables = Exact<{
   id: Scalars['String']['input'];
@@ -4053,7 +4085,7 @@ export type StreamsQueryVariables = Exact<{
 }>;
 
 
-export type StreamsQuery = { __typename?: 'Query', deviceInventory: { __typename?: 'deviceInventoryQuery', streams: { __typename?: 'StreamConnection', edges: Array<{ __typename?: 'StreamEdge', node: { __typename?: 'Stream', id: string, streamName: string, deviceName: string, createdAt: string, isActive: boolean } }>, pageInfo: { __typename?: 'PageInfo', startCursor: any | null, endCursor: any | null, hasNextPage: boolean, hasPreviousPage: boolean } } } };
+export type StreamsQuery = { __typename?: 'Query', deviceInventory: { __typename?: 'deviceInventoryQuery', streams: { __typename?: 'StreamConnection', edges: Array<{ __typename?: 'StreamEdge', node: { __typename?: 'Stream', id: string, streamName: string, deviceName: string, createdAt: string, isActive: boolean } }>, pageInfo: { __typename?: 'PageInfo', startCursor: string | null, endCursor: string | null, hasNextPage: boolean, hasPreviousPage: boolean } } } };
 
 export type ActivateStreamMutationVariables = Exact<{
   id: Scalars['String']['input'];
diff --git a/packages/frinx-inventory-client/src/pages/device-list/device-list.tsx b/packages/frinx-inventory-client/src/pages/device-list/device-list.tsx
index 03585d189..67dcc63cf 100644
--- a/packages/frinx-inventory-client/src/pages/device-list/device-list.tsx
+++ b/packages/frinx-inventory-client/src/pages/device-list/device-list.tsx
@@ -79,6 +79,9 @@ const DEVICES_QUERY = gql`
             createdAt
             isInstalled
             serviceState
+            version
+            model
+            software
             zone {
               id
               name
diff --git a/packages/frinx-inventory-client/src/pages/device-list/device-table.tsx b/packages/frinx-inventory-client/src/pages/device-list/device-table.tsx
index a63bb051a..75fd64be5 100644
--- a/packages/frinx-inventory-client/src/pages/device-list/device-table.tsx
+++ b/packages/frinx-inventory-client/src/pages/device-list/device-table.tsx
@@ -71,6 +71,9 @@ const DeviceTable: VoidFunctionComponent<Props> = ({
               )}
             </Flex>
           </Th>
+          <Th>
+            <Text>Model/Version</Text>
+          </Th>
           <Th>
             <Flex
               alignItems="center"
@@ -111,6 +114,7 @@ const DeviceTable: VoidFunctionComponent<Props> = ({
           const { isInstalled } = device;
           const localDate = getLocalDateFromUTC(device.createdAt);
           const isLoading = installLoadingMap[device.id] ?? false;
+          const isUnknown = device.model == null && device.software == null && device.version == null;
 
           return (
             <Tr key={device.id}>
@@ -122,8 +126,27 @@ const DeviceTable: VoidFunctionComponent<Props> = ({
                 />
               </Td>
               <Td>
-                <Text data-cy={`device-name-${device.name}`} as="span" fontWeight={600}>
-                  {device.name}
+                <HStack>
+                  <Text
+                    data-cy={`device-name-${device.name}`}
+                    as="span"
+                    fontWeight={600}
+                    textColor={isUnknown ? 'gray.400' : 'black'}
+                  >
+                    {device.name}
+                  </Text>
+                  {isUnknown && (
+                    <Tooltip label="This device is currently unknown to the network, since we do not have any information on its model and software version">
+                      <Text data-cy={`device-id-${device.name}`} as="span" fontSize="sm" color="blackAlpha.700">
+                        <Icon size={12} as={FeatherIcon} icon="info" />
+                      </Text>
+                    </Tooltip>
+                  )}
+                </HStack>
+              </Td>
+              <Td>
+                <Text data-cy="device-name-software" as="span">
+                  {device.model ?? device.software ?? '?'} / {device.version ?? '?'}
                 </Text>
               </Td>
               <Td>