diff --git a/config/config.go b/config/config.go
index 21e632f..1275bc1 100644
--- a/config/config.go
+++ b/config/config.go
@@ -304,7 +304,7 @@ func (c *Configuration) EnsureFilePermissions() error {
 		return errors.WithStack(err)
 	}
 
-	pool := workerpool.New(runtime.GOMAXPROCS(0))
+	pool := workerpool.New(runtime.NumCPU())
 
 	for _, file := range files {
 		f := file
diff --git a/server/config_parser.go b/server/config_parser.go
index 06f46d5..4b55364 100644
--- a/server/config_parser.go
+++ b/server/config_parser.go
@@ -8,7 +8,7 @@ import (
 // Parent function that will update all of the defined configuration files for a server
 // automatically to ensure that they always use the specified values.
 func (s *Server) UpdateConfigurationFiles() {
-	pool := workerpool.New(runtime.GOMAXPROCS(0))
+	pool := workerpool.New(runtime.NumCPU())
 
 	files := s.ProcessConfiguration().ConfigurationFiles
 	for _, cf := range files {
diff --git a/server/filesystem_walker.go b/server/filesystem_walker.go
index 7594ffe..ca8e74e 100644
--- a/server/filesystem_walker.go
+++ b/server/filesystem_walker.go
@@ -39,7 +39,7 @@ func newPooledWalker(fs *Filesystem) *PooledFileWalker {
 		// Create a worker pool that is the same size as the number of processors available on the
 		// system. Going much higher doesn't provide much of a performance boost, and is only more
 		// likely to lead to resource overloading anyways.
-		pool: workerpool.New(runtime.GOMAXPROCS(0)),
+		pool: workerpool.New(runtime.NumCPU()),
 	}
 }