diff --git a/builders.py b/builders.py
index 55f0769..418ef1b 100644
--- a/builders.py
+++ b/builders.py
@@ -141,7 +141,11 @@ def create_builder_factory():
     f.addStep(steps.JSONPropertiesDownload(workerdest="build-properties.json"))
 
     f.addStep(steps.SetPropertyFromCommand(
-        command=util.Interpolate("%(prop:builddir)s/yocto-autobuilder-helper/scripts/getproperties.py %(prop:builddir)s/build %(prop:buildername)s"),
+        command=[
+            util.Interpolate("%(prop:builddir)s/yocto-autobuilder-helper/scripts/getproperties.py"),
+            util.Interpolate("%(prop:builddir)s/build"),
+            util.Property("buildername"),
+        ],
         extract_fn=extract_json_props,
         name='Load build revisions',
         haltOnFailure=True))
@@ -364,7 +368,11 @@ def create_parent_builder_factory(buildername, waitname):
     factory.addStep(steps.JSONPropertiesDownload(workerdest="build-properties.json"))
 
     factory.addStep(steps.SetPropertyFromCommand(
-        command=util.Interpolate("%(prop:builddir)s/yocto-autobuilder-helper/scripts/getproperties.py %(prop:builddir)s/build %(prop:buildername)s"),
+        command=[
+            util.Interpolate("%(prop:builddir)s/yocto-autobuilder-helper/scripts/getproperties.py"),
+            util.Interpolate("%(prop:builddir)s/build"),
+            util.Property("buildername"),
+        ],
         extract_fn=extract_json_props,
         name='Load build revisions',
         haltOnFailure=True))