diff --git a/pkg/server/http/server.go b/pkg/server/http/server.go
index a5bef47172..e077922f9c 100644
--- a/pkg/server/http/server.go
+++ b/pkg/server/http/server.go
@@ -1,9 +1,7 @@
 package http
 
 import (
-	"github.com/owncloud/ocis-konnectd/pkg/config"
-	"github.com/owncloud/ocis-konnectd/pkg/flagset"
-	"github.com/owncloud/ocis-konnectd/pkg/service/v0"
+	svc "github.com/owncloud/ocis-konnectd/pkg/service/v0"
 	"github.com/owncloud/ocis-konnectd/pkg/version"
 	"github.com/owncloud/ocis-pkg/middleware"
 	"github.com/owncloud/ocis-pkg/service/http"
@@ -20,8 +18,7 @@ func Server(opts ...Option) (http.Service, error) {
 		http.Version(version.String),
 		http.Address(options.Config.HTTP.Addr),
 		http.Context(options.Context),
-		http.Flags(flagset.RootWithConfig(config.New())...),
-		http.Flags(flagset.ServerWithConfig(config.New())...),
+		http.Flags(options.Flags...),
 	)
 
 	handle := svc.NewService(