diff --git a/opencloud/pkg/command/root.go b/opencloud/pkg/command/root.go
index 77be4594a..ac1dc4bac 100644
--- a/opencloud/pkg/command/root.go
+++ b/opencloud/pkg/command/root.go
@@ -17,7 +17,7 @@ import (
 func Execute() error {
 	cfg := config.DefaultConfig()
 
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "opencloud",
 		Short: "opencloud",
 	})
diff --git a/pkg/clihelper/app.go b/pkg/clihelper/app.go
index 814b32326..e2543faff 100644
--- a/pkg/clihelper/app.go
+++ b/pkg/clihelper/app.go
@@ -4,33 +4,12 @@ import (
 	"fmt"
 
 	"github.com/opencloud-eu/opencloud/pkg/version"
+
 	"github.com/spf13/cobra"
-	"github.com/urfave/cli/v2"
 )
 
-// DefaultApp provides some default settings for the cli app
-func DefaultApp(app *cli.App) *cli.App {
-	// version info
-	app.Version = version.String
-	app.Compiled = version.Compiled()
-
-	// author info
-	app.Authors = []*cli.Author{
-		{
-			Name:  "OpenCloud GmbH",
-			Email: "support@opencloud.eu",
-		},
-	}
-
-	// disable global version flag
-	// instead we provide the version command
-	app.HideVersion = true
-
-	return app
-}
-
-// DefaultAppCobra is a wrapper for DefaultApp that adds Cobra specific settings
-func DefaultAppCobra(app *cobra.Command) *cobra.Command {
+// DefaultApp is a wrapper for DefaultApp that adds Cobra specific settings
+func DefaultApp(app *cobra.Command) *cobra.Command {
 	// TODO: when migration is done this has to become DefaultApp
 	// version info
 	app.Version = fmt.Sprintf("%s (%s <%s>) (%s)", version.String, "OpenCloud GmbH", "support@opencloud.eu", version.Compiled())
diff --git a/services/activitylog/pkg/command/root.go b/services/activitylog/pkg/command/root.go
index c61aec880..e922bd781 100644
--- a/services/activitylog/pkg/command/root.go
+++ b/services/activitylog/pkg/command/root.go
@@ -24,7 +24,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the activitylog command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "activitylog",
 		Short: "starts activitylog service",
 	})
diff --git a/services/antivirus/pkg/command/root.go b/services/antivirus/pkg/command/root.go
index ecea2c604..5d9f248b4 100644
--- a/services/antivirus/pkg/command/root.go
+++ b/services/antivirus/pkg/command/root.go
@@ -19,7 +19,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the antivirus command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "antivirus",
 		Short: "Antivirus service for OpenCloud",
 	})
diff --git a/services/app-provider/pkg/command/root.go b/services/app-provider/pkg/command/root.go
index 052e17d76..2b16a9e32 100644
--- a/services/app-provider/pkg/command/root.go
+++ b/services/app-provider/pkg/command/root.go
@@ -24,7 +24,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud app-provider command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "app-provider",
 		Short: "Provide apps for OpenCloud",
 	})
diff --git a/services/app-registry/pkg/command/root.go b/services/app-registry/pkg/command/root.go
index d30cdff5f..3bb6da015 100644
--- a/services/app-registry/pkg/command/root.go
+++ b/services/app-registry/pkg/command/root.go
@@ -24,7 +24,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud app-registry command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "app-registry",
 		Short: "Provide an app registry for OpenCloud",
 	})
diff --git a/services/audit/pkg/command/root.go b/services/audit/pkg/command/root.go
index 447ab9270..0adf9bf87 100644
--- a/services/audit/pkg/command/root.go
+++ b/services/audit/pkg/command/root.go
@@ -24,7 +24,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the audit command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "audit",
 		Short: "starts audit service",
 	})
diff --git a/services/auth-app/pkg/command/root.go b/services/auth-app/pkg/command/root.go
index f05588e09..51fdf46be 100644
--- a/services/auth-app/pkg/command/root.go
+++ b/services/auth-app/pkg/command/root.go
@@ -26,7 +26,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud auth-app command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "auth-app",
 		Short: "Provide app authentication for OpenCloud",
 	})
diff --git a/services/auth-basic/pkg/command/root.go b/services/auth-basic/pkg/command/root.go
index 3c1299ed2..e7b5482ce 100644
--- a/services/auth-basic/pkg/command/root.go
+++ b/services/auth-basic/pkg/command/root.go
@@ -24,7 +24,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud auth-basic command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "auth-basic",
 		Short: "Provide basic authentication for OpenCloud",
 	})
diff --git a/services/auth-bearer/pkg/command/root.go b/services/auth-bearer/pkg/command/root.go
index f79741f59..599f733b7 100644
--- a/services/auth-bearer/pkg/command/root.go
+++ b/services/auth-bearer/pkg/command/root.go
@@ -28,7 +28,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud auth-bearer command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "auth-bearer",
 		Short: "Provide bearer authentication for OpenCloud",
 	})
diff --git a/services/auth-machine/pkg/command/root.go b/services/auth-machine/pkg/command/root.go
index 918cb998e..080b1c653 100644
--- a/services/auth-machine/pkg/command/root.go
+++ b/services/auth-machine/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud auth-machine command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "auth-machine",
 		Short: "Provide machine authentication for OpenCloud",
 	})
diff --git a/services/auth-service/pkg/command/root.go b/services/auth-service/pkg/command/root.go
index 0d36a806a..1217ef44b 100644
--- a/services/auth-service/pkg/command/root.go
+++ b/services/auth-service/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud auth-service command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "auth-service",
 		Short: "Provide service authentication for OpenCloud",
 	})
diff --git a/services/clientlog/pkg/command/root.go b/services/clientlog/pkg/command/root.go
index 38d8ea9e1..75b2696e5 100644
--- a/services/clientlog/pkg/command/root.go
+++ b/services/clientlog/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the clientlog command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "clientlog",
 		Short: "starts clientlog service",
 	})
diff --git a/services/collaboration/pkg/command/root.go b/services/collaboration/pkg/command/root.go
index 779287dba..60f872e9c 100644
--- a/services/collaboration/pkg/command/root.go
+++ b/services/collaboration/pkg/command/root.go
@@ -20,7 +20,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the antivirus command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "collaboration",
 		Short: "Serve WOPI for OpenCloud",
 	})
diff --git a/services/eventhistory/pkg/command/root.go b/services/eventhistory/pkg/command/root.go
index 11d1f8dde..64e0c9e3e 100644
--- a/services/eventhistory/pkg/command/root.go
+++ b/services/eventhistory/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the eventhistory command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "eventhistory",
 		Short: "starts eventhistory service",
 	})
diff --git a/services/frontend/pkg/command/root.go b/services/frontend/pkg/command/root.go
index 52d5cf9c3..57f417678 100644
--- a/services/frontend/pkg/command/root.go
+++ b/services/frontend/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud-frontend command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "frontend",
 		Short: "Provide various HTTP apis for OpenCloud",
 	})
diff --git a/services/gateway/pkg/command/root.go b/services/gateway/pkg/command/root.go
index 0d9108413..8a83c2ab4 100644
--- a/services/gateway/pkg/command/root.go
+++ b/services/gateway/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud-gateway command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "gateway",
 		Short: "Provide a CS3api gateway for OpenCloud",
 	})
diff --git a/services/graph/pkg/command/root.go b/services/graph/pkg/command/root.go
index e9f8c3f30..69c5a478e 100644
--- a/services/graph/pkg/command/root.go
+++ b/services/graph/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud graph command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "graph",
 		Short: "Serve Graph API for OpenCloud",
 	})
diff --git a/services/groups/pkg/command/root.go b/services/groups/pkg/command/root.go
index 3931be653..655a52c6d 100644
--- a/services/groups/pkg/command/root.go
+++ b/services/groups/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud group command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "group",
 		Short: "Provide groups for OpenCloud",
 	})
diff --git a/services/idm/pkg/command/root.go b/services/idm/pkg/command/root.go
index c0fb60ba9..9ee4271e8 100644
--- a/services/idm/pkg/command/root.go
+++ b/services/idm/pkg/command/root.go
@@ -26,7 +26,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud idm command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "idm",
 		Short: "Embedded LDAP service for OpenCloud",
 	})
diff --git a/services/idp/pkg/command/root.go b/services/idp/pkg/command/root.go
index d535ff89b..c0ec28843 100644
--- a/services/idp/pkg/command/root.go
+++ b/services/idp/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud-idp command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "idp",
 		Short: "Serve IDP API for OpenCloud",
 	})
diff --git a/services/invitations/pkg/command/root.go b/services/invitations/pkg/command/root.go
index 3923756d2..eab0c9735 100644
--- a/services/invitations/pkg/command/root.go
+++ b/services/invitations/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud invitations command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "invitations",
 		Short: "Serve invitations API for OpenCloud",
 	})
diff --git a/services/nats/pkg/command/root.go b/services/nats/pkg/command/root.go
index 10951422b..ce63c2f9c 100644
--- a/services/nats/pkg/command/root.go
+++ b/services/nats/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the nats command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "nats",
 		Short: "starts nats server",
 	})
diff --git a/services/notifications/pkg/command/root.go b/services/notifications/pkg/command/root.go
index dc632c6b5..d363ad3d9 100644
--- a/services/notifications/pkg/command/root.go
+++ b/services/notifications/pkg/command/root.go
@@ -26,7 +26,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the notifications command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "notifications",
 		Short: "starts notifications service",
 	})
diff --git a/services/ocdav/pkg/command/root.go b/services/ocdav/pkg/command/root.go
index 50dd6d106..b147a8c58 100644
--- a/services/ocdav/pkg/command/root.go
+++ b/services/ocdav/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the OpenCloud ocdav command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "ocdav",
 		Short: "Provide a WebDav API for OpenCloud",
 	})
diff --git a/services/ocm/pkg/command/root.go b/services/ocm/pkg/command/root.go
index 5aa7b97ff..73c519c7f 100644
--- a/services/ocm/pkg/command/root.go
+++ b/services/ocm/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the ocm command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "ocm",
 		Short: "starts ocm service",
 	})
diff --git a/services/ocs/pkg/command/root.go b/services/ocs/pkg/command/root.go
index cd0fc183e..e25ae60eb 100644
--- a/services/ocs/pkg/command/root.go
+++ b/services/ocs/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud-ocs command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "ocs",
 		Short: "Serve OCS API for OpenCloud",
 	})
diff --git a/services/policies/pkg/command/root.go b/services/policies/pkg/command/root.go
index 322989054..884c81406 100644
--- a/services/policies/pkg/command/root.go
+++ b/services/policies/pkg/command/root.go
@@ -20,7 +20,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the policies command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "policies",
 		Short: "Serve policies for OpenCloud",
 	})
diff --git a/services/postprocessing/pkg/command/root.go b/services/postprocessing/pkg/command/root.go
index d80e21d4a..73171029e 100644
--- a/services/postprocessing/pkg/command/root.go
+++ b/services/postprocessing/pkg/command/root.go
@@ -26,7 +26,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the postprocessing command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "postprocessing",
 		Short: "starts postprocessing service",
 	})
diff --git a/services/proxy/pkg/command/root.go b/services/proxy/pkg/command/root.go
index 9e32ede90..10ee5398f 100644
--- a/services/proxy/pkg/command/root.go
+++ b/services/proxy/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud-proxy command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "proxy",
 		Short: "proxy for OpenCloud",
 	})
diff --git a/services/search/pkg/command/root.go b/services/search/pkg/command/root.go
index 91badc9f9..ff158883f 100644
--- a/services/search/pkg/command/root.go
+++ b/services/search/pkg/command/root.go
@@ -26,7 +26,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud-search command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "search",
 		Short: "Serve search API for OpenCloud",
 	})
diff --git a/services/settings/pkg/command/root.go b/services/settings/pkg/command/root.go
index 2d01abb43..bf2b58b12 100644
--- a/services/settings/pkg/command/root.go
+++ b/services/settings/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud-settings command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "settings",
 		Short: "Provide settings and permissions for OpenCloud",
 	})
diff --git a/services/sharing/pkg/command/root.go b/services/sharing/pkg/command/root.go
index bf7a143fd..e9c6bcf4a 100644
--- a/services/sharing/pkg/command/root.go
+++ b/services/sharing/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the sharing command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "sharing",
 		Short: "Provide sharing for OpenCloud",
 	})
diff --git a/services/sse/pkg/command/root.go b/services/sse/pkg/command/root.go
index 82b90791e..aacf53d75 100644
--- a/services/sse/pkg/command/root.go
+++ b/services/sse/pkg/command/root.go
@@ -20,7 +20,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the sse command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "sse",
 		Short: "Serve sse for OpenCloud",
 	})
diff --git a/services/storage-publiclink/pkg/command/root.go b/services/storage-publiclink/pkg/command/root.go
index 977079f9c..9008c52ec 100644
--- a/services/storage-publiclink/pkg/command/root.go
+++ b/services/storage-publiclink/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the storage-publiclink command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "storage-publiclink",
 		Short: "Provide publiclink storage for OpenCloud",
 	})
diff --git a/services/storage-shares/pkg/command/root.go b/services/storage-shares/pkg/command/root.go
index 6c46190e7..f3d00086f 100644
--- a/services/storage-shares/pkg/command/root.go
+++ b/services/storage-shares/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the storage-shares command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "storage-shares",
 		Short: "Provide a virtual storage for shares in OpenCloud",
 	})
diff --git a/services/storage-system/pkg/command/root.go b/services/storage-system/pkg/command/root.go
index f81e980ef..f36a7186e 100644
--- a/services/storage-system/pkg/command/root.go
+++ b/services/storage-system/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the storage-system command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "storage-system",
 		Short: "Provide system storage for OpenCloud",
 	})
diff --git a/services/storage-users/pkg/command/root.go b/services/storage-users/pkg/command/root.go
index 1722ec679..a0c202292 100644
--- a/services/storage-users/pkg/command/root.go
+++ b/services/storage-users/pkg/command/root.go
@@ -27,7 +27,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud-storage-users command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "storage-users",
 		Short: "Provide storage for users and projects in OpenCloud",
 	})
diff --git a/services/thumbnails/pkg/command/root.go b/services/thumbnails/pkg/command/root.go
index 7bbf9b7fd..14b0b8343 100644
--- a/services/thumbnails/pkg/command/root.go
+++ b/services/thumbnails/pkg/command/root.go
@@ -24,7 +24,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud-thumbnails command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "thumbnails",
 		Short: "Example usage",
 	})
diff --git a/services/userlog/pkg/command/root.go b/services/userlog/pkg/command/root.go
index bf07f7356..0bee5dcd7 100644
--- a/services/userlog/pkg/command/root.go
+++ b/services/userlog/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the userlog command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "userlog",
 		Short: "starts userlog service",
 	})
diff --git a/services/users/pkg/command/root.go b/services/users/pkg/command/root.go
index 0cb36cae5..9bf352f98 100644
--- a/services/users/pkg/command/root.go
+++ b/services/users/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud-user command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "user",
 		Short: "Provide users for OpenCloud",
 	})
diff --git a/services/web/pkg/command/root.go b/services/web/pkg/command/root.go
index c754c40ab..504cd5e9c 100644
--- a/services/web/pkg/command/root.go
+++ b/services/web/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the web command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "web",
 		Short: "Serve Web for OpenCloud",
 	})
diff --git a/services/webdav/pkg/command/root.go b/services/webdav/pkg/command/root.go
index cb781c75f..104f7e7d7 100644
--- a/services/webdav/pkg/command/root.go
+++ b/services/webdav/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud-webdav command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "webdav",
 		Short: "Serve WebDAV API for OpenCloud",
 	})
diff --git a/services/webfinger/pkg/command/root.go b/services/webfinger/pkg/command/root.go
index 628079309..a5f9867d4 100644
--- a/services/webfinger/pkg/command/root.go
+++ b/services/webfinger/pkg/command/root.go
@@ -25,7 +25,7 @@ func GetCommands(cfg *config.Config) []*cobra.Command {
 
 // Execute is the entry point for the opencloud webfinger command.
 func Execute(cfg *config.Config) error {
-	app := clihelper.DefaultAppCobra(&cobra.Command{
+	app := clihelper.DefaultApp(&cobra.Command{
 		Use:   "webfinger",
 		Short: "Serve webfinger API for OpenCloud",
 	})