diff --git a/config/config.go b/config/config.go
index <HASH>..<HASH> 100644
--- a/config/config.go
+++ b/config/config.go
@@ -6,6 +6,7 @@ import (
 	steno "github.com/cloudfoundry/gosteno"
 
 	"io/ioutil"
+	"runtime"
 	"strconv"
 	"time"
 )
@@ -90,7 +91,7 @@ var defaultConfig = Config{
 
 	Port:       8081,
 	Index:      0,
-	GoMaxProcs: 8,
+	GoMaxProcs: -1,
 
 	EndpointTimeoutInSeconds: 60,
 
@@ -112,6 +113,10 @@ func DefaultConfig() *Config {
 func (c *Config) Process() {
 	var err error
 
+	if c.GoMaxProcs == -1 {
+		c.GoMaxProcs = runtime.NumCPU()
+	}
+
 	c.PruneStaleDropletsInterval = time.Duration(c.PruneStaleDropletsIntervalInSeconds) * time.Second
 	c.DropletStaleThreshold = time.Duration(c.DropletStaleThresholdInSeconds) * time.Second
 	c.PublishActiveAppsInterval = time.Duration(c.PublishActiveAppsIntervalInSeconds) * time.Second
Default GOMAXPROCS to the number of available CPUs

[#<I>]