diff --git a/pkg/command/graph.go b/pkg/command/graph.go
index 60ad156579..a98bd668aa 100644
--- a/pkg/command/graph.go
+++ b/pkg/command/graph.go
@@ -1,3 +1,5 @@
+// +build !simple
+
 package command
 
 import (
diff --git a/pkg/command/ocs.go b/pkg/command/ocs.go
index 1ee0e99d73..c524b5f079 100644
--- a/pkg/command/ocs.go
+++ b/pkg/command/ocs.go
@@ -1,3 +1,5 @@
+// +build !simple
+
 package command
 
 import (
diff --git a/pkg/command/reva.go b/pkg/command/reva.go
index 5c702a052b..18520503df 100644
--- a/pkg/command/reva.go
+++ b/pkg/command/reva.go
@@ -1,3 +1,5 @@
+// +build !simple
+
 package command
 
 import (
diff --git a/pkg/command/server.go b/pkg/command/server.go
index 81ea8499c6..b5c0790e81 100644
--- a/pkg/command/server.go
+++ b/pkg/command/server.go
@@ -1,3 +1,5 @@
+// +build !simple
+
 package command
 
 import (
@@ -14,6 +16,7 @@ import (
 	"github.com/owncloud/ocis/pkg/config"
 	"github.com/owncloud/ocis/pkg/flagset"
 	"github.com/owncloud/ocis/pkg/micro/runtime"
+	"github.com/owncloud/ocis/pkg/register"
 	"go.opencensus.io/stats/view"
 	"go.opencensus.io/trace"
 )
@@ -135,3 +138,7 @@ func Server(cfg *config.Config) cli.Command {
 		},
 	}
 }
+
+func init() {
+	register.AddCommand(Server)
+}
diff --git a/pkg/command/webdav.go b/pkg/command/webdav.go
index 5648abb67e..eca52b3d9b 100644
--- a/pkg/command/webdav.go
+++ b/pkg/command/webdav.go
@@ -1,3 +1,5 @@
+// +build !simple
+
 package command
 
 import (