diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 29e680c8..db0132b0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # Code Owners file designates mandatory reviewers
-* @synadia-io/cloud-services
+* @synadia-io/nex
diff --git a/agent/fc-image/rootfs.go b/agent/fc-image/rootfs.go
index 88d17622..229e8053 100644
--- a/agent/fc-image/rootfs.go
+++ b/agent/fc-image/rootfs.go
@@ -135,7 +135,10 @@ func build(ctx context.Context, tempdir string, mountPoint string) error {
 		WithMountedFile("/etc/init.d/agent", orcFile).
 		WithMountedFile("/usr/local/bin/agent", nexagent).
 		WithMountedFile("/setup-alpine.sh", bootstrapScript).
-		WithExec([]string{"sh", "/setup-alpine.sh"})
+		WithExec([]string{"sh", "/setup-alpine.sh"}).
+		WithExec([]string{"chown", "1000:1000", "/etc/init.d/agent"}).
+		WithExec([]string{"chown", "-R", "1000:1000", "/home/nex"}).
+		WithExec([]string{"chown", "1000:1000", "/usr/local/bin/agent"})
 
 	_, err = c.Directory("/tmp/rootfs").
 		Export(ctx, "./rootfs-mount")