diff --git a/.drone.star b/.drone.star
index 829fa4d78..749fa26ae 100644
--- a/.drone.star
+++ b/.drone.star
@@ -5,6 +5,7 @@ def main(ctx):
 
   stages = [
     docker(ctx, 'amd64'),
+    docker(ctx, 'arm64'),
     docker(ctx, 'arm'),
     binary(ctx, 'linux'),
     binary(ctx, 'darwin'),
@@ -457,6 +458,7 @@ def manifest(ctx):
     ],
     'depends_on': [
       'amd64',
+      'arm64',
       'arm',
       'linux',
       'darwin',
diff --git a/pkg/command/server.go b/pkg/command/server.go
index 00ff105d3..176fa5d9e 100644
--- a/pkg/command/server.go
+++ b/pkg/command/server.go
@@ -157,8 +157,6 @@ func Server(cfg *config.Config) *cli.Command {
 					grpc.Logger(logger),
 					grpc.Context(ctx),
 					grpc.Config(cfg),
-					grpc.Flags(flagset.RootWithConfig(cfg)),
-					grpc.Flags(flagset.ServerWithConfig(cfg)),
 				)
 
 				gr.Add(server.Run, func(_ error) {