diff --git a/pika-sources/usr/share/apt-pika/apt/preferences.d/0-pika-apt-settings b/pika-sources/usr/share/apt-pika/apt/preferences.d/0-pika-apt-settings
new file mode 100644
index 0000000..149f55c
--- /dev/null
+++ b/pika-sources/usr/share/apt-pika/apt/preferences.d/0-pika-apt-settings
@@ -0,0 +1,45 @@
+# Lower nest's priority under cockatiel's
+Package: *
+Pin: release a=pika,c=nest
+Pin-Priority: 450
+
+# Put nest ROCm under raven's ROCm
+Package: libhsa-runtime64* hipcc* rocm* hipify*
+Pin: release a=pika,c=nest
+Pin-Priority: 100
+
+# Lower canary's priority under cockatiel's
+Package: *
+Pin: release a=pika,c=canary
+Pin-Priority: 450
+
+# Put canary ROCm under raven's ROCm
+Package: libhsa-runtime64* hipcc* rocm* hipify*
+Pin: release a=pika,c=canary
+Pin-Priority: 100
+
+# Lower raven's priority under cockatiel's
+Package: *
+Pin: release a=pika,c=raven
+Pin-Priority: 450
+
+# Lower pigeon's priority under cockatiel's
+Package: *
+Pin: release a=pika,c=pigeon
+Pin-Priority: 450
+
+# Blacklist intel mesa from pigeon
+Package: libglvnd0 libegl1 libegl-dev libglx0 libglx-dev libgl1 libgl-dev libglvnd-core-dev libgles1 libgles2 libgles-dev libglvnd-dev libopengl0 libopengl-dev libxatracker2 libgbm1 libgbm-dev *mesa*
+Pin: release a=pika,c=pigeon
+Pin-Priority: -10
+
+# Blacklist dangerous amdgpu-pro packages
+Package: amdgpu-core amdgpu-pro-core amdgpu-dkms amdgpu-pro-lib32
+Pin: release a=*
+Pin-Priority: -10
+
+# Lower parrot's priority under cockatiel's
+Package: *
+Pin: release a=pika,c=parrot
+Pin-Priority: 450
+
diff --git a/pika-sources/usr/share/apt-pika/apt/preferences.d/1-pika-nest-settings b/pika-sources/usr/share/apt-pika/apt/preferences.d/1-pika-nest-settings
deleted file mode 100644
index 37569bb..0000000
--- a/pika-sources/usr/share/apt-pika/apt/preferences.d/1-pika-nest-settings
+++ /dev/null
@@ -1,25 +0,0 @@
-# Lower nest's priority under cockatiel's
-Package: *
-Pin: release a=pika,c=nest
-Pin-Priority: 450
-
-# Lower raven's priority under cockatiel's
-Package: *
-Pin: release a=pika,c=raven
-Pin-Priority: 450
-
-# Lower pigeon's priority under cockatiel's
-Package: *
-Pin: release a=pika,c=pigeon
-Pin-Priority: 450
-
-# Lower parrot's priority under cockatiel's
-Package: *
-Pin: release a=pika,c=parrot
-Pin-Priority: 450
-
-# Put canary's priority over nest and under cockatiel's
-Package: *
-Pin: release a=pika,c=canary
-Pin-Priority: 450
-