diff --git a/go.mod b/go.mod
index 5f96a22f1..8a2c149c2 100644
--- a/go.mod
+++ b/go.mod
@@ -7,6 +7,7 @@ require (
 	github.com/golang/protobuf v1.3.2
 	github.com/google/uuid v1.1.1
 	github.com/micro/cli v0.2.0
+	github.com/micro/cli/v2 v2.1.1
 	github.com/micro/go-micro v1.18.0
 	github.com/micro/go-micro/v2 v2.0.0
 	github.com/oklog/run v1.1.0
diff --git a/pkg/command/root.go b/pkg/command/root.go
index 1dc3777ab..01f884660 100644
--- a/pkg/command/root.go
+++ b/pkg/command/root.go
@@ -3,7 +3,7 @@ package command
 import (
 	"os"
 
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	// init store manager
 	_ "github.com/owncloud/ocis-accounts/pkg/store"
 	"github.com/owncloud/ocis-hello/pkg/version"
@@ -16,14 +16,14 @@ func Execute() error {
 		Version: version.String,
 		Usage:   "Example service for Reva/oCIS",
 
-		Authors: []cli.Author{
+		Authors: []*cli.Author{
 			{
 				Name:  "ownCloud GmbH",
 				Email: "support@owncloud.com",
 			},
 		},
 
-		Commands: []cli.Command{
+		Commands: []*cli.Command{
 			Server(),
 		},
 	}
diff --git a/pkg/command/server.go b/pkg/command/server.go
index 6bec060c4..a0a867f7f 100644
--- a/pkg/command/server.go
+++ b/pkg/command/server.go
@@ -5,14 +5,14 @@ import (
 	"fmt"
 	"syscall"
 
-	"github.com/micro/cli"
+	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis-accounts/pkg/micro/grpc"
 )
 
 // Server is the entry point for the server command.
-func Server() cli.Command {
-	return cli.Command{
+func Server() *cli.Command {
+	return &cli.Command{
 		Name:  "server",
 		Usage: "Start accounts service",
 		Action: func(c *cli.Context) error {
diff --git a/pkg/service/v0/service.go b/pkg/service/v0/service.go
index c0a7a0edd..4a7c8fc2c 100644
--- a/pkg/service/v0/service.go
+++ b/pkg/service/v0/service.go
@@ -16,7 +16,7 @@ func New(cfg *config.Config) Service {
 	fmt.Printf("config type: %T", account.Registry["filesystem"])
 	return Service{
 		Config:  cfg,
-		Manager: account.Registry["filesystem"](cfg), // TODO read this from config
+		Manager: account.Registry["filesystem"](cfg), // TODO read manager from config
 	}
 }