diff --git a/salt/fleet/packs/palantir/Fleet/Endpoints/options.yaml b/salt/fleet/packs/palantir/Fleet/Endpoints/options.yaml
index f2bb85d8c..6fd1c9480 100644
--- a/salt/fleet/packs/palantir/Fleet/Endpoints/options.yaml
+++ b/salt/fleet/packs/palantir/Fleet/Endpoints/options.yaml
@@ -3,9 +3,17 @@ kind: options
 spec:
   config:
     decorators:
-      load:
-      - SELECT uuid AS host_uuid FROM system_info;
+      always:
       - SELECT hostname AS hostname FROM system_info;
+      - SELECT codename FROM os_version;
+      - SELECT uuid AS LiveQuery FROM system_info;
+      - SELECT address AS EndpointIP1 FROM interface_addresses where address not
+        like '%:%' and address not like '127%' and address not like '169%' order by
+        interface desc limit 1;
+      - SELECT address AS EndpointIP2 FROM interface_addresses where address not
+        like '%:%' and address not like '127%' and address not like '169%' order by
+        interface asc limit 1;
+      - SELECT hardware_serial FROM system_info;
     file_paths:
       binaries:
       - /usr/bin/%%