diff --git a/cfg_checker/nodes.py b/cfg_checker/nodes.py
index 9a1fd48..d752655 100644
--- a/cfg_checker/nodes.py
+++ b/cfg_checker/nodes.py
@@ -64,7 +64,6 @@
         # in case API not listed minions, we need all that answer ping
         _active = self.salt.get_active_nodes()
         logger_cli.info("-> nodes responded: {}".format(len(_active)))
-        # just inventory for faster interaction
         # iterate through all accepted nodes and create a dict for it
         self.nodes = {}
         self.skip_list = []
@@ -113,6 +112,14 @@
             self.salt.master_node,
             "_param:openstack_version"
         )[self.salt.master_node]
+        # Preload codenames
+        # do additional queries to get linux codename and arch for each node
+        self.get_specific_pillar_for_nodes("_param:linux_system_codename")
+        self.get_specific_pillar_for_nodes("_param:linux_system_architecture")
+        for _name in self.nodes.keys():
+            _p = self.nodes[_name]['pillars']['_param']
+            self.nodes[_name]['linux_codename'] = _p['linux_system_codename']
+            self.nodes[_name]['linux_arch'] = _p['linux_system_architecture']
 
     def skip_node(self, node):
         # Add node to skip list
@@ -298,7 +305,7 @@
         )
 
         # execute script
-        logger.debug("... running script")
+        logger_cli.debug("... running script")
         # handle results for each node
         _script_arguments = " ".join(args) if args else ""
         self.not_responded = []