diff --git a/api/types/worker.go b/api/types/worker.go
index db44ed8f6..4c06a0e69 100644
--- a/api/types/worker.go
+++ b/api/types/worker.go
@@ -12,18 +12,18 @@ import (
 //
 // swagger:model Worker
 type Worker struct {
-	ID                  *int64           `json:"id,omitempty"`
-	Hostname            *string          `json:"hostname,omitempty"`
-	Address             *string          `json:"address,omitempty"`
-	Routes              *[]string        `json:"routes,omitempty"`
-	Active              *bool            `json:"active,omitempty"`
-	Status              *string          `json:"status,omitempty"`
-	LastStatusUpdateAt  *int64           `json:"last_status_update_at,omitempty"`
-	RunningBuilds       []*library.Build `json:"running_builds,omitempty"`
-	LastBuildStartedAt  *int64           `json:"last_build_started_at,omitempty"`
-	LastBuildFinishedAt *int64           `json:"last_build_finished_at,omitempty"`
-	LastCheckedIn       *int64           `json:"last_checked_in,omitempty"`
-	BuildLimit          *int64           `json:"build_limit,omitempty"`
+	ID                  *int64            `json:"id,omitempty"`
+	Hostname            *string           `json:"hostname,omitempty"`
+	Address             *string           `json:"address,omitempty"`
+	Routes              *[]string         `json:"routes,omitempty"`
+	Active              *bool             `json:"active,omitempty"`
+	Status              *string           `json:"status,omitempty"`
+	LastStatusUpdateAt  *int64            `json:"last_status_update_at,omitempty"`
+	RunningBuilds       *[]*library.Build `json:"running_builds,omitempty"`
+	LastBuildStartedAt  *int64            `json:"last_build_started_at,omitempty"`
+	LastBuildFinishedAt *int64            `json:"last_build_finished_at,omitempty"`
+	LastCheckedIn       *int64            `json:"last_checked_in,omitempty"`
+	BuildLimit          *int64            `json:"build_limit,omitempty"`
 }
 
 // GetID returns the ID field.
@@ -127,7 +127,7 @@ func (w *Worker) GetRunningBuilds() []*library.Build {
 		return []*library.Build{}
 	}
 
-	return w.RunningBuilds
+	return *w.RunningBuilds
 }
 
 // GetLastBuildStartedAt returns the LastBuildStartedAt field.
@@ -283,7 +283,7 @@ func (w *Worker) SetRunningBuilds(builds []*library.Build) {
 		return
 	}
 
-	w.RunningBuilds = builds
+	w.RunningBuilds = &builds
 }
 
 // SetLastBuildStartedAt sets the LastBuildStartedAt field.
diff --git a/api/worker/get.go b/api/worker/get.go
index 1430f052e..b7bebd149 100644
--- a/api/worker/get.go
+++ b/api/worker/get.go
@@ -56,7 +56,7 @@ func GetWorker(c *gin.Context) {
 		"worker": w.GetHostname(),
 	}).Infof("reading worker %s", w.GetHostname())
 
-	var rBs []*library.Build
+	rBs := []*library.Build{}
 
 	for _, b := range w.GetRunningBuilds() {
 		build, err := database.FromContext(c).GetBuild(ctx, b.GetID())
diff --git a/api/worker/list.go b/api/worker/list.go
index ea07c5f5f..82673eccf 100644
--- a/api/worker/list.go
+++ b/api/worker/list.go
@@ -97,7 +97,7 @@ func ListWorkers(c *gin.Context) {
 	}
 
 	for _, w := range workers {
-		var rBs []*library.Build
+		rBs := []*library.Build{}
 
 		for _, b := range w.GetRunningBuilds() {
 			build, err := database.FromContext(c).GetBuild(ctx, b.GetID())