diff --git a/cmd/server/flags.go b/cmd/server/flags.go
index d3951762bb0..152070ba522 100644
--- a/cmd/server/flags.go
+++ b/cmd/server/flags.go
@@ -194,16 +194,6 @@ var flags = append([]cli.Flag{
 		Name:    "keepalive-min-time",
 		Usage:   "server-side enforcement policy on the minimum amount of time a client should wait before sending a keepalive ping.",
 	},
-	&cli.StringFlag{
-		EnvVars: []string{"WOODPECKER_SECRET_ENDPOINT"},
-		Name:    "secret-service",
-		Usage:   "secret plugin endpoint",
-	},
-	&cli.StringFlag{
-		EnvVars: []string{"WOODPECKER_REGISTRY_ENDPOINT"},
-		Name:    "registry-service",
-		Usage:   "registry plugin endpoint",
-	},
 	&cli.StringFlag{
 		EnvVars: []string{"WOODPECKER_CONFIG_SERVICE_ENDPOINT"},
 		Name:    "config-service-endpoint",
diff --git a/server/services/setup.go b/server/services/setup.go
index b6ca4506fad..1b25f82a37f 100644
--- a/server/services/setup.go
+++ b/server/services/setup.go
@@ -59,7 +59,7 @@ func setupConfigService(c *cli.Context, privateSignatureKey crypto.PrivateKey) c
 	timeout := c.Duration("forge-timeout")
 	configFetcher := config.NewForge(timeout)
 
-	if endpoint := c.String("config-extension-endpoint"); endpoint != "" {
+	if endpoint := c.String("config-service-endpoint"); endpoint != "" {
 		httpFetcher := config.NewHTTP(endpoint, privateSignatureKey)
 		return config.NewCombined(configFetcher, httpFetcher)
 	}