diff --git a/docs/helpers/extractor.go.tmpl b/docs/helpers/extractor.go.tmpl
index 351ce80e6..75b759232 100644
--- a/docs/helpers/extractor.go.tmpl
+++ b/docs/helpers/extractor.go.tmpl
@@ -29,7 +29,7 @@ if err != nil {
 }
 replacer := strings.NewReplacer(
 		"github.com/owncloud/ocis/", "",
-		"/pkg/config", "",
+		"/pkg/config/defaults", "",
 	)
 var fields []ConfigField
 var targetFile *os.File
diff --git a/graph/pkg/service/v0/graph_test.go b/graph/pkg/service/v0/graph_test.go
index 3043bacb8..e475af9e3 100644
--- a/graph/pkg/service/v0/graph_test.go
+++ b/graph/pkg/service/v0/graph_test.go
@@ -15,7 +15,7 @@ import (
 	. "github.com/onsi/gomega"
 	libregraph "github.com/owncloud/libre-graph-api-go"
 	"github.com/owncloud/ocis/graph/mocks"
-	"github.com/owncloud/ocis/graph/pkg/config"
+	"github.com/owncloud/ocis/graph/pkg/config/defaults"
 	service "github.com/owncloud/ocis/graph/pkg/service/v0"
 	"github.com/owncloud/ocis/graph/pkg/service/v0/errorcode"
 	"github.com/stretchr/testify/mock"
@@ -34,7 +34,7 @@ var _ = Describe("Graph", func() {
 		gatewayClient = &mocks.GatewayClient{}
 		httpClient = &mocks.HTTPClient{}
 		svc = service.NewService(
-			service.Config(config.DefaultConfig()),
+			service.Config(defaults.DefaultConfig()),
 			service.WithGatewayClient(gatewayClient),
 			service.WithHTTPClient(httpClient),
 		)
diff --git a/nats/cmd/nats/main.go b/nats/cmd/nats/main.go
index 2c6cdac1e..a117af3cb 100644
--- a/nats/cmd/nats/main.go
+++ b/nats/cmd/nats/main.go
@@ -4,11 +4,11 @@ import (
 	"os"
 
 	"github.com/owncloud/ocis/nats/pkg/command"
-	"github.com/owncloud/ocis/nats/pkg/config"
+	"github.com/owncloud/ocis/nats/pkg/config/defaults"
 )
 
 func main() {
-	if err := command.Execute(config.DefaultConfig()); err != nil {
+	if err := command.Execute(defaults.DefaultConfig()); err != nil {
 		os.Exit(1)
 	}
 }
diff --git a/notifications/cmd/notifications/main.go b/notifications/cmd/notifications/main.go
index 6b4323433..29d60a18b 100644
--- a/notifications/cmd/notifications/main.go
+++ b/notifications/cmd/notifications/main.go
@@ -4,11 +4,11 @@ import (
 	"os"
 
 	"github.com/owncloud/ocis/notifications/pkg/command"
-	"github.com/owncloud/ocis/notifications/pkg/config"
+	"github.com/owncloud/ocis/notifications/pkg/config/defaults"
 )
 
 func main() {
-	if err := command.Execute(config.DefaultConfig()); err != nil {
+	if err := command.Execute(defaults.DefaultConfig()); err != nil {
 		os.Exit(1)
 	}
 }
diff --git a/ocs/cmd/ocs/main.go b/ocs/cmd/ocs/main.go
index ca3ea14b3..22f6a011e 100644
--- a/ocs/cmd/ocs/main.go
+++ b/ocs/cmd/ocs/main.go
@@ -4,11 +4,11 @@ import (
 	"os"
 
 	"github.com/owncloud/ocis/ocs/pkg/command"
-	"github.com/owncloud/ocis/ocs/pkg/config"
+	"github.com/owncloud/ocis/ocs/pkg/config/defaults"
 )
 
 func main() {
-	if err := command.Execute(config.DefaultConfig()); err != nil {
+	if err := command.Execute(defaults.DefaultConfig()); err != nil {
 		os.Exit(1)
 	}
 }
diff --git a/proxy/cmd/proxy/main.go b/proxy/cmd/proxy/main.go
index f67b685f3..144059b22 100644
--- a/proxy/cmd/proxy/main.go
+++ b/proxy/cmd/proxy/main.go
@@ -4,11 +4,11 @@ import (
 	"os"
 
 	"github.com/owncloud/ocis/proxy/pkg/command"
-	"github.com/owncloud/ocis/proxy/pkg/config"
+	"github.com/owncloud/ocis/proxy/pkg/config/defaults"
 )
 
 func main() {
-	if err := command.Execute(config.DefaultConfig()); err != nil {
+	if err := command.Execute(defaults.DefaultConfig()); err != nil {
 		os.Exit(1)
 	}
 }
diff --git a/proxy/pkg/proxy/proxy_test.go b/proxy/pkg/proxy/proxy_test.go
index a0300e64d..f64362c49 100644
--- a/proxy/pkg/proxy/proxy_test.go
+++ b/proxy/pkg/proxy/proxy_test.go
@@ -4,7 +4,7 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/owncloud/ocis/proxy/pkg/config"
+	"github.com/owncloud/ocis/proxy/pkg/config/defaults"
 )
 
 type matchertest struct {
@@ -13,8 +13,8 @@ type matchertest struct {
 }
 
 func TestPrefixRouteMatcher(t *testing.T) {
-	cfg := config.DefaultConfig()
-	cfg.Policies = config.DefaultPolicies()
+	cfg := defaults.DefaultConfig()
+	cfg.Policies = defaults.DefaultPolicies()
 	p := NewMultiHostReverseProxy(Config(cfg))
 
 	table := []matchertest{
@@ -33,8 +33,8 @@ func TestPrefixRouteMatcher(t *testing.T) {
 }
 
 func TestQueryRouteMatcher(t *testing.T) {
-	cfg := config.DefaultConfig()
-	cfg.Policies = config.DefaultPolicies()
+	cfg := defaults.DefaultConfig()
+	cfg.Policies = defaults.DefaultPolicies()
 	p := NewMultiHostReverseProxy(Config(cfg))
 
 	table := []matchertest{
@@ -61,8 +61,8 @@ func TestQueryRouteMatcher(t *testing.T) {
 }
 
 func TestRegexRouteMatcher(t *testing.T) {
-	cfg := config.DefaultConfig()
-	cfg.Policies = config.DefaultPolicies()
+	cfg := defaults.DefaultConfig()
+	cfg.Policies = defaults.DefaultPolicies()
 	p := NewMultiHostReverseProxy(Config(cfg))
 
 	table := []matchertest{
diff --git a/settings/cmd/settings/main.go b/settings/cmd/settings/main.go
index cfee45c69..ce7ff878f 100644
--- a/settings/cmd/settings/main.go
+++ b/settings/cmd/settings/main.go
@@ -4,11 +4,11 @@ import (
 	"os"
 
 	"github.com/owncloud/ocis/settings/pkg/command"
-	"github.com/owncloud/ocis/settings/pkg/config"
+	"github.com/owncloud/ocis/settings/pkg/config/defaults"
 )
 
 func main() {
-	if err := command.Execute(config.DefaultConfig()); err != nil {
+	if err := command.Execute(defaults.DefaultConfig()); err != nil {
 		os.Exit(1)
 	}
 }
diff --git a/storage/cmd/storage/main.go b/storage/cmd/storage/main.go
index 78ccf99ec..4503dac72 100644
--- a/storage/cmd/storage/main.go
+++ b/storage/cmd/storage/main.go
@@ -4,11 +4,11 @@ import (
 	"os"
 
 	"github.com/owncloud/ocis/storage/pkg/command"
-	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/owncloud/ocis/storage/pkg/config/defaults"
 )
 
 func main() {
-	if err := command.Execute(config.DefaultConfig()); err != nil {
+	if err := command.Execute(defaults.DefaultConfig()); err != nil {
 		os.Exit(1)
 	}
 }
diff --git a/store/cmd/store/main.go b/store/cmd/store/main.go
index f20f59258..06cc58efa 100644
--- a/store/cmd/store/main.go
+++ b/store/cmd/store/main.go
@@ -4,11 +4,11 @@ import (
 	"os"
 
 	"github.com/owncloud/ocis/store/pkg/command"
-	"github.com/owncloud/ocis/store/pkg/config"
+	"github.com/owncloud/ocis/store/pkg/config/defaults"
 )
 
 func main() {
-	if err := command.Execute(config.DefaultConfig()); err != nil {
+	if err := command.Execute(defaults.DefaultConfig()); err != nil {
 		os.Exit(1)
 	}
 }
diff --git a/thumbnails/cmd/thumbnails/main.go b/thumbnails/cmd/thumbnails/main.go
index 2098a6341..945b3ec15 100644
--- a/thumbnails/cmd/thumbnails/main.go
+++ b/thumbnails/cmd/thumbnails/main.go
@@ -4,11 +4,11 @@ import (
 	"os"
 
 	"github.com/owncloud/ocis/thumbnails/pkg/command"
-	"github.com/owncloud/ocis/thumbnails/pkg/config"
+	"github.com/owncloud/ocis/thumbnails/pkg/config/defaults"
 )
 
 func main() {
-	if err := command.Execute(config.DefaultConfig()); err != nil {
+	if err := command.Execute(defaults.DefaultConfig()); err != nil {
 		os.Exit(1)
 	}
 }
diff --git a/web/cmd/web/main.go b/web/cmd/web/main.go
index 7334862fe..f46816b8c 100644
--- a/web/cmd/web/main.go
+++ b/web/cmd/web/main.go
@@ -4,11 +4,11 @@ import (
 	"os"
 
 	"github.com/owncloud/ocis/web/pkg/command"
-	"github.com/owncloud/ocis/web/pkg/config"
+	"github.com/owncloud/ocis/web/pkg/config/defaults"
 )
 
 func main() {
-	if err := command.Execute(config.DefaultConfig()); err != nil {
+	if err := command.Execute(defaults.DefaultConfig()); err != nil {
 		os.Exit(1)
 	}
 }
diff --git a/webdav/cmd/webdav/main.go b/webdav/cmd/webdav/main.go
index f03fd520c..88b1185d7 100644
--- a/webdav/cmd/webdav/main.go
+++ b/webdav/cmd/webdav/main.go
@@ -4,11 +4,11 @@ import (
 	"os"
 
 	"github.com/owncloud/ocis/webdav/pkg/command"
-	"github.com/owncloud/ocis/webdav/pkg/config"
+	"github.com/owncloud/ocis/webdav/pkg/config/defaults"
 )
 
 func main() {
-	if err := command.Execute(config.DefaultConfig()); err != nil {
+	if err := command.Execute(defaults.DefaultConfig()); err != nil {
 		os.Exit(1)
 	}
 }