diff --git a/chipathlon/workflow.py b/chipathlon/workflow.py
index d13cded8bdae653fe99aba9cbf9b305e50c9ad5f..93283842e8294ecc0d9fee5b4b3d13c7331d6b0b 100644
--- a/chipathlon/workflow.py
+++ b/chipathlon/workflow.py
@@ -192,11 +192,23 @@ class Workflow(object):
         for root, dirs, files in os.walk("%s/%s" % (os.path.dirname(os.path.realpath(__file__)), chipathlon.conf.job_scripts)):
             for f in files:
                 if not os.path.splitext(f)[1] == '.pyc':
-                    self._add_executable(f, os.path.join(root, f))
+                    self._add_executable(
+                        f, 
+                        os.path.join(root, f),
+                        site=self.execute_site,
+                        arch=self.config["sites"][self.execute_site].get("arch", "x86_64"),
+                        os_type=self.config["sites"][self.execute_site].get("os", "linux")
+                    )
             break
         # Handle necessary installed scripts
         for cmd in chipathlon.conf.system_commands:
-            self._add_executable(cmd, os.path.join(chipathlon.conf.system_path, cmd))
+            self._add_executable(
+                cmd,
+                os.path.join(chipathlon.conf.system_path, cmd),
+                site=self.execute_site,
+                arch=self.config["sites"][self.execute_site].get("arch", "x86_64"),
+                os_type=self.config["sites"][self.execute_site].get("os", "linux")
+	    )
         return
 
     def _load_workflow_jobs(self):