diff --git a/compose/autosetup.go b/compose/autosetup.go
new file mode 100644
index 000000000..94d2ccf46
--- /dev/null
+++ b/compose/autosetup.go
@@ -0,0 +1,17 @@
+package compose
+
+import (
+	"context"
+
+	"github.com/spf13/cobra"
+
+	"github.com/cortezaproject/corteza-server/compose/internal/service"
+	"github.com/cortezaproject/corteza-server/pkg/cli"
+)
+
+func accessControlSetup(ctx context.Context, cmd *cobra.Command, c *cli.Config) error {
+	// Calling grant directly on internal permissions service to avoid AC check for "grant"
+	var p = service.DefaultPermissions
+	var ac = service.DefaultAccessControl
+	return p.Grant(ctx, ac.Whitelist(), ac.DefaultRules()...)
+}
diff --git a/compose/compose.go b/compose/compose.go
index aee3d1d87..00943984f 100644
--- a/compose/compose.go
+++ b/compose/compose.go
@@ -19,15 +19,6 @@ const (
 )
 
 func Configure() *cli.Config {
-	var (
-		accessControlSetup = func(ctx context.Context, cmd *cobra.Command, c *cli.Config) error {
-			// Calling grant directly on internal permissions service to avoid AC check for "grant"
-			var p = service.DefaultPermissions
-			var ac = service.DefaultAccessControl
-			return p.Grant(ctx, ac.Whitelist(), ac.DefaultRules()...)
-		}
-	)
-
 	return &cli.Config{
 		ServiceName: compose,
 
diff --git a/system/autosetup.go b/system/autosetup.go
new file mode 100644
index 000000000..7aceaa76b
--- /dev/null
+++ b/system/autosetup.go
@@ -0,0 +1,17 @@
+package system
+
+import (
+	"context"
+
+	"github.com/spf13/cobra"
+
+	"github.com/cortezaproject/corteza-server/pkg/cli"
+	"github.com/cortezaproject/corteza-server/system/internal/service"
+)
+
+func accessControlSetup(ctx context.Context, cmd *cobra.Command, c *cli.Config) error {
+	// Calling grant directly on internal permissions service to avoid AC check for "grant"
+	var p = service.DefaultPermissions
+	var ac = service.DefaultAccessControl
+	return p.Grant(ctx, ac.Whitelist(), ac.DefaultRules()...)
+}
diff --git a/system/system.go b/system/system.go
index 4ddd86b6d..b136f0f75 100644
--- a/system/system.go
+++ b/system/system.go
@@ -20,15 +20,6 @@ const (
 )
 
 func Configure() *cli.Config {
-	var (
-		accessControlSetup = func(ctx context.Context, cmd *cobra.Command, c *cli.Config) error {
-			// Calling grant directly on internal permissions service to avoid AC check for "grant"
-			var p = service.DefaultPermissions
-			var ac = service.DefaultAccessControl
-			return p.Grant(ctx, ac.Whitelist(), ac.DefaultRules()...)
-		}
-	)
-
 	return &cli.Config{
 		ServiceName: system,