diff --git a/config/boards/ayn-odin2.conf b/config/boards/ayn-odin2.conf
index 4cd0c46fa2..11759cfe70 100644
--- a/config/boards/ayn-odin2.conf
+++ b/config/boards/ayn-odin2.conf
@@ -51,9 +51,6 @@ function post_family_tweaks__enable_services() {
 	echo 'GALLIUM_DRIVER=zink' | tee -a "${SDCARD}"/etc/environment
 	# Add Gamepad udev rule
 	echo 'SUBSYSTEM=="input", ATTRS{name}=="Ayn Odin2 Gamepad", MODE="0666", ENV{ID_INPUT_MOUSE}="0", ENV{ID_INPUT_JOYSTICK}="1"'> "${SDCARD}"/etc/udev/rules.d/99-ignore-gamepad.rules
-	# Add video decoder/encoder udev rule
-	echo 'SUBSYSTEM=="video4linux", ATTR{name}=="qcom-venus-decoder", SYMLINK+="video-dec%n"' >> "${SDCARD}"/etc/udev/rules.d/90-browser-video.rules
-	echo 'SUBSYSTEM=="video4linux", ATTR{name}=="qcom-venus-encoder", SYMLINK+="video-enc%n"' >> "${SDCARD}"/etc/udev/rules.d/90-browser-video.rules
 	# No driver support for suspend
 	chroot_sdcard systemctl mask suspend.target
 	# Add Bt Mac Fixed service
diff --git a/packages/bsp/common/etc/udev/rules.d/90-chromium-video.rules b/packages/bsp/common/etc/udev/rules.d/90-chromium-video.rules
new file mode 100644
index 0000000000..79d8dc00e3
--- /dev/null
+++ b/packages/bsp/common/etc/udev/rules.d/90-chromium-video.rules
@@ -0,0 +1,16 @@
+# This is qcom venus v4l2 stateful decoder, tested on sm8250
+SUBSYSTEM=="video4linux", ATTR{name}=="qcom-venus-decoder", SYMLINK+="video-dec%n"
+
+# This is qcom venus v4l2 stateful encoder, not tested yet, but chromium did query /dev/video-enc* devives for v4l2 encoding.
+SUBSYSTEM=="video4linux", ATTR{name}=="qcom-venus-encoder", SYMLINK+="video-enc%n"
+
+# These rules are for hantro v4l2 stateless decoders found on rk3399, rk3568 and rk3588
+SUBSYSTEM=="video4linux", ATTR{name}=="rockchip,rk3568-vpu-dec", SYMLINK+="video-dec%n"
+SUBSYSTEM=="video4linux", ATTR{name}=="rockchip,rk3399-vpu-dec", SYMLINK+="video-dec%n"
+# AV1 decoder on rk3588 is still not well supported, so disable it now
+#SUBSYSTEM=="video4linux", ATTR{name}=="rockchip,rk3588-av1-vpu-dec", SYMLINK+="video-dec%n"
+SUBSYSTEM=="media", ATTR{model}=="hantro-vpu", SYMLINK+="media-dec%n"
+
+# These rules are for rkvdec v4l2 stateless decoder found on rk3399
+SUBSYSTEM=="video4linux", ATTR{name}=="rkvdec", SYMLINK+="video-dec%n"
+SUBSYSTEM=="media", ATTR{model}=="rkvdec", SYMLINK+="media-dec%n"