diff --git a/extensions/accounts/pkg/config/config.go b/extensions/accounts/pkg/config/config.go
index 7d05d2edcc..0d38512da7 100644
--- a/extensions/accounts/pkg/config/config.go
+++ b/extensions/accounts/pkg/config/config.go
@@ -19,7 +19,7 @@ type Config struct {
 	HTTP HTTP `yaml:"http,omitempty"`
 	GRPC GRPC `yaml:"grpc,omitempty"`
 
-	TokenManager *shared.TokenManager `yaml:"token_manager,omitempty"`
+	TokenManager *TokenManager `yaml:"token_manager,omitempty"`
 
 	Asset              Asset       `yaml:"asset,omitempty"`
 	Repo               Repo        `yaml:"repo,omitempty"`
diff --git a/extensions/accounts/pkg/config/defaults/defaultconfig.go b/extensions/accounts/pkg/config/defaults/defaultconfig.go
index 376695633b..8724bd096b 100644
--- a/extensions/accounts/pkg/config/defaults/defaultconfig.go
+++ b/extensions/accounts/pkg/config/defaults/defaultconfig.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/owncloud/ocis/extensions/accounts/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/defaults"
-	"github.com/owncloud/ocis/ocis-pkg/shared"
 )
 
 func FullDefaultConfig() *config.Config {
@@ -101,11 +100,11 @@ func EnsureDefaults(cfg *config.Config) {
 	}
 
 	if cfg.TokenManager == nil && cfg.Commons != nil && cfg.Commons.TokenManager != nil {
-		cfg.TokenManager = &shared.TokenManager{
+		cfg.TokenManager = &config.TokenManager{
 			JWTSecret: cfg.Commons.TokenManager.JWTSecret,
 		}
 	} else {
-		cfg.TokenManager = &shared.TokenManager{}
+		cfg.TokenManager = &config.TokenManager{}
 	}
 }
 
diff --git a/extensions/accounts/pkg/config/reva.go b/extensions/accounts/pkg/config/reva.go
new file mode 100644
index 0000000000..172786f6f1
--- /dev/null
+++ b/extensions/accounts/pkg/config/reva.go
@@ -0,0 +1,6 @@
+package config
+
+// TokenManager is the config for using the reva token manager
+type TokenManager struct {
+	JWTSecret string `yaml:"jwt_secret" env:"OCIS_JWT_SECRET;ACCOUNTS_JWT_SECRET"`
+}
diff --git a/extensions/frontend/pkg/config/config.go b/extensions/frontend/pkg/config/config.go
index fd9d1c99a8..0adda7543b 100644
--- a/extensions/frontend/pkg/config/config.go
+++ b/extensions/frontend/pkg/config/config.go
@@ -13,7 +13,10 @@ type Config struct {
 	HTTP HTTPConfig `yaml:"http"`
 
 	// JWTSecret used to verify reva access token
-	JWTSecret             string `yaml:"jwt_secret"`
+
+	TransferSecret string `yaml:"transfer_secret" env:"STORAGE_TRANSFER_SECRET"`
+
+	JWTSecret string `yaml:"jwt_secret"`
 	GatewayEndpoint       string
 	SkipUserGroupsInToken bool
 
@@ -22,8 +25,8 @@ type Config struct {
 	UploadMaxChunkSize       int    `yaml:"upload_max_chunk_size"`
 	UploadHTTPMethodOverride string `yaml:"upload_http_method_override"`
 	DefaultUploadProtocol    string `yaml:"default_upload_protocol"`
-	TransferSecret           string `yaml:"transfer_secret" env:"STORAGE_TRANSFER_SECRET"`
-	PublicURL                string `yaml:"public_url" env:"OCIS_URL;FRONTEND_PUBLIC_URL"`
+
+	PublicURL string `yaml:"public_url" env:"OCIS_URL;FRONTEND_PUBLIC_URL"`
 
 	Archiver    Archiver
 	AppProvider AppProvider
diff --git a/extensions/graph/pkg/config/config.go b/extensions/graph/pkg/config/config.go
index 8f27986840..b346bc15bd 100644
--- a/extensions/graph/pkg/config/config.go
+++ b/extensions/graph/pkg/config/config.go
@@ -18,8 +18,8 @@ type Config struct {
 
 	HTTP HTTP `yaml:"http,omitempty"`
 
-	Reva         Reva                 `yaml:"reva,omitempty"`
-	TokenManager *shared.TokenManager `yaml:"token_manager,omitempty"`
+	Reva         Reva          `yaml:"reva,omitempty"`
+	TokenManager *TokenManager `yaml:"token_manager,omitempty"`
 
 	Spaces   Spaces   `yaml:"spaces,omitempty"`
 	Identity Identity `yaml:"identity,omitempty"`
diff --git a/extensions/graph/pkg/config/defaults/defaultconfig.go b/extensions/graph/pkg/config/defaults/defaultconfig.go
index d3b7e00541..6c315a4775 100644
--- a/extensions/graph/pkg/config/defaults/defaultconfig.go
+++ b/extensions/graph/pkg/config/defaults/defaultconfig.go
@@ -4,7 +4,6 @@ import (
 	"strings"
 
 	"github.com/owncloud/ocis/extensions/graph/pkg/config"
-	"github.com/owncloud/ocis/ocis-pkg/shared"
 )
 
 func DefaultConfig() *config.Config {
@@ -89,11 +88,11 @@ func EnsureDefaults(cfg *config.Config) {
 	}
 
 	if cfg.TokenManager == nil && cfg.Commons != nil && cfg.Commons.TokenManager != nil {
-		cfg.TokenManager = &shared.TokenManager{
+		cfg.TokenManager = &config.TokenManager{
 			JWTSecret: cfg.Commons.TokenManager.JWTSecret,
 		}
 	} else {
-		cfg.TokenManager = &shared.TokenManager{}
+		cfg.TokenManager = &config.TokenManager{}
 	}
 }
 
diff --git a/extensions/graph/pkg/config/reva.go b/extensions/graph/pkg/config/reva.go
index 2d3966303d..dbfc359a8b 100644
--- a/extensions/graph/pkg/config/reva.go
+++ b/extensions/graph/pkg/config/reva.go
@@ -4,3 +4,8 @@ package config
 type Reva struct {
 	Address string `yaml:"address" env:"REVA_GATEWAY"`
 }
+
+// TokenManager is the config for using the reva token manager
+type TokenManager struct {
+	JWTSecret string `yaml:"jwt_secret" env:"OCIS_JWT_SECRET;GRAPH_JWT_SECRET"`
+}
diff --git a/extensions/ocs/pkg/config/config.go b/extensions/ocs/pkg/config/config.go
index 3905b91f5e..9e332ca7de 100644
--- a/extensions/ocs/pkg/config/config.go
+++ b/extensions/ocs/pkg/config/config.go
@@ -18,8 +18,8 @@ type Config struct {
 
 	HTTP HTTP `yaml:"http,omitempty"`
 
-	TokenManager *shared.TokenManager `yaml:"token_manager,omitempty"`
-	Reva         Reva                 `yaml:"reva,omitempty"`
+	TokenManager *TokenManager `yaml:"token_manager,omitempty"`
+	Reva         Reva          `yaml:"reva,omitempty"`
 
 	IdentityManagement IdentityManagement `yaml:"identity_management,omitempty"`
 
diff --git a/extensions/ocs/pkg/config/defaults/defaultconfig.go b/extensions/ocs/pkg/config/defaults/defaultconfig.go
index 74c76d3933..74a1b493d4 100644
--- a/extensions/ocs/pkg/config/defaults/defaultconfig.go
+++ b/extensions/ocs/pkg/config/defaults/defaultconfig.go
@@ -5,7 +5,6 @@ import (
 	"strings"
 
 	"github.com/owncloud/ocis/extensions/ocs/pkg/config"
-	"github.com/owncloud/ocis/ocis-pkg/shared"
 )
 
 func FullDefaultConfig() *config.Config {
@@ -76,11 +75,11 @@ func EnsureDefaults(cfg *config.Config) {
 	}
 
 	if cfg.TokenManager == nil && cfg.Commons != nil && cfg.Commons.TokenManager != nil {
-		cfg.TokenManager = &shared.TokenManager{
+		cfg.TokenManager = &config.TokenManager{
 			JWTSecret: cfg.Commons.TokenManager.JWTSecret,
 		}
 	} else {
-		cfg.TokenManager = &shared.TokenManager{}
+		cfg.TokenManager = &config.TokenManager{}
 	}
 
 	if cfg.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
diff --git a/extensions/ocs/pkg/config/reva.go b/extensions/ocs/pkg/config/reva.go
index 2d3966303d..b8d2779170 100644
--- a/extensions/ocs/pkg/config/reva.go
+++ b/extensions/ocs/pkg/config/reva.go
@@ -4,3 +4,8 @@ package config
 type Reva struct {
 	Address string `yaml:"address" env:"REVA_GATEWAY"`
 }
+
+// TokenManager is the config for using the reva token manager
+type TokenManager struct {
+	JWTSecret string `yaml:"jwt_secret" env:"OCIS_JWT_SECRET;OCS_JWT_SECRET"`
+}
diff --git a/extensions/ocs/pkg/server/http/svc_test.go b/extensions/ocs/pkg/server/http/svc_test.go
index f4bc9b52f6..7bdddbf28b 100644
--- a/extensions/ocs/pkg/server/http/svc_test.go
+++ b/extensions/ocs/pkg/server/http/svc_test.go
@@ -28,7 +28,6 @@ import (
 	ssvc "github.com/owncloud/ocis/extensions/settings/pkg/service/v0"
 	ocisLog "github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocis-pkg/service/grpc"
-	"github.com/owncloud/ocis/ocis-pkg/shared"
 	accountsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/accounts/v0"
 	settingsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/settings/v0"
 	accountssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/accounts/v0"
@@ -724,7 +723,7 @@ func getService() svc.Service {
 			Root: "/",
 			Addr: "localhost:9110",
 		},
-		TokenManager: &shared.TokenManager{
+		TokenManager: &config.TokenManager{
 			JWTSecret: jwtSecret,
 		},
 		Log: &config.Log{
diff --git a/extensions/settings/pkg/config/config.go b/extensions/settings/pkg/config/config.go
index 7c521cc381..ea74b42ed1 100644
--- a/extensions/settings/pkg/config/config.go
+++ b/extensions/settings/pkg/config/config.go
@@ -23,8 +23,8 @@ type Config struct {
 	DataPath  string   `yaml:"data_path,omitempty" env:"SETTINGS_DATA_PATH"`
 	Metadata  Metadata `yaml:"metadata_config,omitempty"`
 
-	Asset        Asset                `yaml:"asset,omitempty"`
-	TokenManager *shared.TokenManager `yaml:"token_manager,omitempty"`
+	Asset        Asset         `yaml:"asset,omitempty"`
+	TokenManager *TokenManager `yaml:"token_manager,omitempty"`
 
 	Context context.Context `yaml:"-"`
 }
diff --git a/extensions/settings/pkg/config/defaults/defaultconfig.go b/extensions/settings/pkg/config/defaults/defaultconfig.go
index bc4faba048..f056a6a9d8 100644
--- a/extensions/settings/pkg/config/defaults/defaultconfig.go
+++ b/extensions/settings/pkg/config/defaults/defaultconfig.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/owncloud/ocis/extensions/settings/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/defaults"
-	"github.com/owncloud/ocis/ocis-pkg/shared"
 )
 
 func FullDefaultConfig() *config.Config {
@@ -87,11 +86,11 @@ func EnsureDefaults(cfg *config.Config) {
 	}
 
 	if cfg.TokenManager == nil && cfg.Commons != nil && cfg.Commons.TokenManager != nil {
-		cfg.TokenManager = &shared.TokenManager{
+		cfg.TokenManager = &config.TokenManager{
 			JWTSecret: cfg.Commons.TokenManager.JWTSecret,
 		}
 	} else {
-		cfg.TokenManager = &shared.TokenManager{}
+		cfg.TokenManager = &config.TokenManager{}
 	}
 
 	if cfg.Metadata.MachineAuthAPIKey == "" && cfg.Commons != nil && cfg.Commons.MachineAuthAPIKey != "" {
diff --git a/ocis-pkg/generators/generators_test.go b/ocis-pkg/generators/generators_test.go
index 4d89d59434..8c1984dee0 100644
--- a/ocis-pkg/generators/generators_test.go
+++ b/ocis-pkg/generators/generators_test.go
@@ -1,10 +1,10 @@
 package generators_test
 
 import (
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
+	_ "github.com/onsi/ginkgo/v2"
+	_ "github.com/onsi/gomega"
 
-	. "github.com/owncloud/ocis/ocis-pkg/generators"
+	_ "github.com/owncloud/ocis/ocis-pkg/generators"
 )
 
 var _ = Describe("Generators", func() {