diff --git a/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-arago.inc b/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-arago.inc
index d8eb0204..108f77c7 100644
--- a/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-arago.inc
+++ b/meta-arago-distro/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-arago.inc
@@ -1,6 +1,6 @@
 PR:append = ".arago0"
 
-EXTENSION_DIR = "/usr/lib/chromium/extensions/force-h264-youtube"
+EXTENSION_DIR = "${libdir}/chromium/extensions/force-h264-youtube"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/chromium-ozone-wayland:"
 
@@ -15,11 +15,26 @@ SRC_URI:append = " \
                   file://force-h264-youtube/manifest.json \
                   "
 
+PACKAGES:append = " ${PN}-force-h264-youtube"
+FILES:${PN}-force-h264-youtube = "${EXTENSION_DIR}"
+RDEPENDS:${PN}-force-h264-youtube = "${PN}"
+
+CHROMIUM_H264_EXT ?= ""
+CHROMIUM_H264_EXT:am62pxx-evm = "1"
+CHROMIUM_H264_EXT:j721s2-evm  = "1"
+CHROMIUM_H264_EXT:j722s-evm   = "1"
+CHROMIUM_H264_EXT:j742s2-evm  = "1"
+CHROMIUM_H264_EXT:j784s4-evm  = "1"
+
+RRECOMMENDS:${PN}:append = " ${@bb.utils.contains('CHROMIUM_H264_EXT', '1', '${PN}-force-h264-youtube', '', d)}"
+
 do_install:append() {
-    install -d ${D}${EXTENSION_DIR}
-    install -m 0644 ${WORKDIR}/sources/force-h264-youtube/force_h264.js \
-                    ${WORKDIR}/sources/force-h264-youtube/manifest.json \
-                    ${D}${EXTENSION_DIR}/
+    if [ -n "${CHROMIUM_H264_EXT}" ]; then
+        install -d ${D}${EXTENSION_DIR}
+        install -m 0644 ${WORKDIR}/sources/force-h264-youtube/force_h264.js \
+                        ${WORKDIR}/sources/force-h264-youtube/manifest.json \
+                        ${D}${EXTENSION_DIR}/
+        sed -i "s|CHROME_EXTRA_ARGS=\"\(.*\)\"|CHROME_EXTRA_ARGS=\"\1 --load-extension=${EXTENSION_DIR}\"|" \
+            ${D}${libdir}/chromium/chromium-wrapper
+    fi
 }
-
-FILES:${PN}:append = " ${EXTENSION_DIR}"