diff --git a/pkg/cli/cmds/server.go b/pkg/cli/cmds/server.go
index 077f21e320a..9ebc003349f 100644
--- a/pkg/cli/cmds/server.go
+++ b/pkg/cli/cmds/server.go
@@ -55,7 +55,7 @@ type Server struct {
 	ClusterInit              bool
 	ClusterReset             bool
 	EncryptSecrets           bool
-	SetupHooks               []func(config.Control) error
+	StartupHooks             []func(config.Control) error
 }
 
 var ServerConfig Server
diff --git a/pkg/cli/server/server.go b/pkg/cli/server/server.go
index b9a441c3090..058ad7abc4f 100644
--- a/pkg/cli/server/server.go
+++ b/pkg/cli/server/server.go
@@ -193,7 +193,7 @@ func run(app *cli.Context, cfg *cmds.Server) error {
 		return errors.Wrap(err, "Invalid tls-min-version")
 	}
 
-	serverConfig.SetupHooks = append(serverConfig.SetupHooks, cfg.SetupHooks...)
+	serverConfig.StartupHooks = append(serverConfig.StartupHooks, cfg.StartupHooks...)
 
 	// TLS config based on mozilla ssl-config generator
 	// https://ssl-config.mozilla.org/#server=golang&version=1.13.6&config=intermediate&guideline=5.4
diff --git a/pkg/server/server.go b/pkg/server/server.go
index f44f9e8c21a..90019ff6c1e 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -60,7 +60,7 @@ func StartServer(ctx context.Context, config *Config) error {
 		return errors.Wrap(err, "starting tls server")
 	}
 
-	for _, hook := range config.SetupHooks {
+	for _, hook := range config.StartupHooks {
 		hook(config.ControlConfig)
 	}
 
diff --git a/pkg/server/types.go b/pkg/server/types.go
index 204ec930530..b92f11330a3 100644
--- a/pkg/server/types.go
+++ b/pkg/server/types.go
@@ -10,5 +10,5 @@ type Config struct {
 	ControlConfig    config.Control
 	Rootless         bool
 	SupervisorPort   int
-	SetupHooks       []func(config.Control) error
+	StartupHooks     []func(config.Control) error
 }