diff --git a/cmd/bbs/config/config.go b/cmd/bbs/config/config.go
index 4bd1c570..4a3bb597 100644
--- a/cmd/bbs/config/config.go
+++ b/cmd/bbs/config/config.go
@@ -61,7 +61,8 @@ type BBSConfig struct {
 	DropsondePort               int      `json:"dropsonde_port,omitempty"`
 	DatabaseConnectionString    string   `json:"database_connection_string"`
 	DatabaseDriver              string   `json:"database_driver,omitempty"`
-	MaxDatabaseConnections      int      `json:"max_database_connections,omitempty"`
+	MaxOpenDatabaseConnections  int      `json:"max_open_database_connections,omitempty"`
+	MaxIdleDatabaseConnections  int      `json:"max_idle_database_connections,omitempty"`
 	SQLCACertFile               string   `json:"sql_ca_cert_file,omitempty"`
 	AuctioneerAddress           string   `json:"auctioneer_address,omitempty"`
 	AuctioneerCACert            string   `json:"auctioneer_ca_cert,omitempty"`
@@ -97,7 +98,8 @@ func DefaultConfig() BBSConfig {
 		TaskCallbackWorkers:         1000,
 		DropsondePort:               3457,
 		DatabaseDriver:              "mysql",
-		MaxDatabaseConnections:      200,
+		MaxOpenDatabaseConnections:  200,
+		MaxIdleDatabaseConnections:  50,
 		AuctioneerRequireTLS:        false,
 		RepClientSessionCacheSize:   0,
 		RepRequireTLS:               false,
diff --git a/cmd/bbs/config/config_test.go b/cmd/bbs/config/config_test.go
index 1467b9d1..e37581e3 100644
--- a/cmd/bbs/config/config_test.go
+++ b/cmd/bbs/config/config_test.go
@@ -46,7 +46,8 @@ var _ = Describe("BBSConfig", func() {
   "dropsonde_port": 3457,
   "database_connection_string": "",
   "database_driver": "postgres",
-  "max_database_connections": 500,
+  "max_open_database_connections": 200,
+  "max_idle_database_connections": 50,
   "sql_ca_cert_file": "/var/vcap/jobs/bbs/config/sql.ca",
   "auctioneer_address": "https://auctioneer.service.cf.internal:9016",
   "auctioneer_ca_cert": "/var/vcap/jobs/bbs/config/auctioneer.ca",
@@ -119,7 +120,8 @@ var _ = Describe("BBSConfig", func() {
 			TaskCallbackWorkers:         1000,
 			DropsondePort:               3457,
 			DatabaseDriver:              "postgres",
-			MaxDatabaseConnections:      500,
+			MaxOpenDatabaseConnections:  200,
+			MaxIdleDatabaseConnections:  50,
 			SQLCACertFile:               "/var/vcap/jobs/bbs/config/sql.ca",
 			AuctioneerAddress:           "https://auctioneer.service.cf.internal:9016",
 			AuctioneerCACert:            "/var/vcap/jobs/bbs/config/auctioneer.ca",
diff --git a/cmd/bbs/main.go b/cmd/bbs/main.go
index 4a5d6d19..2c67812e 100644
--- a/cmd/bbs/main.go
+++ b/cmd/bbs/main.go
@@ -150,8 +150,8 @@ func main() {
 			logger.Fatal("failed-to-open-sql", err)
 		}
 		defer sqlConn.Close()
-		sqlConn.SetMaxOpenConns(bbsConfig.MaxDatabaseConnections)
-		sqlConn.SetMaxIdleConns(bbsConfig.MaxDatabaseConnections)
+		sqlConn.SetMaxOpenConns(bbsConfig.MaxOpenDatabaseConnections)
+		sqlConn.SetMaxIdleConns(bbsConfig.MaxIdleDatabaseConnections)
 
 		err = sqlConn.Ping()
 		if err != nil {