diff --git a/drone/server/server.go b/drone/server/server.go
index acd818ff2..6fa45da06 100644
--- a/drone/server/server.go
+++ b/drone/server/server.go
@@ -418,7 +418,7 @@ func setupEvilGlobals(c *cli.Context, v store.Store) {
 	droneserver.Config.Server.Host = c.String("server-host")
 	droneserver.Config.Server.Port = c.String("server-addr")
 	droneserver.Config.Pipeline.Networks = c.StringSlice("network")
-	droneserver.Config.Pipeline.Volumes = c.StringSlice("volumes")
+	droneserver.Config.Pipeline.Volumes = c.StringSlice("volume")
 	droneserver.Config.Pipeline.Privileged = c.StringSlice("escalate")
 	// droneserver.Config.Server.Open = cli.Bool("open")
 	// droneserver.Config.Server.Orgs = sliceToMap(cli.StringSlice("orgs"))
diff --git a/store/datastore/sql/postgres/files/procs.sql b/store/datastore/sql/postgres/files/procs.sql
index 7f336885b..3c80b8ac0 100644
--- a/store/datastore/sql/postgres/files/procs.sql
+++ b/store/datastore/sql/postgres/files/procs.sql
@@ -37,6 +37,7 @@ SELECT
 ,proc_environ
 FROM procs
 WHERE proc_build_id = $1
+ORDER BY proc_pid ASC
 
 -- name: procs-find-build-pid
 
diff --git a/store/datastore/sql/postgres/sql_gen.go b/store/datastore/sql/postgres/sql_gen.go
index 24f37a610..e14760336 100644
--- a/store/datastore/sql/postgres/sql_gen.go
+++ b/store/datastore/sql/postgres/sql_gen.go
@@ -164,6 +164,7 @@ SELECT
 ,proc_environ
 FROM procs
 WHERE proc_build_id = $1
+ORDER BY proc_pid ASC
 `
 
 var procsFindBuildPid = `