diff --git a/lib/worker_multibuild.py b/lib/worker_multibuild.py
index cf8f66c..397b077 100644
--- a/lib/worker_multibuild.py
+++ b/lib/worker_multibuild.py
@@ -61,10 +61,12 @@ def list_jobs(directory=".buildbot"):
     results = []
     files = ["Dockerfile", "build.sh", "test.sh"]
     for item in listdir(directory):
-        if isdir(join(directory, item)) and not islink(join(directory, item)):
-            for file in listdir(join(directory, item)):
-                if file in files and isfile(join(directory, item, file)) and not islink(join(directory, item, file)):
-                    results.append(file)
+        for file in files:
+            filepath = join(directory, item, file)
+            if islink(filepath) and not exists(filepath):
+                continue
+            if exists(join(directory, item, 'Dockerfile')) or exists(join(directory, item, 'build.sh')) or exists(join(directory, item, 'test.sh')):
+                results.append(filepath)
     return results
 
 
diff --git a/multibuild.py b/multibuild.py
index e66ca95..39210f4 100644
--- a/multibuild.py
+++ b/multibuild.py
@@ -48,7 +48,7 @@ def add_parent_step(build_factory):
         steps.ShellCommand(
             name="Execute worker script",
             command=[
-                "python",
+                "python3",
                 join(getenv['HOME'], '.local/bin/worker_multibuild.py'),
                 util.Interpolate("%(prop:jobname)s"),
                 util.Property('repository'),