diff --git a/cmd/prebuild/main.go b/cmd/prebuild/main.go
index 2002999a..91f77e2e 100644
--- a/cmd/prebuild/main.go
+++ b/cmd/prebuild/main.go
@@ -31,7 +31,7 @@ func init() {
 
 	// Build tasks applied by default
 	builder.Register(
-		"userspace", // Resolve variable in the userspace profile
+		"userspace", // Resolve variable in profile attachments
 		"hotfix",    // Temporary fix for #74, #80 & #235
 	)
 
diff --git a/pkg/prebuild/builder/userspace.go b/pkg/prebuild/builder/userspace.go
index be5886cb..d62cad52 100644
--- a/pkg/prebuild/builder/userspace.go
+++ b/pkg/prebuild/builder/userspace.go
@@ -27,7 +27,7 @@ func init() {
 	RegisterBuilder(&Userspace{
 		Base: prebuild.Base{
 			Keyword: "userspace",
-			Msg:     "Bypass userspace tools restriction",
+			Msg:     "Resolve variable in profile attachments",
 		},
 	})
 }
diff --git a/pkg/prebuild/cli/cli.go b/pkg/prebuild/cli/cli.go
index 329729e9..7c91d828 100644
--- a/pkg/prebuild/cli/cli.go
+++ b/pkg/prebuild/cli/cli.go
@@ -73,10 +73,10 @@ func Prebuild() {
 		return
 	}
 
-	if full {
+	if full && paths.New("apparmor.d/groups/_full").Exist() {
 		prepare.Register("fsp")
 		builder.Register("fsp")
-	} else {
+	} else if prebuild.SystemdDir.Exist() {
 		prepare.Register("systemd-early")
 	}