diff --git a/profiles/linux/arch/amd64/busybox/musl/parent b/profiles/linux/arch/amd64/busybox/musl/parent
index 388e6f7..657af94 100644
--- a/profiles/linux/arch/amd64/busybox/musl/parent
+++ b/profiles/linux/arch/amd64/busybox/musl/parent
@@ -1,2 +1,2 @@
 ..
-gentoo:features/musl
+../../features/musl
diff --git a/profiles/linux/arch/amd64/busybox/parent b/profiles/linux/arch/amd64/busybox/parent
index fc7091e..ca7b13a 100644
--- a/profiles/linux/arch/amd64/busybox/parent
+++ b/profiles/linux/arch/amd64/busybox/parent
@@ -1,6 +1,2 @@
-../../../gentoo/base
-../../../gentoo/default
-gentoo:arch/amd64
-gentoo:arch/amd64/no-multilib
-gentoo:features/merged-usr
-../../../minimal
+..
+../../../features/busybox
diff --git a/profiles/linux/minimal/eapi b/profiles/linux/arch/amd64/features/musl/eapi
similarity index 100%
rename from profiles/linux/minimal/eapi
rename to profiles/linux/arch/amd64/features/musl/eapi
diff --git a/profiles/linux/arch/amd64/features/musl/make.defaults b/profiles/linux/arch/amd64/features/musl/make.defaults
new file mode 100644
index 0000000..45e426b
--- /dev/null
+++ b/profiles/linux/arch/amd64/features/musl/make.defaults
@@ -0,0 +1,10 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="x86_64-pc-linux-musl"
+
+# Anthony G. Basile <blueness@gentoo.org> (2014-07-01)
+# Multilib-related setup, bug #515130
+MULTILIB_ABIS="amd64"
+CHOST_amd64="${CHOST}"
+LIBDIR_amd64="lib"
diff --git a/profiles/linux/arch/amd64/features/musl/package.mask b/profiles/linux/arch/amd64/features/musl/package.mask
new file mode 100644
index 0000000..57d4ad9
--- /dev/null
+++ b/profiles/linux/arch/amd64/features/musl/package.mask
@@ -0,0 +1,15 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@gentoo.org> (2022-10-08)
+# openjdk-bin is available on amd64 musl
+-dev-java/openjdk-bin
+dev-java/openjdk-bin:8
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-28)
+# rust-bin is available on amd64 musl
+-dev-lang/rust-bin
+
+# Sebastian Parborg <darkdefende@gmail.com> (2025-01-21)
+# blender-bin is only compatible with glibc
+media-gfx/blender-bin
diff --git a/profiles/linux/arch/amd64/features/musl/package.use.mask b/profiles/linux/arch/amd64/features/musl/package.use.mask
new file mode 100644
index 0000000..08d8165
--- /dev/null
+++ b/profiles/linux/arch/amd64/features/musl/package.use.mask
@@ -0,0 +1,6 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-28)
+# upstream does not provide docs in musl tarball
+dev-lang/rust-bin doc
diff --git a/profiles/linux/arch/amd64/features/musl/parent b/profiles/linux/arch/amd64/features/musl/parent
new file mode 100644
index 0000000..ecdd3eb
--- /dev/null
+++ b/profiles/linux/arch/amd64/features/musl/parent
@@ -0,0 +1,2 @@
+../../../../features/musl
+../../../../features/installmask
diff --git a/profiles/linux/arch/amd64/gnu/musl/make.defaults b/profiles/linux/arch/amd64/gnu/musl/make.defaults
deleted file mode 100644
index 3b53e9e..0000000
--- a/profiles/linux/arch/amd64/gnu/musl/make.defaults
+++ /dev/null
@@ -1 +0,0 @@
-CHOST="x86_64-pc-linux-musl"
diff --git a/profiles/linux/arch/amd64/gnu/musl/packages b/profiles/linux/arch/amd64/gnu/musl/packages
deleted file mode 100644
index 8cfd16c..0000000
--- a/profiles/linux/arch/amd64/gnu/musl/packages
+++ /dev/null
@@ -1 +0,0 @@
-*sys-libs/musl
diff --git a/profiles/linux/arch/amd64/gnu/musl/parent b/profiles/linux/arch/amd64/gnu/musl/parent
index 388e6f7..657af94 100644
--- a/profiles/linux/arch/amd64/gnu/musl/parent
+++ b/profiles/linux/arch/amd64/gnu/musl/parent
@@ -1,2 +1,2 @@
 ..
-gentoo:features/musl
+../../features/musl
diff --git a/profiles/linux/arch/amd64/gnu/parent b/profiles/linux/arch/amd64/gnu/parent
index fc7091e..77d76e8 100644
--- a/profiles/linux/arch/amd64/gnu/parent
+++ b/profiles/linux/arch/amd64/gnu/parent
@@ -1,6 +1,2 @@
-../../../gentoo/base
-../../../gentoo/default
-gentoo:arch/amd64
-gentoo:arch/amd64/no-multilib
-gentoo:features/merged-usr
-../../../minimal
+..
+../../../features/gnu
diff --git a/profiles/linux/arch/amd64/parent b/profiles/linux/arch/amd64/parent
new file mode 100644
index 0000000..ef11d48
--- /dev/null
+++ b/profiles/linux/arch/amd64/parent
@@ -0,0 +1,7 @@
+../../gentoo/base
+../../gentoo/default
+gentoo:arch/amd64
+gentoo:arch/amd64/no-multilib
+gentoo:features/merged-usr
+../../features/minimal
+../../features/installmask
diff --git a/profiles/linux/features/busybox/eapi b/profiles/linux/features/busybox/eapi
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/profiles/linux/features/busybox/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/linux/arch/amd64/busybox/make.defaults b/profiles/linux/features/busybox/make.defaults
similarity index 100%
rename from profiles/linux/arch/amd64/busybox/make.defaults
rename to profiles/linux/features/busybox/make.defaults
diff --git a/profiles/linux/arch/amd64/busybox/package.use b/profiles/linux/features/busybox/package.use
similarity index 100%
rename from profiles/linux/arch/amd64/busybox/package.use
rename to profiles/linux/features/busybox/package.use
diff --git a/profiles/linux/arch/amd64/busybox/packages b/profiles/linux/features/busybox/packages
similarity index 100%
rename from profiles/linux/arch/amd64/busybox/packages
rename to profiles/linux/features/busybox/packages
diff --git a/profiles/linux/features/gnu/eapi b/profiles/linux/features/gnu/eapi
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/profiles/linux/features/gnu/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/linux/arch/amd64/gnu/make.defaults b/profiles/linux/features/gnu/make.defaults
similarity index 100%
rename from profiles/linux/arch/amd64/gnu/make.defaults
rename to profiles/linux/features/gnu/make.defaults
diff --git a/profiles/linux/arch/amd64/gnu/packages b/profiles/linux/features/gnu/packages
similarity index 100%
rename from profiles/linux/arch/amd64/gnu/packages
rename to profiles/linux/features/gnu/packages
diff --git a/profiles/linux/features/installmask/eapi b/profiles/linux/features/installmask/eapi
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/profiles/linux/features/installmask/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/linux/features/installmask/make.defaults b/profiles/linux/features/installmask/make.defaults
new file mode 100644
index 0000000..fd7c2f0
--- /dev/null
+++ b/profiles/linux/features/installmask/make.defaults
@@ -0,0 +1,4 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+INSTALL_MASK="${INSTALL_MASK} /usr/share/doc /usr/share/man /usr/share/locale /usr/lib64/pkgconfig /usr/include /usr/share/info /usr/lib*/python*/test"
diff --git a/profiles/linux/features/minimal/eapi b/profiles/linux/features/minimal/eapi
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/profiles/linux/features/minimal/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/linux/minimal/make.defaults b/profiles/linux/features/minimal/make.defaults
similarity index 63%
rename from profiles/linux/minimal/make.defaults
rename to profiles/linux/features/minimal/make.defaults
index fea77e1..81cc2e6 100644
--- a/profiles/linux/minimal/make.defaults
+++ b/profiles/linux/features/minimal/make.defaults
@@ -3,5 +3,3 @@
 
 USE="pam pcre zlib ipv6 minimal ssl"
 USE="${USE} -acl -xattr -fortran -ncurses -readline -static-libs -nls -multiarch -kmod -seccomp"
-
-INSTALL_MASK="/usr/share/doc /usr/share/man /usr/share/locale /usr/lib64/pkgconfig /usr/include /usr/share/info /usr/lib*/python*/test"
diff --git a/profiles/linux/minimal/package.use b/profiles/linux/features/minimal/package.use
similarity index 100%
rename from profiles/linux/minimal/package.use
rename to profiles/linux/features/minimal/package.use
diff --git a/profiles/linux/minimal/package.use.force b/profiles/linux/features/minimal/package.use.force
similarity index 100%
rename from profiles/linux/minimal/package.use.force
rename to profiles/linux/features/minimal/package.use.force
diff --git a/profiles/linux/minimal/packages b/profiles/linux/features/minimal/packages
similarity index 100%
rename from profiles/linux/minimal/packages
rename to profiles/linux/features/minimal/packages
diff --git a/profiles/linux/features/musl/eapi b/profiles/linux/features/musl/eapi
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/profiles/linux/features/musl/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/linux/features/musl/packages b/profiles/linux/features/musl/packages
new file mode 100644
index 0000000..f738f1b
--- /dev/null
+++ b/profiles/linux/features/musl/packages
@@ -0,0 +1,4 @@
+-*app-misc/pax-utils
+-*sys-apps/sandbox
+
+*sys-libs/musl
diff --git a/profiles/linux/features/musl/parent b/profiles/linux/features/musl/parent
new file mode 100644
index 0000000..0cdaa1c
--- /dev/null
+++ b/profiles/linux/features/musl/parent
@@ -0,0 +1 @@
+gentoo:features/musl
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 5f32d82..0d868dc 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -1,7 +1,10 @@
 # Copyright 2003-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Minimal profiles
 amd64		linux/arch/amd64/gnu							exp
-amd64		linux/arch/amd64/gnu/musl						exp
 amd64		linux/arch/amd64/busybox						exp
+
+# Minimal musl profiles
+amd64		linux/arch/amd64/gnu/musl						exp
 amd64		linux/arch/amd64/busybox/musl						exp