Repository: owncloud/ocis
Pull request #2499 (2021-09-14 14:06:39)

switch from micro/cli/v2 to urfave/cli/v2
## Description
switch from micro/cli/v2 to urfave/cli/v2 because go-micro also has done it in https://github.com/asim/go-micro/pull/2224

## Related Issue
<!--- This project only accepts pull requests related to open issues -->
<!--- If suggesting a new feature or change, please discuss it in an issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
<!--- Please link to the issue here: -->
- like https://github.com/asim/go-micro/pull/2224

## Motivation and Context
<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran to -->
<!--- see how your change affects other areas of the code, etc. -->
- not at all

## Screenshots (if appropriate):

## Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
- [ ] Technical debt
- [ ] Tests only (no source changes)

## Checklist:
<!-- Tick the checkboxes when done. -->
<!-- Raise documentation ticket in owncloud.github.io/ -->
- [ ] Code changes
- [ ] Unit tests added
- [ ] Acceptance tests added
- [ ] Documentation ticket raised: <link> 


update-docs[bot]: Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a [changelog](https://github.com/owncloud/ocis/blob/master/changelog/README.md) item based on your changes.

sonarcloud[bot]: Kudos, SonarCloud Quality Gate passed!&nbsp; &nbsp; ![Quality Gate passed](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/QualityGateBadge/passed-16px.png 'Quality Gate passed')

[![Bug](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/bug-16px.png 'Bug')](https://sonarcloud.io/project/issues?id=owncloud_ocis&pullRequest=2499&resolved=false&types=BUG) [![A](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A-16px.png 'A')](https://sonarcloud.io/project/issues?id=owncloud_ocis&pullRequest=2499&resolved=false&types=BUG) [0 Bugs](https://sonarcloud.io/project/issues?id=owncloud_ocis&pullRequest=2499&resolved=false&types=BUG)  
[![Vulnerability](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/vulnerability-16px.png 'Vulnerability')](https://sonarcloud.io/project/issues?id=owncloud_ocis&pullRequest=2499&resolved=false&types=VULNERABILITY) [![A](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A-16px.png 'A')](https://sonarcloud.io/project/issues?id=owncloud_ocis&pullRequest=2499&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=owncloud_ocis&pullRequest=2499&resolved=false&types=VULNERABILITY)  
[![Security Hotspot](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/security_hotspot-16px.png 'Security Hotspot')](https://sonarcloud.io/project/security_hotspots?id=owncloud_ocis&pullRequest=2499&resolved=false&types=SECURITY_HOTSPOT) [![A](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A-16px.png 'A')](https://sonarcloud.io/project/security_hotspots?id=owncloud_ocis&pullRequest=2499&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=owncloud_ocis&pullRequest=2499&resolved=false&types=SECURITY_HOTSPOT)  
[![Code Smell](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/code_smell-16px.png 'Code Smell')](https://sonarcloud.io/project/issues?id=owncloud_ocis&pullRequest=2499&resolved=false&types=CODE_SMELL) [![A](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/RatingBadge/A-16px.png 'A')](https://sonarcloud.io/project/issues?id=owncloud_ocis&pullRequest=2499&resolved=false&types=CODE_SMELL) [0 Code Smells](https://sonarcloud.io/project/issues?id=owncloud_ocis&pullRequest=2499&resolved=false&types=CODE_SMELL)

[![No Coverage information](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/CoverageChart/NoCoverageInfo-16px.png 'No Coverage information')](https://sonarcloud.io/component_measures?id=owncloud_ocis&pullRequest=2499&metric=coverage&view=list) No Coverage information  
[![29.8%](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/Duplications/20plus-16px.png '29.8%')](https://sonarcloud.io/component_measures?id=owncloud_ocis&pullRequest=2499&metric=new_duplicated_lines_density&view=list) [29.8% Duplication](https://sonarcloud.io/component_measures?id=owncloud_ocis&pullRequest=2499&metric=new_duplicated_lines_density&view=list)


wkloucek: @refs I saw that go-micro did this step... Do you think we also can do this?

Patch:
diff --git a/accounts/pkg/command/add_account.go b/accounts/pkg/command/add_account.go
index 139a4999152..968b05acaf6 100644
--- a/accounts/pkg/command/add_account.go
+++ b/accounts/pkg/command/add_account.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 
 	"github.com/asim/go-micro/plugins/client/grpc/v3"
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/flagset"
 	accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
+	"github.com/urfave/cli/v2"
 )
 
 // AddAccount command creates a new account
diff --git a/accounts/pkg/command/inspect_account.go b/accounts/pkg/command/inspect_account.go
index 3f02da36e92..14f1d37aab4 100644
--- a/accounts/pkg/command/inspect_account.go
+++ b/accounts/pkg/command/inspect_account.go
@@ -6,11 +6,11 @@ import (
 	"strconv"
 
 	"github.com/asim/go-micro/plugins/client/grpc/v3"
-	"github.com/micro/cli/v2"
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/flagset"
 	accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
+	"github.com/urfave/cli/v2"
 )
 
 // InspectAccount command shows detailed information about a specific account.
diff --git a/accounts/pkg/command/list_accounts.go b/accounts/pkg/command/list_accounts.go
index e20236b0679..517c4062ecf 100644
--- a/accounts/pkg/command/list_accounts.go
+++ b/accounts/pkg/command/list_accounts.go
@@ -6,11 +6,11 @@ import (
 	"strconv"
 
 	"github.com/asim/go-micro/plugins/client/grpc/v3"
-	"github.com/micro/cli/v2"
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/flagset"
 	accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
+	"github.com/urfave/cli/v2"
 )
 
 // ListAccounts command lists all accounts
diff --git a/accounts/pkg/command/rebuild_index.go b/accounts/pkg/command/rebuild_index.go
index 57b1ac6247a..cffb1638823 100644
--- a/accounts/pkg/command/rebuild_index.go
+++ b/accounts/pkg/command/rebuild_index.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/asim/go-micro/plugins/client/grpc/v3"
 	merrors "github.com/asim/go-micro/v3/errors"
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	index "github.com/owncloud/ocis/accounts/pkg/proto/v0"
+	"github.com/urfave/cli/v2"
 )
 
 // RebuildIndex rebuilds the entire configured index.
diff --git a/accounts/pkg/command/remove_account.go b/accounts/pkg/command/remove_account.go
index 703e32daa44..cca7bf44b7b 100644
--- a/accounts/pkg/command/remove_account.go
+++ b/accounts/pkg/command/remove_account.go
@@ -5,10 +5,10 @@ import (
 	"os"
 
 	"github.com/asim/go-micro/plugins/client/grpc/v3"
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/flagset"
 	accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
+	"github.com/urfave/cli/v2"
 )
 
 // RemoveAccount command deletes an existing account.
diff --git a/accounts/pkg/command/root.go b/accounts/pkg/command/root.go
index 17d17364c82..54c3055013e 100644
--- a/accounts/pkg/command/root.go
+++ b/accounts/pkg/command/root.go
@@ -5,7 +5,6 @@ import (
 	"os"
 	"strings"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/flagset"
 	"github.com/owncloud/ocis/accounts/pkg/version"
@@ -14,6 +13,7 @@ import (
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 	"github.com/spf13/viper"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 var (
diff --git a/accounts/pkg/command/server.go b/accounts/pkg/command/server.go
index 3ff1dcd8d6e..a64c23080e4 100644
--- a/accounts/pkg/command/server.go
+++ b/accounts/pkg/command/server.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/flagset"
@@ -15,6 +14,7 @@ import (
 	"github.com/owncloud/ocis/accounts/pkg/server/http"
 	svc "github.com/owncloud/ocis/accounts/pkg/service/v0"
 	"github.com/owncloud/ocis/accounts/pkg/tracing"
+	"github.com/urfave/cli/v2"
 )
 
 // Server is the entry point for the server command.
diff --git a/accounts/pkg/command/update_account.go b/accounts/pkg/command/update_account.go
index 9237e966cbb..6d15546cedd 100644
--- a/accounts/pkg/command/update_account.go
+++ b/accounts/pkg/command/update_account.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 
 	"github.com/asim/go-micro/plugins/client/grpc/v3"
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/flagset"
 	accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
+	"github.com/urfave/cli/v2"
 	"google.golang.org/genproto/protobuf/field_mask"
 )
 
diff --git a/accounts/pkg/command/version.go b/accounts/pkg/command/version.go
index 1ceb6340820..c89358db524 100644
--- a/accounts/pkg/command/version.go
+++ b/accounts/pkg/command/version.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/registry"
 
-	"github.com/micro/cli/v2"
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // PrintVersion prints the service versions of all running instances.
diff --git a/accounts/pkg/flagset/flagset.go b/accounts/pkg/flagset/flagset.go
index 4a7954f6626..dd4db4e61f8 100644
--- a/accounts/pkg/flagset/flagset.go
+++ b/accounts/pkg/flagset/flagset.go
@@ -1,10 +1,10 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
+	"github.com/urfave/cli/v2"
 )
 
 // RootWithConfig applies cfg to the root flagset
diff --git a/accounts/pkg/server/grpc/option.go b/accounts/pkg/server/grpc/option.go
index 86d158f6f41..a00017e8fb3 100644
--- a/accounts/pkg/server/grpc/option.go
+++ b/accounts/pkg/server/grpc/option.go
@@ -3,11 +3,11 @@ package grpc
 import (
 	"context"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/metrics"
 	svc "github.com/owncloud/ocis/accounts/pkg/service/v0"
 	"github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/urfave/cli/v2"
 )
 
 // Option defines a single option function.
diff --git a/accounts/pkg/server/http/option.go b/accounts/pkg/server/http/option.go
index 664a2cdfe8b..2614c5c94f5 100644
--- a/accounts/pkg/server/http/option.go
+++ b/accounts/pkg/server/http/option.go
@@ -3,11 +3,11 @@ package http
 import (
 	"context"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/metrics"
 	svc "github.com/owncloud/ocis/accounts/pkg/service/v0"
 	"github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/urfave/cli/v2"
 )
 
 // Option defines a single option function.
diff --git a/glauth/pkg/command/health.go b/glauth/pkg/command/health.go
index 1821e87c0d1..3deb2db70dd 100644
--- a/glauth/pkg/command/health.go
+++ b/glauth/pkg/command/health.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/glauth/pkg/config"
 	"github.com/owncloud/ocis/glauth/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // Health is the entrypoint for the health command.
diff --git a/glauth/pkg/command/root.go b/glauth/pkg/command/root.go
index 55404851daf..bcfe9624796 100644
--- a/glauth/pkg/command/root.go
+++ b/glauth/pkg/command/root.go
@@ -5,7 +5,6 @@ import (
 	"os"
 	"strings"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/glauth/pkg/config"
 	"github.com/owncloud/ocis/glauth/pkg/flagset"
 	"github.com/owncloud/ocis/glauth/pkg/version"
@@ -14,6 +13,7 @@ import (
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 	"github.com/spf13/viper"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // Execute is the entry point for the ocis-glauth command.
diff --git a/glauth/pkg/command/server.go b/glauth/pkg/command/server.go
index 526e3152da7..e15f9a1be0c 100644
--- a/glauth/pkg/command/server.go
+++ b/glauth/pkg/command/server.go
@@ -5,7 +5,6 @@ import (
 	"strings"
 
 	glauthcfg "github.com/glauth/glauth/pkg/config"
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0"
 	"github.com/owncloud/ocis/glauth/pkg/config"
@@ -17,6 +16,7 @@ import (
 	pkgcrypto "github.com/owncloud/ocis/ocis-pkg/crypto"
 	"github.com/owncloud/ocis/ocis-pkg/service/grpc"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
+	"github.com/urfave/cli/v2"
 )
 
 // Server is the entrypoint for the server command.
diff --git a/glauth/pkg/flagset/flagset.go b/glauth/pkg/flagset/flagset.go
index defece35ce3..b29cc59b46a 100644
--- a/glauth/pkg/flagset/flagset.go
+++ b/glauth/pkg/flagset/flagset.go
@@ -3,10 +3,10 @@ package flagset
 import (
 	"path"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/glauth/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	pkgos "github.com/owncloud/ocis/ocis-pkg/os"
+	"github.com/urfave/cli/v2"
 )
 
 // RootWithConfig applies cfg to the root flagset
diff --git a/go.mod b/go.mod
index 0fc057f47eb..7ec387f62e3 100644
--- a/go.mod
+++ b/go.mod
@@ -16,7 +16,7 @@ require (
 	github.com/asim/go-micro/plugins/wrapper/breaker/gobreaker/v3 v3.0.0-20210812172626-c7195aae9817
 	github.com/asim/go-micro/plugins/wrapper/monitoring/prometheus/v3 v3.0.0-20210812172626-c7195aae9817
 	github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3 v3.0.0-20210812172626-c7195aae9817
-	github.com/asim/go-micro/v3 v3.6.0
+	github.com/asim/go-micro/v3 v3.6.1-0.20210924081004-8c39b1e1204d
 	github.com/blevesearch/bleve/v2 v2.1.0
 	github.com/coreos/go-oidc/v3 v3.0.0
 	github.com/cs3org/go-cs3apis v0.0.0-20210922150613-cb9e3c99f8de
@@ -38,7 +38,6 @@ require (
 	github.com/justinas/alice v1.2.0
 	github.com/libregraph/lico v0.34.1-0.20210803054646-b584e0372224
 	github.com/mennanov/fieldmask-utils v0.4.0
-	github.com/micro/cli/v2 v2.1.2
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
 	github.com/nmcclain/asn1-ber v0.0.0-20170104154839-2661553a0484
 	github.com/nmcclain/ldap v0.0.0-20210720162743-7f8d1e44eeba
@@ -55,6 +54,7 @@ require (
 	github.com/spf13/viper v1.8.1
 	github.com/stretchr/testify v1.7.0
 	github.com/thejerf/suture/v4 v4.0.1
+	github.com/urfave/cli/v2 v2.3.0
 	github.com/yaegashi/msgraph.go v0.1.4
 	go.opencensus.io v0.23.0
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.23.0
diff --git a/go.sum b/go.sum
index c1152fb2e11..321f1db02d1 100644
--- a/go.sum
+++ b/go.sum
@@ -158,8 +158,8 @@ github.com/asim/go-micro/plugins/wrapper/trace/opencensus/v3 v3.0.0-202108121726
 github.com/asim/go-micro/v3 v3.5.1/go.mod h1:OJ5DnUQmoEVQTNbKRstR7/krtYJI+QaBe/XeN5MZkqE=
 github.com/asim/go-micro/v3 v3.5.2-0.20210629124054-4929a7c16ecc/go.mod h1:cNGIIYQcp0qy+taNYmrBdaIHeqMWHV5ZH/FfQzfOyE8=
 github.com/asim/go-micro/v3 v3.5.2-0.20210630062103-c13bb07171bc/go.mod h1:cNGIIYQcp0qy+taNYmrBdaIHeqMWHV5ZH/FfQzfOyE8=
-github.com/asim/go-micro/v3 v3.6.0 h1:I6UVJBpBtWNKCjWf0dRpZznRCW9TR4DXjV4wieyGhK0=
-github.com/asim/go-micro/v3 v3.6.0/go.mod h1:cNGIIYQcp0qy+taNYmrBdaIHeqMWHV5ZH/FfQzfOyE8=
+github.com/asim/go-micro/v3 v3.6.1-0.20210924081004-8c39b1e1204d h1:EAmpwVkQtiT3yD286sYUs6VqZglabLq/DqfowID83F4=
+github.com/asim/go-micro/v3 v3.6.1-0.20210924081004-8c39b1e1204d/go.mod h1:Vr4N4czAznfz3gPqKUznocbo5l0knZRIpzh5+0Hml7I=
 github.com/aws/aws-sdk-go v1.20.1/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.23.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
@@ -768,7 +768,6 @@ github.com/mendsley/gojwk v0.0.0-20141217222730-4d5ec6e58103 h1:Z/i1e+gTZrmcGeZy
 github.com/mendsley/gojwk v0.0.0-20141217222730-4d5ec6e58103/go.mod h1:o9YPB5aGP8ob35Vy6+vyq3P3bWe7NQWzf+JLiXCiMaE=
 github.com/mennanov/fieldmask-utils v0.4.0 h1:MvXJgV4em1j0u2Aw2Wwd/ES8alZE9vN5FSB1SYiJ6vM=
 github.com/mennanov/fieldmask-utils v0.4.0/go.mod h1:lah2lHczE2ff+7SqnNKpB+YzaO7M3h5iNO4LgPTJheM=
-github.com/micro/cli/v2 v2.1.2 h1:43J1lChg/rZCC1rvdqZNFSQDrGT7qfMrtp6/ztpIkEM=
 github.com/micro/cli/v2 v2.1.2/go.mod h1:EguNh6DAoWKm9nmk+k/Rg0H3lQnDxqzu5x5srOtGtYg=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
@@ -1103,7 +1102,9 @@ github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLY
 github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA=
 github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
diff --git a/graph-explorer/pkg/command/health.go b/graph-explorer/pkg/command/health.go
index d42302091f5..2fc86dcc07d 100644
--- a/graph-explorer/pkg/command/health.go
+++ b/graph-explorer/pkg/command/health.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/graph-explorer/pkg/config"
 	"github.com/owncloud/ocis/graph-explorer/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // Health is the entrypoint for the health command.
diff --git a/graph-explorer/pkg/command/root.go b/graph-explorer/pkg/command/root.go
index d1140550712..bb345543713 100644
--- a/graph-explorer/pkg/command/root.go
+++ b/graph-explorer/pkg/command/root.go
@@ -5,7 +5,6 @@ import (
 	"os"
 	"strings"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/graph-explorer/pkg/config"
 	"github.com/owncloud/ocis/graph-explorer/pkg/flagset"
 	"github.com/owncloud/ocis/graph-explorer/pkg/version"
@@ -14,6 +13,7 @@ import (
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 	"github.com/spf13/viper"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // Execute is the entry point for the graph-explorer command.
diff --git a/graph-explorer/pkg/command/server.go b/graph-explorer/pkg/command/server.go
index 9893e554a6b..fa15eaf3607 100644
--- a/graph-explorer/pkg/command/server.go
+++ b/graph-explorer/pkg/command/server.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"strings"
 
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/graph-explorer/pkg/config"
 	"github.com/owncloud/ocis/graph-explorer/pkg/flagset"
@@ -13,6 +12,7 @@ import (
 	"github.com/owncloud/ocis/graph-explorer/pkg/server/http"
 	"github.com/owncloud/ocis/graph-explorer/pkg/tracing"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
+	"github.com/urfave/cli/v2"
 )
 
 // Server is the entrypoint for the server command.
diff --git a/graph-explorer/pkg/flagset/flagset.go b/graph-explorer/pkg/flagset/flagset.go
index 2dca27c348e..30dbe0e59b1 100644
--- a/graph-explorer/pkg/flagset/flagset.go
+++ b/graph-explorer/pkg/flagset/flagset.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/graph-explorer/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
+	"github.com/urfave/cli/v2"
 )
 
 // RootWithConfig applies cfg to the root flagset
diff --git a/graph-explorer/pkg/server/http/option.go b/graph-explorer/pkg/server/http/option.go
index 7addf70edf5..92b4e268c49 100644
--- a/graph-explorer/pkg/server/http/option.go
+++ b/graph-explorer/pkg/server/http/option.go
@@ -3,10 +3,10 @@ package http
 import (
 	"context"
 
-	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/graph-explorer/pkg/config"
 	"github.com/owncloud/ocis/graph-explorer/pkg/metrics"
+	"github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/urfave/cli/v2"
 )
 
 // Option defines a single option function.
diff --git a/graph/pkg/command/health.go b/graph/pkg/command/health.go
index 7da27c3ce05..8fd0bef9c0a 100644
--- a/graph/pkg/command/health.go
+++ b/graph/pkg/command/health.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/graph/pkg/config"
 	"github.com/owncloud/ocis/graph/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // Health is the entrypoint for the health command.
diff --git a/graph/pkg/command/root.go b/graph/pkg/command/root.go
index ec758502c3b..be4e64fdb71 100644
--- a/graph/pkg/command/root.go
+++ b/graph/pkg/command/root.go
@@ -8,13 +8,13 @@ import (
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 	"github.com/thejerf/suture/v4"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/graph/pkg/config"
 	"github.com/owncloud/ocis/graph/pkg/flagset"
 	"github.com/owncloud/ocis/graph/pkg/version"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/spf13/viper"
+	"github.com/urfave/cli/v2"
 )
 
 // Execute is the entry point for the ocis-graph command.
diff --git a/graph/pkg/command/server.go b/graph/pkg/command/server.go
index e1700f564ea..fb649db7b92 100644
--- a/graph/pkg/command/server.go
+++ b/graph/pkg/command/server.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"strings"
 
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/graph/pkg/config"
 	"github.com/owncloud/ocis/graph/pkg/flagset"
@@ -13,6 +12,7 @@ import (
 	"github.com/owncloud/ocis/graph/pkg/server/http"
 	"github.com/owncloud/ocis/graph/pkg/tracing"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
+	"github.com/urfave/cli/v2"
 )
 
 // Server is the entrypoint for the server command.
diff --git a/graph/pkg/flagset/flagset.go b/graph/pkg/flagset/flagset.go
index a259ac81624..76f9d364472 100644
--- a/graph/pkg/flagset/flagset.go
+++ b/graph/pkg/flagset/flagset.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/graph/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
+	"github.com/urfave/cli/v2"
 )
 
 // RootWithConfig applies cfg to the root flagset
diff --git a/graph/pkg/server/http/option.go b/graph/pkg/server/http/option.go
index 96c8749517c..e1404d37445 100644
--- a/graph/pkg/server/http/option.go
+++ b/graph/pkg/server/http/option.go
@@ -3,10 +3,10 @@ package http
 import (
 	"context"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/graph/pkg/config"
 	"github.com/owncloud/ocis/graph/pkg/metrics"
 	"github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/urfave/cli/v2"
 )
 
 // Option defines a single option function.
diff --git a/idp/pkg/command/health.go b/idp/pkg/command/health.go
index ab38e131021..7e03cabc723 100644
--- a/idp/pkg/command/health.go
+++ b/idp/pkg/command/health.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/idp/pkg/config"
 	"github.com/owncloud/ocis/idp/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // Health is the entrypoint for the health command.
diff --git a/idp/pkg/command/root.go b/idp/pkg/command/root.go
index 140d036111f..990ae4e91a9 100644
--- a/idp/pkg/command/root.go
+++ b/idp/pkg/command/root.go
@@ -5,7 +5,6 @@ import (
 	"os"
 	"strings"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/idp/pkg/config"
 	"github.com/owncloud/ocis/idp/pkg/flagset"
 	"github.com/owncloud/ocis/idp/pkg/version"
@@ -14,6 +13,7 @@ import (
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 	"github.com/spf13/viper"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // Execute is the entry point for the ocis-idp command.
diff --git a/idp/pkg/command/server.go b/idp/pkg/command/server.go
index ebc79749ea7..425fc8ad133 100644
--- a/idp/pkg/command/server.go
+++ b/idp/pkg/command/server.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"strings"
 
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/idp/pkg/config"
 	"github.com/owncloud/ocis/idp/pkg/flagset"
@@ -13,6 +12,7 @@ import (
 	"github.com/owncloud/ocis/idp/pkg/server/http"
 	"github.com/owncloud/ocis/idp/pkg/tracing"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
+	"github.com/urfave/cli/v2"
 )
 
 // Server is the entrypoint for the server command.
diff --git a/idp/pkg/command/version.go b/idp/pkg/command/version.go
index 10a32c5c59a..5f43da13215 100644
--- a/idp/pkg/command/version.go
+++ b/idp/pkg/command/version.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/registry"
 
-	"github.com/micro/cli/v2"
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/owncloud/ocis/idp/pkg/config"
 	"github.com/owncloud/ocis/idp/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // PrintVersion prints the service versions of all running instances.
diff --git a/idp/pkg/flagset/flagset.go b/idp/pkg/flagset/flagset.go
index 7ee2542b8ef..2a8d9189f22 100644
--- a/idp/pkg/flagset/flagset.go
+++ b/idp/pkg/flagset/flagset.go
@@ -3,10 +3,10 @@ package flagset
 import (
 	"path"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/idp/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	pkgos "github.com/owncloud/ocis/ocis-pkg/os"
+	"github.com/urfave/cli/v2"
 )
 
 // RootWithConfig applies cfg to the root flagset
diff --git a/idp/pkg/server/http/option.go b/idp/pkg/server/http/option.go
index 3fed9712df5..9f12bd9b3dc 100644
--- a/idp/pkg/server/http/option.go
+++ b/idp/pkg/server/http/option.go
@@ -3,10 +3,10 @@ package http
 import (
 	"context"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/idp/pkg/config"
 	"github.com/owncloud/ocis/idp/pkg/metrics"
 	"github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/urfave/cli/v2"
 )
 
 // Option defines a single option function.
diff --git a/ocis-pkg/service/grpc/option.go b/ocis-pkg/service/grpc/option.go
index 88528416e7d..b2fa3823b17 100644
--- a/ocis-pkg/service/grpc/option.go
+++ b/ocis-pkg/service/grpc/option.go
@@ -3,8 +3,8 @@ package grpc
 import (
 	"context"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/urfave/cli/v2"
 )
 
 // Option defines a single option function.
diff --git a/ocis-pkg/service/http/option.go b/ocis-pkg/service/http/option.go
index a88062389c5..108dcc9e76c 100644
--- a/ocis-pkg/service/http/option.go
+++ b/ocis-pkg/service/http/option.go
@@ -5,8 +5,8 @@ import (
 	"crypto/tls"
 	"net/http"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/urfave/cli/v2"
 )
 
 // Option defines a single option function.
diff --git a/ocis/pkg/command/accounts.go b/ocis/pkg/command/accounts.go
index 96da23edd39..94a3820221b 100644
--- a/ocis/pkg/command/accounts.go
+++ b/ocis/pkg/command/accounts.go
@@ -1,15 +1,16 @@
+//go:build !simple
 // +build !simple
 
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/accounts/pkg/command"
 	svcconfig "github.com/owncloud/ocis/accounts/pkg/config"
 	"github.com/owncloud/ocis/accounts/pkg/flagset"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/ocis/pkg/version"
+	"github.com/urfave/cli/v2"
 )
 
 // AccountsCommand is the entrypoint for the accounts command.
diff --git a/ocis/pkg/command/common.go b/ocis/pkg/command/common.go
index 3f599cdb10e..60af3e22ab9 100644
--- a/ocis/pkg/command/common.go
+++ b/ocis/pkg/command/common.go
@@ -1,6 +1,6 @@
 package command
 
-import "github.com/micro/cli/v2"
+import "github.com/urfave/cli/v2"
 
 func handleOriginalAction(c *cli.Context, cmd *cli.Command) error {
 
diff --git a/ocis/pkg/command/glauth.go b/ocis/pkg/command/glauth.go
index e220c891038..5b90aa76a4a 100644
--- a/ocis/pkg/command/glauth.go
+++ b/ocis/pkg/command/glauth.go
@@ -1,13 +1,13 @@
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/glauth/pkg/command"
 	svcconfig "github.com/owncloud/ocis/glauth/pkg/config"
 	"github.com/owncloud/ocis/glauth/pkg/flagset"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/ocis/pkg/version"
+	"github.com/urfave/cli/v2"
 )
 
 // GLAuthCommand is the entrypoint for the glauth command.
diff --git a/ocis/pkg/command/health.go b/ocis/pkg/command/health.go
index ef718ac1042..c65e2958298 100644
--- a/ocis/pkg/command/health.go
+++ b/ocis/pkg/command/health.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/flagset"
 	"github.com/owncloud/ocis/ocis/pkg/register"
+	"github.com/urfave/cli/v2"
 )
 
 // Health is the entrypoint for the health command.
diff --git a/ocis/pkg/command/idp.go b/ocis/pkg/command/idp.go
index 926025371d3..f7981eb58e3 100644
--- a/ocis/pkg/command/idp.go
+++ b/ocis/pkg/command/idp.go
@@ -1,13 +1,13 @@
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/idp/pkg/command"
 	svcconfig "github.com/owncloud/ocis/idp/pkg/config"
 	"github.com/owncloud/ocis/idp/pkg/flagset"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/ocis/pkg/version"
+	"github.com/urfave/cli/v2"
 )
 
 // IDPCommand is the entrypoint for the idp command.
diff --git a/ocis/pkg/command/kill.go b/ocis/pkg/command/kill.go
index e96e4a057c4..70530f98afb 100644
--- a/ocis/pkg/command/kill.go
+++ b/ocis/pkg/command/kill.go
@@ -7,9 +7,9 @@ import (
 	"net/rpc"
 	"os"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
+	"github.com/urfave/cli/v2"
 )
 
 // KillCommand is the entrypoint for the kill command.
diff --git a/ocis/pkg/command/list.go b/ocis/pkg/command/list.go
index 137f1331c35..7d277e8bfdc 100644
--- a/ocis/pkg/command/list.go
+++ b/ocis/pkg/command/list.go
@@ -6,9 +6,9 @@ import (
 	"net"
 	"net/rpc"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
+	"github.com/urfave/cli/v2"
 )
 
 // ListCommand is the entrypoint for the list command.
diff --git a/ocis/pkg/command/ocs.go b/ocis/pkg/command/ocs.go
index 80e02a9f4eb..d4c30e2ddd6 100644
--- a/ocis/pkg/command/ocs.go
+++ b/ocis/pkg/command/ocs.go
@@ -1,15 +1,16 @@
+//go:build !simple
 // +build !simple
 
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/ocis/pkg/version"
 	"github.com/owncloud/ocis/ocs/pkg/command"
 	svcconfig "github.com/owncloud/ocis/ocs/pkg/config"
 	"github.com/owncloud/ocis/ocs/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // OCSCommand is the entrypoint for the ocs command.
diff --git a/ocis/pkg/command/proxy.go b/ocis/pkg/command/proxy.go
index f313383390b..0586283e915 100644
--- a/ocis/pkg/command/proxy.go
+++ b/ocis/pkg/command/proxy.go
@@ -1,15 +1,16 @@
+//go:build !simple
 // +build !simple
 
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/ocis/pkg/version"
 	"github.com/owncloud/ocis/proxy/pkg/command"
 	svcconfig "github.com/owncloud/ocis/proxy/pkg/config"
 	"github.com/owncloud/ocis/proxy/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // ProxyCommand is the entry point for the proxy command.
diff --git a/ocis/pkg/command/root.go b/ocis/pkg/command/root.go
index 4a931d79d52..25cf42b9eb6 100644
--- a/ocis/pkg/command/root.go
+++ b/ocis/pkg/command/root.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/urfave/cli/v2"
 
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/flagset"
diff --git a/ocis/pkg/command/run.go b/ocis/pkg/command/run.go
index 273bb1d3e54..398bb39e101 100644
--- a/ocis/pkg/command/run.go
+++ b/ocis/pkg/command/run.go
@@ -7,7 +7,7 @@ import (
 	"net/rpc"
 	"os"
 
-	cli "github.com/micro/cli/v2"
+	cli "github.com/urfave/cli/v2"
 
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
diff --git a/ocis/pkg/command/server.go b/ocis/pkg/command/server.go
index 28b50c993b2..acd66bc2681 100644
--- a/ocis/pkg/command/server.go
+++ b/ocis/pkg/command/server.go
@@ -1,3 +1,4 @@
+//go:build !simple
 // +build !simple
 
 package command
@@ -5,11 +6,11 @@ package command
 import (
 	"strings"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/flagset"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/ocis/pkg/runtime"
+	"github.com/urfave/cli/v2"
 )
 
 // Server is the entrypoint for the server command.
diff --git a/ocis/pkg/command/settings.go b/ocis/pkg/command/settings.go
index 1da359c11d3..f084453fbe0 100644
--- a/ocis/pkg/command/settings.go
+++ b/ocis/pkg/command/settings.go
@@ -1,15 +1,16 @@
+//go:build !simple
 // +build !simple
 
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/ocis/pkg/version"
 	"github.com/owncloud/ocis/settings/pkg/command"
 	svcconfig "github.com/owncloud/ocis/settings/pkg/config"
 	"github.com/owncloud/ocis/settings/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // SettingsCommand is the entry point for the settings command.
diff --git a/ocis/pkg/command/storageappprovider.go b/ocis/pkg/command/storageappprovider.go
index 883069ab747..cb60828d06e 100644
--- a/ocis/pkg/command/storageappprovider.go
+++ b/ocis/pkg/command/storageappprovider.go
@@ -1,14 +1,15 @@
+//go:build !simple
 // +build !simple
 
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/storage/pkg/command"
 	svcconfig "github.com/owncloud/ocis/storage/pkg/config"
 	"github.com/owncloud/ocis/storage/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // StorageAppProviderCommand is the entrypoint for the reva-app-provider command.
diff --git a/ocis/pkg/command/storageauthbasic.go b/ocis/pkg/command/storageauthbasic.go
index e7311c2be19..fe7a87eb1f5 100644
--- a/ocis/pkg/command/storageauthbasic.go
+++ b/ocis/pkg/command/storageauthbasic.go
@@ -1,14 +1,15 @@
+//go:build !simple
 // +build !simple
 
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/storage/pkg/command"
 	svcconfig "github.com/owncloud/ocis/storage/pkg/config"
 	"github.com/owncloud/ocis/storage/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // StorageAuthBasicCommand is the entrypoint for the reva-auth-basic command.
diff --git a/ocis/pkg/command/storageauthbearer.go b/ocis/pkg/command/storageauthbearer.go
index 15f55833c69..004d0b79362 100644
--- a/ocis/pkg/command/storageauthbearer.go
+++ b/ocis/pkg/command/storageauthbearer.go
@@ -1,14 +1,15 @@
+//go:build !simple
 // +build !simple
 
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/storage/pkg/command"
 	svcconfig "github.com/owncloud/ocis/storage/pkg/config"
 	"github.com/owncloud/ocis/storage/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // StorageAuthBearerCommand is the entrypoint for the reva-auth-bearer command.
diff --git a/ocis/pkg/command/storagefrontend.go b/ocis/pkg/command/storagefrontend.go
index 8c1fc8dab82..220eabc7441 100644
--- a/ocis/pkg/command/storagefrontend.go
+++ b/ocis/pkg/command/storagefrontend.go
@@ -1,14 +1,15 @@
+//go:build !simple
 // +build !simple
 
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/storage/pkg/command"
 	svcconfig "github.com/owncloud/ocis/storage/pkg/config"
 	"github.com/owncloud/ocis/storage/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // StorageFrontendCommand is the entrypoint for the reva-frontend command.
diff --git a/ocis/pkg/command/storagegateway.go b/ocis/pkg/command/storagegateway.go
index de793d6f803..d0e4e61fa01 100644
--- a/ocis/pkg/command/storagegateway.go
+++ b/ocis/pkg/command/storagegateway.go
@@ -1,14 +1,15 @@
+//go:build !simple
 // +build !simple
 
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/storage/pkg/command"
 	svcconfig "github.com/owncloud/ocis/storage/pkg/config"
 	"github.com/owncloud/ocis/storage/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // StorageGatewayCommand is the entrypoint for the reva-gateway command.
diff --git a/ocis/pkg/command/storagegroupprovider.go b/ocis/pkg/command/storagegroupprovider.go
index 2eb93fd36d8..3f77796e382 100644
--- a/ocis/pkg/command/storagegroupprovider.go
+++ b/ocis/pkg/command/storagegroupprovider.go
@@ -1,14 +1,15 @@
+//go:build !simple
 // +build !simple
 
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/storage/pkg/command"
 	svcconfig "github.com/owncloud/ocis/storage/pkg/config"
 	"github.com/owncloud/ocis/storage/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // StorageGroupProviderCommand is the entrypoint for the storage-groupprovider command.
diff --git a/ocis/pkg/command/storagehome.go b/ocis/pkg/command/storagehome.go
index 43da8a4fa22..9e025b28562 100644
--- a/ocis/pkg/command/storagehome.go
+++ b/ocis/pkg/command/storagehome.go
@@ -1,14 +1,15 @@
+//go:build !simple
 // +build !simple
 
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/storage/pkg/command"
 	svcconfig "github.com/owncloud/ocis/storage/pkg/config"
 	"github.com/owncloud/ocis/storage/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // StorageHomeCommand is the entrypoint for the storage-home command.
diff --git a/ocis/pkg/command/storagemetadata.go b/ocis/pkg/command/storagemetadata.go
index ed47ebace3b..90c56da0077 100644
--- a/ocis/pkg/command/storagemetadata.go
+++ b/ocis/pkg/command/storagemetadata.go
@@ -1,12 +1,12 @@
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/storage/pkg/command"
 	svcconfig "github.com/owncloud/ocis/storage/pkg/config"
 	"github.com/owncloud/ocis/storage/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // StorageMetadataCommand is the entrypoint for the storage-metadata command.
diff --git a/ocis/pkg/command/storagepubliclink.go b/ocis/pkg/command/storagepubliclink.go
index f6bba71d57a..0d94d5afb6c 100644
--- a/ocis/pkg/command/storagepubliclink.go
+++ b/ocis/pkg/command/storagepubliclink.go
@@ -1,14 +1,15 @@
+//go:build !simple
 // +build !simple
 
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/storage/pkg/command"
 	svcconfig "github.com/owncloud/ocis/storage/pkg/config"
 	"github.com/owncloud/ocis/storage/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // StoragePublicLinkCommand is the entrypoint for the reva-storage-oc command.
diff --git a/ocis/pkg/command/storagesharing.go b/ocis/pkg/command/storagesharing.go
index 28a04ff8616..d712f9e9a3d 100644
--- a/ocis/pkg/command/storagesharing.go
+++ b/ocis/pkg/command/storagesharing.go
@@ -1,14 +1,15 @@
+//go:build !simple
 // +build !simple
 
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/storage/pkg/command"
 	svcconfig "github.com/owncloud/ocis/storage/pkg/config"
 	"github.com/owncloud/ocis/storage/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // StorageSharingCommand is the entrypoint for the reva-sharing command.
diff --git a/ocis/pkg/command/storageuserprovider.go b/ocis/pkg/command/storageuserprovider.go
index dcf8c90f1a7..ea701a1c3be 100644
--- a/ocis/pkg/command/storageuserprovider.go
+++ b/ocis/pkg/command/storageuserprovider.go
@@ -1,14 +1,15 @@
+//go:build !simple
 // +build !simple
 
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/storage/pkg/command"
 	svcconfig "github.com/owncloud/ocis/storage/pkg/config"
 	"github.com/owncloud/ocis/storage/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // StorageUserProviderCommand is the entrypoint for the storage-userprovider command.
diff --git a/ocis/pkg/command/storageusers.go b/ocis/pkg/command/storageusers.go
index f26952a0999..80f32e796b9 100644
--- a/ocis/pkg/command/storageusers.go
+++ b/ocis/pkg/command/storageusers.go
@@ -1,14 +1,15 @@
+//go:build !simple
 // +build !simple
 
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/storage/pkg/command"
 	svcconfig "github.com/owncloud/ocis/storage/pkg/config"
 	"github.com/owncloud/ocis/storage/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // StorageUsersCommand is the entrypoint for the storage-users command.
diff --git a/ocis/pkg/command/store.go b/ocis/pkg/command/store.go
index 6a0403eb240..48e7f3c37e4 100644
--- a/ocis/pkg/command/store.go
+++ b/ocis/pkg/command/store.go
@@ -1,15 +1,16 @@
+//go:build !simple
 // +build !simple
 
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/ocis/pkg/version"
 	"github.com/owncloud/ocis/store/pkg/command"
 	svcconfig "github.com/owncloud/ocis/store/pkg/config"
 	"github.com/owncloud/ocis/store/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // StoreCommand is the entrypoint for the ocs command.
diff --git a/ocis/pkg/command/thumbnails.go b/ocis/pkg/command/thumbnails.go
index f071e5cd8c7..c3298af7542 100644
--- a/ocis/pkg/command/thumbnails.go
+++ b/ocis/pkg/command/thumbnails.go
@@ -1,14 +1,15 @@
+//go:build !simple
 // +build !simple
 
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/ocis/pkg/version"
 	"github.com/owncloud/ocis/thumbnails/pkg/command"
 	"github.com/owncloud/ocis/thumbnails/pkg/flagset"
+	"github.com/urfave/cli/v2"
 
 	svcconfig "github.com/owncloud/ocis/thumbnails/pkg/config"
 )
diff --git a/ocis/pkg/command/version.go b/ocis/pkg/command/version.go
index ae5cd2844c3..25eeeba60ab 100644
--- a/ocis/pkg/command/version.go
+++ b/ocis/pkg/command/version.go
@@ -5,11 +5,11 @@ import (
 	"os"
 
 	mreg "github.com/asim/go-micro/v3/registry"
-	"github.com/micro/cli/v2"
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/registry"
 	"github.com/owncloud/ocis/ocis/pkg/register"
+	"github.com/urfave/cli/v2"
 )
 
 // VersionCommand is the entrypoint for the version command.
diff --git a/ocis/pkg/command/web.go b/ocis/pkg/command/web.go
index 199a50d3aae..431443cadaa 100644
--- a/ocis/pkg/command/web.go
+++ b/ocis/pkg/command/web.go
@@ -1,12 +1,12 @@
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/web/pkg/command"
 	svcconfig "github.com/owncloud/ocis/web/pkg/config"
 	"github.com/owncloud/ocis/web/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // WebCommand is the entrypoint for the web command.
diff --git a/ocis/pkg/command/webdav.go b/ocis/pkg/command/webdav.go
index 94a6fadb887..4a9663749b9 100644
--- a/ocis/pkg/command/webdav.go
+++ b/ocis/pkg/command/webdav.go
@@ -1,15 +1,16 @@
+//go:build !simple
 // +build !simple
 
 package command
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis/pkg/register"
 	"github.com/owncloud/ocis/ocis/pkg/version"
 	"github.com/owncloud/ocis/webdav/pkg/command"
 	svcconfig "github.com/owncloud/ocis/webdav/pkg/config"
 	"github.com/owncloud/ocis/webdav/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // WebDAVCommand is the entrypoint for the webdav command.
diff --git a/ocis/pkg/flagset/flagset.go b/ocis/pkg/flagset/flagset.go
index e9dd545349a..9b296758a14 100644
--- a/ocis/pkg/flagset/flagset.go
+++ b/ocis/pkg/flagset/flagset.go
@@ -1,8 +1,8 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // RootWithConfig applies cfg to the root flagset
diff --git a/ocis/pkg/register/command.go b/ocis/pkg/register/command.go
index b0ad28c21cf..87af6b80a35 100644
--- a/ocis/pkg/register/command.go
+++ b/ocis/pkg/register/command.go
@@ -1,8 +1,8 @@
 package register
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 var (
diff --git a/ocis/pkg/runtime/options.go b/ocis/pkg/runtime/options.go
index 2fc4addd508..4c943d2995d 100644
--- a/ocis/pkg/runtime/options.go
+++ b/ocis/pkg/runtime/options.go
@@ -1,8 +1,8 @@
 package runtime
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/urfave/cli/v2"
 )
 
 // Options is a runtime option
diff --git a/ocs/pkg/command/health.go b/ocs/pkg/command/health.go
index 79d866fca38..c84b6d24496 100644
--- a/ocs/pkg/command/health.go
+++ b/ocs/pkg/command/health.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocs/pkg/config"
 	"github.com/owncloud/ocis/ocs/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // Health is the entrypoint for the health command.
diff --git a/ocs/pkg/command/root.go b/ocs/pkg/command/root.go
index ceb2db3b03d..4dcb7a95b2a 100644
--- a/ocs/pkg/command/root.go
+++ b/ocs/pkg/command/root.go
@@ -7,13 +7,13 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 
-	"github.com/micro/cli/v2"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocs/pkg/config"
 	"github.com/owncloud/ocis/ocs/pkg/version"
 	"github.com/spf13/viper"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // Execute is the entry point for the ocis-ocs command.
diff --git a/ocs/pkg/command/server.go b/ocs/pkg/command/server.go
index 18b2d151bfe..344acf49ec2 100644
--- a/ocs/pkg/command/server.go
+++ b/ocs/pkg/command/server.go
@@ -8,13 +8,13 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/ocs/pkg/config"
 	"github.com/owncloud/ocis/ocs/pkg/flagset"
 	"github.com/owncloud/ocis/ocs/pkg/metrics"
 	"github.com/owncloud/ocis/ocs/pkg/server/debug"
 	"github.com/owncloud/ocis/ocs/pkg/server/http"
+	"github.com/urfave/cli/v2"
 )
 
 // Server is the entrypoint for the server command.
diff --git a/ocs/pkg/command/version.go b/ocs/pkg/command/version.go
index 23ef9662927..10c1c17df75 100644
--- a/ocs/pkg/command/version.go
+++ b/ocs/pkg/command/version.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/registry"
 
-	"github.com/micro/cli/v2"
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/owncloud/ocis/ocs/pkg/config"
 	"github.com/owncloud/ocis/ocs/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // PrintVersion prints the service versions of all running instances.
diff --git a/ocs/pkg/flagset/flagset.go b/ocs/pkg/flagset/flagset.go
index de29ac450ee..a7d4c594f5f 100644
--- a/ocs/pkg/flagset/flagset.go
+++ b/ocs/pkg/flagset/flagset.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/ocs/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // HealthWithConfig applies cfg to the root flagset
diff --git a/ocs/pkg/server/http/option.go b/ocs/pkg/server/http/option.go
index fadc9e00d0b..3486588e30a 100644
--- a/ocs/pkg/server/http/option.go
+++ b/ocs/pkg/server/http/option.go
@@ -3,10 +3,10 @@ package http
 import (
 	"context"
 
-	"github.com/micro/cli/v2"
+	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/ocs/pkg/config"
 	"github.com/owncloud/ocis/ocs/pkg/metrics"
-	"github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/urfave/cli/v2"
 )
 
 // Option defines a single option function.
diff --git a/proxy/pkg/command/health.go b/proxy/pkg/command/health.go
index 2c91138643a..4dbe95aa7d7 100644
--- a/proxy/pkg/command/health.go
+++ b/proxy/pkg/command/health.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/proxy/pkg/config"
 	"github.com/owncloud/ocis/proxy/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // Health is the entrypoint for the health command.
diff --git a/proxy/pkg/command/root.go b/proxy/pkg/command/root.go
index 7f7f5fdd5f1..19b433cfc99 100644
--- a/proxy/pkg/command/root.go
+++ b/proxy/pkg/command/root.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 
-	"github.com/micro/cli/v2"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/proxy/pkg/config"
@@ -15,6 +14,7 @@ import (
 	"github.com/owncloud/ocis/proxy/pkg/version"
 	"github.com/spf13/viper"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // Execute is the entry point for the ocis-proxy command.
diff --git a/proxy/pkg/command/server.go b/proxy/pkg/command/server.go
index 678acb2fd94..f8230caab88 100644
--- a/proxy/pkg/command/server.go
+++ b/proxy/pkg/command/server.go
@@ -12,7 +12,6 @@ import (
 	"github.com/cs3org/reva/pkg/token/manager/jwt"
 	chimiddleware "github.com/go-chi/chi/v5/middleware"
 	"github.com/justinas/alice"
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	acc "github.com/owncloud/ocis/accounts/pkg/proto/v0"
 	"github.com/owncloud/ocis/ocis-pkg/conversions"
@@ -32,6 +31,7 @@ import (
 	"github.com/owncloud/ocis/proxy/pkg/user/backend"
 	settings "github.com/owncloud/ocis/settings/pkg/proto/v0"
 	storepb "github.com/owncloud/ocis/store/pkg/proto/v0"
+	"github.com/urfave/cli/v2"
 	"golang.org/x/oauth2"
 )
 
diff --git a/proxy/pkg/command/version.go b/proxy/pkg/command/version.go
index e76dcc6a965..273db559cc9 100644
--- a/proxy/pkg/command/version.go
+++ b/proxy/pkg/command/version.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/registry"
 
-	"github.com/micro/cli/v2"
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/owncloud/ocis/proxy/pkg/config"
 	"github.com/owncloud/ocis/proxy/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // PrintVersion prints the service versions of all running instances.
diff --git a/proxy/pkg/flagset/flagset.go b/proxy/pkg/flagset/flagset.go
index 32120dd3318..b83a5a9d7f1 100644
--- a/proxy/pkg/flagset/flagset.go
+++ b/proxy/pkg/flagset/flagset.go
@@ -3,10 +3,10 @@ package flagset
 import (
 	"path"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	pkgos "github.com/owncloud/ocis/ocis-pkg/os"
 	"github.com/owncloud/ocis/proxy/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // RootWithConfig applies cfg to the root flagset
diff --git a/proxy/pkg/server/http/option.go b/proxy/pkg/server/http/option.go
index 61fb8b40bad..bad0956ff6f 100644
--- a/proxy/pkg/server/http/option.go
+++ b/proxy/pkg/server/http/option.go
@@ -5,10 +5,10 @@ import (
 	"net/http"
 
 	"github.com/justinas/alice"
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/proxy/pkg/config"
 	"github.com/owncloud/ocis/proxy/pkg/metrics"
+	"github.com/urfave/cli/v2"
 )
 
 // Option defines a single option function.
diff --git a/settings/pkg/command/health.go b/settings/pkg/command/health.go
index e4073e2458e..72e9ea7f7db 100644
--- a/settings/pkg/command/health.go
+++ b/settings/pkg/command/health.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/settings/pkg/config"
 	"github.com/owncloud/ocis/settings/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // Health is the entrypoint for the health command.
diff --git a/settings/pkg/command/root.go b/settings/pkg/command/root.go
index e369d832e76..242a841a19c 100644
--- a/settings/pkg/command/root.go
+++ b/settings/pkg/command/root.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 
-	"github.com/micro/cli/v2"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/settings/pkg/config"
@@ -15,6 +14,7 @@ import (
 	"github.com/owncloud/ocis/settings/pkg/version"
 	"github.com/spf13/viper"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // Execute is the entry point for the ocis-settings command.
diff --git a/settings/pkg/command/server.go b/settings/pkg/command/server.go
index 2336de23dc9..3609762b3eb 100644
--- a/settings/pkg/command/server.go
+++ b/settings/pkg/command/server.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"strings"
 
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 	"github.com/owncloud/ocis/settings/pkg/config"
@@ -14,6 +13,7 @@ import (
 	"github.com/owncloud/ocis/settings/pkg/server/grpc"
 	"github.com/owncloud/ocis/settings/pkg/server/http"
 	"github.com/owncloud/ocis/settings/pkg/tracing"
+	"github.com/urfave/cli/v2"
 )
 
 // Server is the entrypoint for the server command.
diff --git a/settings/pkg/command/version.go b/settings/pkg/command/version.go
index 81df847f1c5..fda866b626b 100644
--- a/settings/pkg/command/version.go
+++ b/settings/pkg/command/version.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/registry"
 
-	"github.com/micro/cli/v2"
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/owncloud/ocis/settings/pkg/config"
 	"github.com/owncloud/ocis/settings/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // PrintVersion prints the service versions of all running instances.
diff --git a/settings/pkg/flagset/flagset.go b/settings/pkg/flagset/flagset.go
index 5c6ca32f609..185c5c0a510 100644
--- a/settings/pkg/flagset/flagset.go
+++ b/settings/pkg/flagset/flagset.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/settings/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // RootWithConfig applies cfg to the root flagset
diff --git a/settings/pkg/server/grpc/option.go b/settings/pkg/server/grpc/option.go
index 119e64f3004..5bea3ef47eb 100644
--- a/settings/pkg/server/grpc/option.go
+++ b/settings/pkg/server/grpc/option.go
@@ -3,10 +3,10 @@ package grpc
 import (
 	"context"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/settings/pkg/config"
 	"github.com/owncloud/ocis/settings/pkg/metrics"
+	"github.com/urfave/cli/v2"
 )
 
 // Option defines a single option function.
diff --git a/settings/pkg/server/http/option.go b/settings/pkg/server/http/option.go
index 980e1a1fe40..6f6d2bc3bdd 100644
--- a/settings/pkg/server/http/option.go
+++ b/settings/pkg/server/http/option.go
@@ -3,10 +3,10 @@ package http
 import (
 	"context"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/settings/pkg/config"
 	"github.com/owncloud/ocis/settings/pkg/metrics"
+	"github.com/urfave/cli/v2"
 )
 
 // Option defines a single option function.
diff --git a/storage/pkg/command/appprovider.go b/storage/pkg/command/appprovider.go
index b45e4a39f4d..95b032b541a 100644
--- a/storage/pkg/command/appprovider.go
+++ b/storage/pkg/command/appprovider.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
@@ -17,6 +16,7 @@ import (
 	"github.com/owncloud/ocis/storage/pkg/server/debug"
 	"github.com/owncloud/ocis/storage/pkg/tracing"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // AppProvider is the entrypoint for the app provider command.
diff --git a/storage/pkg/command/authbasic.go b/storage/pkg/command/authbasic.go
index 7b1bd96b97c..ec37e9971a5 100644
--- a/storage/pkg/command/authbasic.go
+++ b/storage/pkg/command/authbasic.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
@@ -18,6 +17,7 @@ import (
 	"github.com/owncloud/ocis/storage/pkg/server/debug"
 	"github.com/owncloud/ocis/storage/pkg/tracing"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // AuthBasic is the entrypoint for the auth-basic command.
diff --git a/storage/pkg/command/authbearer.go b/storage/pkg/command/authbearer.go
index 31db3e83bbf..4c5b49f734a 100644
--- a/storage/pkg/command/authbearer.go
+++ b/storage/pkg/command/authbearer.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
@@ -17,6 +16,7 @@ import (
 	"github.com/owncloud/ocis/storage/pkg/server/debug"
 	"github.com/owncloud/ocis/storage/pkg/tracing"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // AuthBearer is the entrypoint for the auth-bearer command.
diff --git a/storage/pkg/command/frontend.go b/storage/pkg/command/frontend.go
index 680aee6d7e4..ec60c372fce 100644
--- a/storage/pkg/command/frontend.go
+++ b/storage/pkg/command/frontend.go
@@ -11,7 +11,6 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/conversions"
@@ -21,6 +20,7 @@ import (
 	"github.com/owncloud/ocis/storage/pkg/server/debug"
 	"github.com/owncloud/ocis/storage/pkg/tracing"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // Frontend is the entrypoint for the frontend command.
diff --git a/storage/pkg/command/gateway.go b/storage/pkg/command/gateway.go
index 37b7dcdaad0..a7afaa03182 100644
--- a/storage/pkg/command/gateway.go
+++ b/storage/pkg/command/gateway.go
@@ -15,7 +15,6 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
@@ -24,6 +23,7 @@ import (
 	"github.com/owncloud/ocis/storage/pkg/server/debug"
 	"github.com/owncloud/ocis/storage/pkg/service/external"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // Gateway is the entrypoint for the gateway command.
diff --git a/storage/pkg/command/groups.go b/storage/pkg/command/groups.go
index 0c11d3d18a8..8cbe3d33913 100644
--- a/storage/pkg/command/groups.go
+++ b/storage/pkg/command/groups.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
@@ -18,6 +17,7 @@ import (
 	"github.com/owncloud/ocis/storage/pkg/server/debug"
 	"github.com/owncloud/ocis/storage/pkg/tracing"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // Groups is the entrypoint for the sharing command.
diff --git a/storage/pkg/command/health.go b/storage/pkg/command/health.go
index d05bff4863e..9398b3ba030 100644
--- a/storage/pkg/command/health.go
+++ b/storage/pkg/command/health.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/storage/pkg/config"
 	"github.com/owncloud/ocis/storage/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // Health is the entrypoint for the health command.
diff --git a/storage/pkg/command/root.go b/storage/pkg/command/root.go
index 1c99f2aad0d..23fc4835be4 100644
--- a/storage/pkg/command/root.go
+++ b/storage/pkg/command/root.go
@@ -4,12 +4,12 @@ import (
 	"os"
 	"strings"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/storage/pkg/config"
 	"github.com/owncloud/ocis/storage/pkg/flagset"
 	"github.com/owncloud/ocis/storage/pkg/version"
 	"github.com/spf13/viper"
+	"github.com/urfave/cli/v2"
 )
 
 // Execute is the entry point for the storage command.
diff --git a/storage/pkg/command/sharing.go b/storage/pkg/command/sharing.go
index c3e3001a503..3dad197d587 100644
--- a/storage/pkg/command/sharing.go
+++ b/storage/pkg/command/sharing.go
@@ -13,13 +13,13 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/storage/pkg/config"
 	"github.com/owncloud/ocis/storage/pkg/flagset"
 	"github.com/owncloud/ocis/storage/pkg/server/debug"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // Sharing is the entrypoint for the sharing command.
diff --git a/storage/pkg/command/storagehome.go b/storage/pkg/command/storagehome.go
index ccc80bd326e..6ae5d362585 100644
--- a/storage/pkg/command/storagehome.go
+++ b/storage/pkg/command/storagehome.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/storage/pkg/config"
@@ -18,6 +17,7 @@ import (
 	"github.com/owncloud/ocis/storage/pkg/server/debug"
 	"github.com/owncloud/ocis/storage/pkg/tracing"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // StorageHome is the entrypoint for the storage-home command.
diff --git a/storage/pkg/command/storagemetadata.go b/storage/pkg/command/storagemetadata.go
index e6d0e331bfa..d11a5f84c54 100644
--- a/storage/pkg/command/storagemetadata.go
+++ b/storage/pkg/command/storagemetadata.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/storage/pkg/config"
@@ -19,6 +18,7 @@ import (
 	"github.com/owncloud/ocis/storage/pkg/service/external"
 	"github.com/owncloud/ocis/storage/pkg/tracing"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // StorageMetadata the entrypoint for the storage-storage-metadata command.
diff --git a/storage/pkg/command/storagepubliclink.go b/storage/pkg/command/storagepubliclink.go
index 87ca7e3ffd3..6c47b5eeb63 100644
--- a/storage/pkg/command/storagepubliclink.go
+++ b/storage/pkg/command/storagepubliclink.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
@@ -17,6 +16,7 @@ import (
 	"github.com/owncloud/ocis/storage/pkg/server/debug"
 	"github.com/owncloud/ocis/storage/pkg/tracing"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // StoragePublicLink is the entrypoint for the reva-storage-public-link command.
diff --git a/storage/pkg/command/storageusers.go b/storage/pkg/command/storageusers.go
index 168bc0c7f56..2585c071fbe 100644
--- a/storage/pkg/command/storageusers.go
+++ b/storage/pkg/command/storageusers.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
@@ -17,6 +16,7 @@ import (
 	"github.com/owncloud/ocis/storage/pkg/server/debug"
 	"github.com/owncloud/ocis/storage/pkg/tracing"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // StorageUsers is the entrypoint for the storage-users command.
diff --git a/storage/pkg/command/users.go b/storage/pkg/command/users.go
index 24ef2b57369..795dc7f0639 100644
--- a/storage/pkg/command/users.go
+++ b/storage/pkg/command/users.go
@@ -9,7 +9,6 @@ import (
 
 	"github.com/cs3org/reva/cmd/revad/runtime"
 	"github.com/gofrs/uuid"
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
@@ -18,6 +17,7 @@ import (
 	"github.com/owncloud/ocis/storage/pkg/server/debug"
 	"github.com/owncloud/ocis/storage/pkg/tracing"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // Users is the entrypoint for the sharing command.
diff --git a/storage/pkg/flagset/appprovider.go b/storage/pkg/flagset/appprovider.go
index 1a8b6e694eb..48d358b5809 100644
--- a/storage/pkg/flagset/appprovider.go
+++ b/storage/pkg/flagset/appprovider.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // AppProviderWithConfig applies cfg to the root flagset
diff --git a/storage/pkg/flagset/authbasic.go b/storage/pkg/flagset/authbasic.go
index 4f5ae182b83..5a5d815eeb9 100644
--- a/storage/pkg/flagset/authbasic.go
+++ b/storage/pkg/flagset/authbasic.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // AuthBasicWithConfig applies cfg to the root flagset
diff --git a/storage/pkg/flagset/authbearer.go b/storage/pkg/flagset/authbearer.go
index fc5a66e6bc5..4c1fa1bca16 100644
--- a/storage/pkg/flagset/authbearer.go
+++ b/storage/pkg/flagset/authbearer.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // AuthBearerWithConfig applies cfg to the root flagset
diff --git a/storage/pkg/flagset/debug.go b/storage/pkg/flagset/debug.go
index ce55ee3babf..4273f088658 100644
--- a/storage/pkg/flagset/debug.go
+++ b/storage/pkg/flagset/debug.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // DebugWithConfig applies common debug config cfg to the flagset
diff --git a/storage/pkg/flagset/drivereos.go b/storage/pkg/flagset/drivereos.go
index 416a433ee0b..541d15eb8cc 100644
--- a/storage/pkg/flagset/drivereos.go
+++ b/storage/pkg/flagset/drivereos.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // DriverEOSWithConfig applies cfg to the root flagset
diff --git a/storage/pkg/flagset/driverlocal.go b/storage/pkg/flagset/driverlocal.go
index 256d117e9c8..6355fcc719c 100644
--- a/storage/pkg/flagset/driverlocal.go
+++ b/storage/pkg/flagset/driverlocal.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // DriverLocalWithConfig applies cfg to the root flagset
diff --git a/storage/pkg/flagset/driverocis.go b/storage/pkg/flagset/driverocis.go
index 75f80caaaea..08e067cbfbb 100644
--- a/storage/pkg/flagset/driverocis.go
+++ b/storage/pkg/flagset/driverocis.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // DriverOCISWithConfig applies cfg to the root flagset
diff --git a/storage/pkg/flagset/driverowncloud.go b/storage/pkg/flagset/driverowncloud.go
index 65dfd183ece..20c0071f1d1 100644
--- a/storage/pkg/flagset/driverowncloud.go
+++ b/storage/pkg/flagset/driverowncloud.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // DriverOwnCloudWithConfig applies cfg to the root flagset
diff --git a/storage/pkg/flagset/driverowncloudsql.go b/storage/pkg/flagset/driverowncloudsql.go
index ca974a46cf3..ed42d2df7d6 100644
--- a/storage/pkg/flagset/driverowncloudsql.go
+++ b/storage/pkg/flagset/driverowncloudsql.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // DriverOwnCloudSQLWithConfig applies cfg to the root flagset
diff --git a/storage/pkg/flagset/drivers3ng.go b/storage/pkg/flagset/drivers3ng.go
index b755ac28ead..fb1b6e924ae 100644
--- a/storage/pkg/flagset/drivers3ng.go
+++ b/storage/pkg/flagset/drivers3ng.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // DriverS3NGWithConfig applies cfg to the root flagset
diff --git a/storage/pkg/flagset/frontend.go b/storage/pkg/flagset/frontend.go
index 93212bc9bf4..faa944b123d 100644
--- a/storage/pkg/flagset/frontend.go
+++ b/storage/pkg/flagset/frontend.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // FrontendWithConfig applies cfg to the root flagset
diff --git a/storage/pkg/flagset/gateway.go b/storage/pkg/flagset/gateway.go
index ba0585996b7..9b5ef80cf58 100644
--- a/storage/pkg/flagset/gateway.go
+++ b/storage/pkg/flagset/gateway.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // GatewayWithConfig applies cfg to the root flagset
diff --git a/storage/pkg/flagset/groups.go b/storage/pkg/flagset/groups.go
index cde28102065..2ab099ed047 100644
--- a/storage/pkg/flagset/groups.go
+++ b/storage/pkg/flagset/groups.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // GroupsWithConfig applies cfg to the root flagset
diff --git a/storage/pkg/flagset/health.go b/storage/pkg/flagset/health.go
index b3ed0a40792..60d673c07bb 100644
--- a/storage/pkg/flagset/health.go
+++ b/storage/pkg/flagset/health.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // HealthWithConfig applies cfg to the health flagset
diff --git a/storage/pkg/flagset/ldap.go b/storage/pkg/flagset/ldap.go
index cea3c2bddba..851235668f4 100644
--- a/storage/pkg/flagset/ldap.go
+++ b/storage/pkg/flagset/ldap.go
@@ -3,10 +3,10 @@ package flagset
 import (
 	"path"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	pkgos "github.com/owncloud/ocis/ocis-pkg/os"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // LDAPWithConfig applies LDAP cfg to the flagset
diff --git a/storage/pkg/flagset/rest.go b/storage/pkg/flagset/rest.go
index 34980637e2c..1755b0e0f2a 100644
--- a/storage/pkg/flagset/rest.go
+++ b/storage/pkg/flagset/rest.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // RestWithConfig applies REST user/group provider cfg to the flagset
diff --git a/storage/pkg/flagset/root.go b/storage/pkg/flagset/root.go
index c2aaa30239e..dce2fc58184 100644
--- a/storage/pkg/flagset/root.go
+++ b/storage/pkg/flagset/root.go
@@ -1,8 +1,8 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // RootWithConfig applies cfg to the root flagset
diff --git a/storage/pkg/flagset/secret.go b/storage/pkg/flagset/secret.go
index cfb60555fc5..2519caa61a3 100644
--- a/storage/pkg/flagset/secret.go
+++ b/storage/pkg/flagset/secret.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // SecretWithConfig applies cfg to the root flagset
diff --git a/storage/pkg/flagset/sharing.go b/storage/pkg/flagset/sharing.go
index b9a1d989e09..866910054bc 100644
--- a/storage/pkg/flagset/sharing.go
+++ b/storage/pkg/flagset/sharing.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // SharingWithConfig applies cfg to the root flagset
diff --git a/storage/pkg/flagset/sharingsql.go b/storage/pkg/flagset/sharingsql.go
index 5851c0bdfa5..b152380fa77 100644
--- a/storage/pkg/flagset/sharingsql.go
+++ b/storage/pkg/flagset/sharingsql.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // SharingSQLWithConfig applies the Sharing SQL driver cfg to the flagset
diff --git a/storage/pkg/flagset/storagehome.go b/storage/pkg/flagset/storagehome.go
index 9a23198fcaf..311af564cb7 100644
--- a/storage/pkg/flagset/storagehome.go
+++ b/storage/pkg/flagset/storagehome.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // StorageHomeWithConfig applies cfg to the root flagset
diff --git a/storage/pkg/flagset/storagemetadata.go b/storage/pkg/flagset/storagemetadata.go
index 581f7f1f32f..17e5dfbd58b 100644
--- a/storage/pkg/flagset/storagemetadata.go
+++ b/storage/pkg/flagset/storagemetadata.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // StorageMetadata applies cfg to the root flagset
diff --git a/storage/pkg/flagset/storagepubliclink.go b/storage/pkg/flagset/storagepubliclink.go
index eefc636a3ad..613fa15ec6d 100644
--- a/storage/pkg/flagset/storagepubliclink.go
+++ b/storage/pkg/flagset/storagepubliclink.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // StoragePublicLink applies cfg to the root flagset
diff --git a/storage/pkg/flagset/storageusers.go b/storage/pkg/flagset/storageusers.go
index 1b935cba3b7..d66bea3ae50 100644
--- a/storage/pkg/flagset/storageusers.go
+++ b/storage/pkg/flagset/storageusers.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // StorageUsersWithConfig applies cfg to the root flagset
diff --git a/storage/pkg/flagset/tracing.go b/storage/pkg/flagset/tracing.go
index e0bc2e0e75c..67c7eb0baeb 100644
--- a/storage/pkg/flagset/tracing.go
+++ b/storage/pkg/flagset/tracing.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // TracingWithConfig applies cfg to the root flagset
diff --git a/storage/pkg/flagset/users.go b/storage/pkg/flagset/users.go
index f74796dbda0..fb8e10cebb9 100644
--- a/storage/pkg/flagset/users.go
+++ b/storage/pkg/flagset/users.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // UsersWithConfig applies cfg to the root flagset
diff --git a/store/pkg/command/health.go b/store/pkg/command/health.go
index 9dd90b43605..5768b00ecbb 100644
--- a/store/pkg/command/health.go
+++ b/store/pkg/command/health.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/store/pkg/config"
 	"github.com/owncloud/ocis/store/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // Health is the entrypoint for the health command.
diff --git a/store/pkg/command/root.go b/store/pkg/command/root.go
index 17fc954c08b..ea47a2ac68c 100644
--- a/store/pkg/command/root.go
+++ b/store/pkg/command/root.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 
-	"github.com/micro/cli/v2"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/store/pkg/config"
@@ -15,6 +14,7 @@ import (
 	"github.com/owncloud/ocis/store/pkg/version"
 	"github.com/spf13/viper"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // Execute is the entry point for the ocis-store command.
diff --git a/store/pkg/command/server.go b/store/pkg/command/server.go
index a6ab0704c57..1fec4e195ef 100644
--- a/store/pkg/command/server.go
+++ b/store/pkg/command/server.go
@@ -7,13 +7,13 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/store/pkg/config"
 	"github.com/owncloud/ocis/store/pkg/flagset"
 	"github.com/owncloud/ocis/store/pkg/metrics"
 	"github.com/owncloud/ocis/store/pkg/server/debug"
 	"github.com/owncloud/ocis/store/pkg/server/grpc"
+	"github.com/urfave/cli/v2"
 )
 
 // Server is the entrypoint for the server command.
diff --git a/store/pkg/command/version.go b/store/pkg/command/version.go
index 8e89bc107e8..22b9997bbaf 100644
--- a/store/pkg/command/version.go
+++ b/store/pkg/command/version.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/registry"
 
-	"github.com/micro/cli/v2"
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/owncloud/ocis/store/pkg/config"
 	"github.com/owncloud/ocis/store/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // PrintVersion prints the service versions of all running instances.
diff --git a/store/pkg/flagset/flagset.go b/store/pkg/flagset/flagset.go
index 5175339964b..330121fd3fb 100644
--- a/store/pkg/flagset/flagset.go
+++ b/store/pkg/flagset/flagset.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/store/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // RootWithConfig applies cfg to the root flagset
diff --git a/store/pkg/server/grpc/option.go b/store/pkg/server/grpc/option.go
index 8b3b4bc9c0f..389c2918b3f 100644
--- a/store/pkg/server/grpc/option.go
+++ b/store/pkg/server/grpc/option.go
@@ -3,10 +3,10 @@ package grpc
 import (
 	"context"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/store/pkg/config"
 	"github.com/owncloud/ocis/store/pkg/metrics"
+	"github.com/urfave/cli/v2"
 )
 
 // Option defines a single option function.
diff --git a/thumbnails/pkg/command/health.go b/thumbnails/pkg/command/health.go
index c1d6796bd42..babd7d20aab 100644
--- a/thumbnails/pkg/command/health.go
+++ b/thumbnails/pkg/command/health.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/thumbnails/pkg/config"
 	"github.com/owncloud/ocis/thumbnails/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // Health is the entrypoint for the health command.
diff --git a/thumbnails/pkg/command/root.go b/thumbnails/pkg/command/root.go
index b1e04ec788c..a53a28e5a7d 100644
--- a/thumbnails/pkg/command/root.go
+++ b/thumbnails/pkg/command/root.go
@@ -7,13 +7,13 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 
-	"github.com/micro/cli/v2"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/thumbnails/pkg/config"
 	"github.com/owncloud/ocis/thumbnails/pkg/version"
 	"github.com/spf13/viper"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // Execute is the entry point for the ocis-thumbnails command.
diff --git a/thumbnails/pkg/command/server.go b/thumbnails/pkg/command/server.go
index eeeb61d09ea..43547f681f7 100644
--- a/thumbnails/pkg/command/server.go
+++ b/thumbnails/pkg/command/server.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 	"github.com/owncloud/ocis/thumbnails/pkg/config"
@@ -13,6 +12,7 @@ import (
 	"github.com/owncloud/ocis/thumbnails/pkg/server/debug"
 	"github.com/owncloud/ocis/thumbnails/pkg/server/grpc"
 	"github.com/owncloud/ocis/thumbnails/pkg/tracing"
+	"github.com/urfave/cli/v2"
 )
 
 // Server is the entrypoint for the server command.
diff --git a/thumbnails/pkg/command/version.go b/thumbnails/pkg/command/version.go
index 16a7bbf86f7..9a861db9720 100644
--- a/thumbnails/pkg/command/version.go
+++ b/thumbnails/pkg/command/version.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/registry"
 
-	"github.com/micro/cli/v2"
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/owncloud/ocis/thumbnails/pkg/config"
 	"github.com/owncloud/ocis/thumbnails/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // PrintVersion prints the service versions of all running instances.
diff --git a/thumbnails/pkg/flagset/flagset.go b/thumbnails/pkg/flagset/flagset.go
index 564a5b0efd6..de61db3d9c6 100644
--- a/thumbnails/pkg/flagset/flagset.go
+++ b/thumbnails/pkg/flagset/flagset.go
@@ -3,8 +3,8 @@ package flagset
 import (
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/thumbnails/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // HealthWithConfig applies cfg to the root flagset
diff --git a/thumbnails/pkg/server/grpc/option.go b/thumbnails/pkg/server/grpc/option.go
index d7fd774e34f..aa14ccbde50 100644
--- a/thumbnails/pkg/server/grpc/option.go
+++ b/thumbnails/pkg/server/grpc/option.go
@@ -3,10 +3,10 @@ package grpc
 import (
 	"context"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/thumbnails/pkg/config"
 	"github.com/owncloud/ocis/thumbnails/pkg/metrics"
+	"github.com/urfave/cli/v2"
 )
 
 // Option defines a single option function.
diff --git a/web/pkg/command/health.go b/web/pkg/command/health.go
index a7cc87d331e..4719442e309 100644
--- a/web/pkg/command/health.go
+++ b/web/pkg/command/health.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/web/pkg/config"
 	"github.com/owncloud/ocis/web/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // Health is the entrypoint for the health command.
diff --git a/web/pkg/command/root.go b/web/pkg/command/root.go
index 74348e62d7b..d1d3cd83a76 100644
--- a/web/pkg/command/root.go
+++ b/web/pkg/command/root.go
@@ -7,13 +7,13 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 
-	"github.com/micro/cli/v2"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/web/pkg/config"
 	"github.com/owncloud/ocis/web/pkg/version"
 	"github.com/spf13/viper"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // Execute is the entry point for the web command.
diff --git a/web/pkg/command/server.go b/web/pkg/command/server.go
index 578a1457738..f2fc4ee4578 100644
--- a/web/pkg/command/server.go
+++ b/web/pkg/command/server.go
@@ -6,7 +6,6 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 	"github.com/owncloud/ocis/web/pkg/config"
@@ -15,6 +14,7 @@ import (
 	"github.com/owncloud/ocis/web/pkg/server/debug"
 	"github.com/owncloud/ocis/web/pkg/server/http"
 	"github.com/owncloud/ocis/web/pkg/tracing"
+	"github.com/urfave/cli/v2"
 )
 
 // Server is the entrypoint for the server command.
diff --git a/web/pkg/flagset/flagset.go b/web/pkg/flagset/flagset.go
index b708bb5b555..90e6a1dc3b9 100644
--- a/web/pkg/flagset/flagset.go
+++ b/web/pkg/flagset/flagset.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/web/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // RootWithConfig applies cfg to the root flagset
diff --git a/web/pkg/server/http/option.go b/web/pkg/server/http/option.go
index 30a824ff93c..5d77b6cea6a 100644
--- a/web/pkg/server/http/option.go
+++ b/web/pkg/server/http/option.go
@@ -3,10 +3,10 @@ package http
 import (
 	"context"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/web/pkg/config"
 	"github.com/owncloud/ocis/web/pkg/metrics"
+	"github.com/urfave/cli/v2"
 )
 
 // Option defines a single option function.
diff --git a/webdav/pkg/command/health.go b/webdav/pkg/command/health.go
index 617719c2078..42aa7964c3c 100644
--- a/webdav/pkg/command/health.go
+++ b/webdav/pkg/command/health.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/webdav/pkg/config"
 	"github.com/owncloud/ocis/webdav/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // Health is the entrypoint for the health command.
diff --git a/webdav/pkg/command/root.go b/webdav/pkg/command/root.go
index bbceaba92b5..e5ca8ea5190 100644
--- a/webdav/pkg/command/root.go
+++ b/webdav/pkg/command/root.go
@@ -7,13 +7,13 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 
-	"github.com/micro/cli/v2"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/webdav/pkg/config"
 	"github.com/owncloud/ocis/webdav/pkg/version"
 	"github.com/spf13/viper"
 	"github.com/thejerf/suture/v4"
+	"github.com/urfave/cli/v2"
 )
 
 // Execute is the entry point for the ocis-webdav command.
diff --git a/webdav/pkg/command/server.go b/webdav/pkg/command/server.go
index 968e63428e9..3541ad4a53b 100644
--- a/webdav/pkg/command/server.go
+++ b/webdav/pkg/command/server.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"strings"
 
-	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
 	"github.com/owncloud/ocis/ocis-pkg/sync"
 	"github.com/owncloud/ocis/webdav/pkg/config"
@@ -13,6 +12,7 @@ import (
 	"github.com/owncloud/ocis/webdav/pkg/server/debug"
 	"github.com/owncloud/ocis/webdav/pkg/server/http"
 	"github.com/owncloud/ocis/webdav/pkg/tracing"
+	"github.com/urfave/cli/v2"
 )
 
 // Server is the entrypoint for the server command.
diff --git a/webdav/pkg/command/version.go b/webdav/pkg/command/version.go
index d60735d60e1..03ef51278d6 100644
--- a/webdav/pkg/command/version.go
+++ b/webdav/pkg/command/version.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/owncloud/ocis/ocis-pkg/registry"
 
-	"github.com/micro/cli/v2"
 	tw "github.com/olekukonko/tablewriter"
 	"github.com/owncloud/ocis/webdav/pkg/config"
 	"github.com/owncloud/ocis/webdav/pkg/flagset"
+	"github.com/urfave/cli/v2"
 )
 
 // PrintVersion prints the service versions of all running instances.
diff --git a/webdav/pkg/flagset/flagset.go b/webdav/pkg/flagset/flagset.go
index 1e133537ebc..706e78669a5 100644
--- a/webdav/pkg/flagset/flagset.go
+++ b/webdav/pkg/flagset/flagset.go
@@ -1,9 +1,9 @@
 package flagset
 
 import (
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/flags"
 	"github.com/owncloud/ocis/webdav/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 // HealthWithConfig applies cfg to the root flagset
diff --git a/webdav/pkg/server/http/option.go b/webdav/pkg/server/http/option.go
index 50c4306c29b..f18d3faf028 100644
--- a/webdav/pkg/server/http/option.go
+++ b/webdav/pkg/server/http/option.go
@@ -3,10 +3,10 @@ package http
 import (
 	"context"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/owncloud/ocis/webdav/pkg/config"
 	"github.com/owncloud/ocis/webdav/pkg/metrics"
+	"github.com/urfave/cli/v2"
 )
 
 // Option defines a single option function.


Test patch:
diff --git a/ocis-pkg/indexer/test/test.go b/ocis-pkg/indexer/test/test.go
index 36b846fe881..7b69f7eaadf 100644
--- a/ocis-pkg/indexer/test/test.go
+++ b/ocis-pkg/indexer/test/test.go
@@ -6,9 +6,9 @@ import (
 	"net"
 	"time"
 
-	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis/storage/pkg/command"
 	mcfg "github.com/owncloud/ocis/storage/pkg/config"
+	"github.com/urfave/cli/v2"
 )
 
 func init() {