diff --git a/profiles/default/linux/amd64/17.1/feffe/desktop/parent b/profiles/default/linux/amd64/17.1/feffe/desktop/parent
deleted file mode 100644
index fc121ec..0000000
--- a/profiles/default/linux/amd64/17.1/feffe/desktop/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-feffe:default/linux/amd64/17.1/feffe/server
-../../../../../../targets/desktop
diff --git a/profiles/default/linux/amd64/17.1/feffe/server/eapi b/profiles/default/linux/amd64/17.1/feffe/server/eapi
deleted file mode 100644
index 7f8f011..0000000
--- a/profiles/default/linux/amd64/17.1/feffe/server/eapi
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/profiles/default/linux/amd64/17.1/feffe/server/parent b/profiles/default/linux/amd64/17.1/feffe/server/parent
deleted file mode 100644
index 87cf57f..0000000
--- a/profiles/default/linux/amd64/17.1/feffe/server/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-gentoo:default/linux/amd64/17.1/hardened/selinux
-../../../../../../targets/server
diff --git a/profiles/default/linux/amd64/17.1/feffe/desktop/eapi b/profiles/default/linux/amd64/23.0/feffe/server/systemd/eapi
similarity index 100%
rename from profiles/default/linux/amd64/17.1/feffe/desktop/eapi
rename to profiles/default/linux/amd64/23.0/feffe/server/systemd/eapi
diff --git a/profiles/default/linux/amd64/23.0/feffe/server/systemd/parent b/profiles/default/linux/amd64/23.0/feffe/server/systemd/parent
new file mode 100644
index 0000000..4b9ad9c
--- /dev/null
+++ b/profiles/default/linux/amd64/23.0/feffe/server/systemd/parent
@@ -0,0 +1,2 @@
+gentoo:default/linux/amd64/23.0/hardened/selinux/systemd
+../../../../../../../targets/server
diff --git a/profiles/default/linux/arm64/17.0/feffe/rpi4/eapi b/profiles/default/linux/arm64/17.0/feffe/rpi4/eapi
deleted file mode 100644
index 7f8f011..0000000
--- a/profiles/default/linux/arm64/17.0/feffe/rpi4/eapi
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/profiles/default/linux/arm64/17.0/feffe/rpi4/parent b/profiles/default/linux/arm64/17.0/feffe/rpi4/parent
deleted file mode 100644
index 2469033..0000000
--- a/profiles/default/linux/arm64/17.0/feffe/rpi4/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-gentoo:default/linux/arm64/17.0/hardened/selinux
-../../../../../../targets/rpi4
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 2436902..afbb51e 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -1,6 +1,4 @@
-amd64       default/linux/amd64/23.0/feffe/server     exp
-amd64       default/linux/amd64/23.0/feffe/desktop    exp
-amd64       default/linux/amd64/17.1/feffe/desktop    exp
-amd64       default/linux/amd64/17.1/feffe/server     exp
-arm64       default/linux/arm64/17.0/feffe/rpi4       exp
-arm64       default/linux/arm64/23.0/feffe/rpi4       exp
+amd64       default/linux/amd64/23.0/feffe/server         exp
+amd64       default/linux/amd64/23.0/feffe/server/systemd exp
+amd64       default/linux/amd64/23.0/feffe/desktop        exp
+arm64       default/linux/arm64/23.0/feffe/rpi4           exp