diff --git a/profiles/targets/rpi4/make.defaults b/profiles/targets/rpi/make.defaults
similarity index 100%
rename from profiles/targets/rpi4/make.defaults
rename to profiles/targets/rpi/make.defaults
diff --git a/profiles/targets/rpi4/package.accept_keywords/foot b/profiles/targets/rpi/package.accept_keywords/foot
similarity index 100%
rename from profiles/targets/rpi4/package.accept_keywords/foot
rename to profiles/targets/rpi/package.accept_keywords/foot
diff --git a/profiles/targets/rpi4/package.accept_keywords/icinga2 b/profiles/targets/rpi/package.accept_keywords/icinga2
similarity index 100%
rename from profiles/targets/rpi4/package.accept_keywords/icinga2
rename to profiles/targets/rpi/package.accept_keywords/icinga2
diff --git a/profiles/targets/rpi4/package.accept_keywords/openvox b/profiles/targets/rpi/package.accept_keywords/openvox
similarity index 100%
rename from profiles/targets/rpi4/package.accept_keywords/openvox
rename to profiles/targets/rpi/package.accept_keywords/openvox
diff --git a/profiles/targets/rpi4/package.accept_keywords/pam_yubico b/profiles/targets/rpi/package.accept_keywords/pam_yubico
similarity index 100%
rename from profiles/targets/rpi4/package.accept_keywords/pam_yubico
rename to profiles/targets/rpi/package.accept_keywords/pam_yubico
diff --git a/profiles/targets/rpi4/package.accept_keywords/rclone b/profiles/targets/rpi/package.accept_keywords/rclone
similarity index 100%
rename from profiles/targets/rpi4/package.accept_keywords/rclone
rename to profiles/targets/rpi/package.accept_keywords/rclone
diff --git a/profiles/targets/rpi4/package.use.mask/wlroots b/profiles/targets/rpi/package.use.mask/wlroots
similarity index 100%
rename from profiles/targets/rpi4/package.use.mask/wlroots
rename to profiles/targets/rpi/package.use.mask/wlroots
diff --git a/profiles/targets/rpi4/package.use/binutils b/profiles/targets/rpi/package.use/binutils
similarity index 100%
rename from profiles/targets/rpi4/package.use/binutils
rename to profiles/targets/rpi/package.use/binutils
diff --git a/profiles/targets/rpi4/package.use/freetype b/profiles/targets/rpi/package.use/freetype
similarity index 100%
rename from profiles/targets/rpi4/package.use/freetype
rename to profiles/targets/rpi/package.use/freetype
diff --git a/profiles/targets/rpi4/package.use/libvpx b/profiles/targets/rpi/package.use/libvpx
similarity index 100%
rename from profiles/targets/rpi4/package.use/libvpx
rename to profiles/targets/rpi/package.use/libvpx
diff --git a/profiles/targets/rpi4/package.use/sway b/profiles/targets/rpi/package.use/sway
similarity index 100%
rename from profiles/targets/rpi4/package.use/sway
rename to profiles/targets/rpi/package.use/sway
diff --git a/profiles/targets/rpi4/package.use/vulkan-loader b/profiles/targets/rpi/package.use/vulkan-loader
similarity index 100%
rename from profiles/targets/rpi4/package.use/vulkan-loader
rename to profiles/targets/rpi/package.use/vulkan-loader
diff --git a/profiles/targets/rpi4/packages b/profiles/targets/rpi/packages
similarity index 92%
rename from profiles/targets/rpi4/packages
rename to profiles/targets/rpi/packages
index 5dc03a4..45dcd01 100644
--- a/profiles/targets/rpi4/packages
+++ b/profiles/targets/rpi/packages
@@ -20,6 +20,6 @@
 *mail-client/mailx
 *net-analyzer/tcpdump
 
-*media-libs/raspberrypi-userland
+*dev-embedded/raspberrypi-utils
 *sys-boot/raspberrypi-firmware
 *sys-kernel/raspberrypi-image