diff --git a/profiles/targets/rpi4/package.accept_keywords/cpp-hocon b/profiles/targets/rpi4/package.accept_keywords/cpp-hocon
deleted file mode 100644
index 3326ceb..0000000
--- a/profiles/targets/rpi4/package.accept_keywords/cpp-hocon
+++ /dev/null
@@ -1 +0,0 @@
-=dev-cpp/cpp-hocon-0.3.0 ~amd64
diff --git a/profiles/targets/rpi4/package.accept_keywords/graylog b/profiles/targets/rpi4/package.accept_keywords/graylog
deleted file mode 100644
index 280bbad..0000000
--- a/profiles/targets/rpi4/package.accept_keywords/graylog
+++ /dev/null
@@ -1,2 +0,0 @@
-=app-misc/elasticsearch-7.13.2
-=app-admin/graylog-4.0.7
diff --git a/profiles/targets/rpi4/package.accept_keywords/ipv6calc b/profiles/targets/rpi4/package.accept_keywords/ipv6calc
deleted file mode 100644
index ae95cb0..0000000
--- a/profiles/targets/rpi4/package.accept_keywords/ipv6calc
+++ /dev/null
@@ -1 +0,0 @@
-=net-misc/ipv6calc-2.2.0
diff --git a/profiles/targets/rpi4/package.accept_keywords/jellyfin b/profiles/targets/rpi4/package.accept_keywords/jellyfin
deleted file mode 100644
index 107b460..0000000
--- a/profiles/targets/rpi4/package.accept_keywords/jellyfin
+++ /dev/null
@@ -1 +0,0 @@
-www-apps/jellyfin ~amd64
diff --git a/profiles/targets/rpi4/package.accept_keywords/leatherman b/profiles/targets/rpi4/package.accept_keywords/leatherman
deleted file mode 100644
index a411c00..0000000
--- a/profiles/targets/rpi4/package.accept_keywords/leatherman
+++ /dev/null
@@ -1 +0,0 @@
-=dev-libs/leatherman-1.12.3 ~amd64
diff --git a/profiles/targets/rpi4/package.accept_keywords/pam_yubico b/profiles/targets/rpi4/package.accept_keywords/pam_yubico
index 55eba56..848ffce 100644
--- a/profiles/targets/rpi4/package.accept_keywords/pam_yubico
+++ b/profiles/targets/rpi4/package.accept_keywords/pam_yubico
@@ -1,2 +1,5 @@
-=sys-auth/pam_yubico-2.27
-=sys-auth/ykclient-2.15
+=sys-auth/pam_yubico-2.27 **
+=sys-auth/libyubikey-1.13::gentoo ~arm64
+=sys-auth/ykclient-2.15::gentoo **
+=sys-auth/ykpers-1.20.0-r1::gentoo ~arm64
+
diff --git a/profiles/targets/rpi4/package.accept_keywords/puppet b/profiles/targets/rpi4/package.accept_keywords/puppet
new file mode 100644
index 0000000..f085501
--- /dev/null
+++ b/profiles/targets/rpi4/package.accept_keywords/puppet
@@ -0,0 +1,5 @@
+=app-admin/puppet-8.5.1::gentoo
+=dev-ruby/semantic_puppet-1.1.0::gentoo
+=dev-ruby/facter-4.4.1::gentoo
+=dev-ruby/deep_merge-1.2.2::gentoo
+=dev-ruby/hocon-1.4.0::gentoo
diff --git a/profiles/targets/rpi4/package.accept_keywords/rclone b/profiles/targets/rpi4/package.accept_keywords/rclone
new file mode 100644
index 0000000..d69dc4e
--- /dev/null
+++ b/profiles/targets/rpi4/package.accept_keywords/rclone
@@ -0,0 +1 @@
+=net-misc/rclone-1.63.1
diff --git a/profiles/targets/rpi4/package.accept_keywords/zfs b/profiles/targets/rpi4/package.accept_keywords/zfs
deleted file mode 100644
index e8edc48..0000000
--- a/profiles/targets/rpi4/package.accept_keywords/zfs
+++ /dev/null
@@ -1,2 +0,0 @@
-=sys-fs/zfs-2.0.4-r1 ~amd64
-=sys-fs/zfs-kmod-2.0.4-r1 ~amd64