diff --git a/.gitignore b/.gitignore
index abda9b6..c3a484e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -149,3 +149,7 @@ engine-revision.json
 
 *.scpt
 
+
+AGL
+amdgpu
+imxgpu
\ No newline at end of file
diff --git a/configs/agl-compsitor.json b/configs/agl-compsitor.json
new file mode 100644
index 0000000..9c37917
--- /dev/null
+++ b/configs/agl-compsitor.json
@@ -0,0 +1,172 @@
+{
+    "id": "agl-compositor",
+    "load": false,
+    "supported_archs": [
+        "x86_64"
+    ],
+    "supported_host_types": [
+        "fedora",
+        "ubuntu"
+    ],
+    "type": "dependency",
+    "env": {
+        "PATH": "${FLUTTER_WORKSPACE}/.config/flutter_workspace/toolchain-common-ninja:${FLUTTER_WORKSPACE}/.config/flutter_workspace/toolchain-common-cmake/cmake-3.31.0/bin:$PATH",
+        "LD_LIBRARY_PATH": "${FLUTTER_WORKSPACE}/.config/flutter_workspace/toolchain-common-cmake/cmake-3.31.0/lib",
+        "INSTALL_PREFIX": "${FLUTTER_WORKSPACE}/AGL/",
+        "SEATD_SRC_DIR": "${FLUTTER_WORKSPACE}/app/seatd",
+        "SEATD_BUILD_DIR": "${FLUTTER_WORKSPACE}/app/seatd/buildDir",
+        "SEATD_MESON_ARGS": "-Dbuildtype=${MESON_BUILD_TYPE} --prefix=${INSTALL_PREFIX}",
+        "WAYLAND_SRC_DIR": "${FLUTTER_WORKSPACE}/app/wayland",
+        "WAYLAND_BUILD_DIR": "${FLUTTER_WORKSPACE}/app/wayland/buildAglDir",
+        "WAYLAND_MESON_ARGS": "-Dbuildtype=${MESON_BUILD_TYPE} --prefix=${INSTALL_PREFIX}",
+        "WAYLAND_PROTOCOLS_SRC_DIR": "${FLUTTER_WORKSPACE}/app/wayland-protocols",
+        "WAYLAND_PROTOCOLS_BUILD_DIR": "${FLUTTER_WORKSPACE}/app/wayland-protocols/buildAglDir",
+        "WAYLAND_PROTOCOLS_MESON_ARGS": "-Dbuildtype=${MESON_BUILD_TYPE} --prefix=${INSTALL_PREFIX}",
+        "WESTON_SRC_DIR": "${FLUTTER_WORKSPACE}/app/weston",
+        "WESTON_BUILD_DIR": "${FLUTTER_WORKSPACE}/app/agl-compositor/buildDir",
+        "WESTON_MESON_ARGS": "-Dbuildtype=${MESON_BUILD_TYPE} --prefix=${INSTALL_PREFIX} -Dbackend-drm=true -Dbackend-drm-screencast-vaapi=false -Dbackend-headless=false -Dbackend-pipewire=false -Dbackend-rdp=false -Dscreenshare=false -Dbackend-vnc=false -Dbackend-wayland=true -Dbackend-x11=false -Dbackend-default=wayland -Dxwayland=false -Dsystemd=false -Dremoting=false -Dpipewire=false -Dsimple-clients=damage,im,egl,shm,touch,dmabuf-feedback,dmabuf-egl",
+        "AGL_COMPOSITOR_SRC_DIR": "${FLUTTER_WORKSPACE}/app/agl-compositor",
+        "AGL_COMPOSITOR_BUILD_DIR": "${FLUTTER_WORKSPACE}/app/agl-compositor/buildDir",
+        "AGL_COMPOSITOR_MESON_ARGS": "-Dbuildtype=${MESON_BUILD_TYPE} --prefix=${INSTALL_PREFIX} -Ddrm-lease=false -Dgrpc-proxy=false -Dpolicy-default=allow-all -Dxwayland=false",
+        "WAYPP_SRC_DIR": "${FLUTTER_WORKSPACE}/app/waypp",
+        "WAYPP_BUILD_DIR": "${FLUTTER_WORKSPACE}/app/waypp/build",
+        "WAYPP_CMAKE_ARGS": "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DLLVM_CONFIG=${LLVM_CONFIG} -DENABLE_LTO=ON -DENABLE_AGL_SHELL_CLIENT=ON -DBUILD_EXAMPLES=ON"
+    },
+    "src": [
+        {
+            "uri": "https://git.sr.ht/~kennylevinsen/seatd",
+            "branch": "0.9.1"
+        },
+        {
+            "uri": "https://gitlab.freedesktop.org/wayland/wayland.git",
+            "branch": "1.23"
+        },
+        {
+            "uri": "https://gitlab.freedesktop.org/wayland/wayland-protocols.git",
+            "branch": "1.31"
+        },
+        {
+            "uri": "https://gitlab.freedesktop.org/wayland/weston.git",
+            "branch": "13.0"
+        },
+        {
+            "uri": "https://gerrit.automotivelinux.org/gerrit/src/agl-compositor.git",
+            "branch": "salmon"
+        },
+        {
+            "uri": "https://github.com/jwinarske/waypp.git",
+            "branch": "dev"
+        },
+        {
+            "uri": "https://gerrit.automotivelinux.org/gerrit/apps/flutter-ics-homescreen.git",
+            "branch": "salmon"
+        }
+    ],
+    "runtime": {
+        "pre-requisites": {
+            "x86_64": {
+                "fedora": {
+                    "cmds": [
+                        "pip3 install meson",
+                        "sudo dnf -y install libffi-devel libxml2-devel dot2tex doxygen xsltproc xmlto libXfont2-devel libwebp-devel rst2pdf libpciaccess-devel libudev-devel byacc flex libXfixes-devel libglvnd-devel libxkbcommon-devel libinput-devel libjpeg-devel libwebp-devel dbus-devel hwdata libva-devel freerdp-devel  libseat-devel systemd-devel pango-devel pixman-devel cairo-devel bison-devel pipewire-devel pam-devel wayland-devel lcms-devel colord-devel"
+                    ],
+                    "40": {
+                        "cmds": [
+                            "sudo dnf -y install ffmpeg-free-devel"
+                        ]
+                    },
+                    "41": {
+                        "cmds": [
+                            "sudo dnf -y install ffmpeg-devel"
+                        ]
+                    }
+                },
+                "ubuntu": {
+                    "cmds": [
+                        "pip3 install meson"
+                    ],
+                    "20.0.4": {
+                        "cmds": [
+                            "sudo apt install -y graphviz libffi-dev libxml2-dev dot2tex doxygen xsltproc xmlto ninja-build libpixman-1-dev libxfont2 libxfont-dev libwebp-dev libcairo2-dev valgrind systemd-coredump rst2pdf libcunit1-dev libpciaccess-dev libwayland-dev libudev-dev libelf-dev libbison-dev byacc flex libxfixes-dev libxcb-glx0-dev libx11-xcb-dev libxcb-dri2-0-dev libxcb-dri3-dev libxcb-present-dev libxshmfence-dev libxxf86vm-dev libxrandr-dev glslang-tools libglvnd-dev libxkbcommon-dev libinput-dev libpango1.0-dev libpangocairo-1.0-0 libjpeg-dev libwebp-dev libsystemd-dev libdbus-1-dev hwdata liblcms2-dev libva-dev freerdp2-dev libxcursor-dev libcolord-dev libegl-mesa0 libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev libseat-dev libpam0g-dev libsdl-pango-dev ffmpeg"
+                        ]
+                    },
+                    "22.0.4": {
+                        "cmds": [
+                            "sudo apt install -y graphviz libffi-dev libxml2-dev dot2tex doxygen xsltproc xmlto ninja-build libpixman-1-dev libxfont2 libxfont-dev libwebp-dev libcairo2-dev valgrind systemd-coredump rst2pdf libcunit1-dev libpciaccess-dev libwayland-dev libudev-dev libelf-dev libbison-dev byacc flex libxfixes-dev libxcb-glx0-dev libx11-xcb-dev libxcb-dri2-0-dev libxcb-dri3-dev libxcb-present-dev libxshmfence-dev libxxf86vm-dev libxrandr-dev glslang-tools libglvnd-dev libxkbcommon-dev libinput-dev libpango1.0-dev libpangocairo-1.0-0 libjpeg-dev libwebp-dev libsystemd-dev libdbus-1-dev hwdata liblcms2-dev libva-dev freerdp2-dev libxcursor-dev libcolord-dev libegl-mesa0 libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev libseat-dev libpam0g-dev libsdl-pango-dev ffmpeg"
+                        ]
+                    }
+                }
+            }
+        },
+        "post_cmds": [
+            {
+                "cwd": "${SEATD_SRC_DIR}",
+                "cmds": [
+                    "bash -c \"rm -rf ${SEATD_BUILD_DIR} | true\"",
+                    "meson setup ${SEATD_BUILD_DIR} ${SEATD_MESON_ARGS}",
+                    "ninja -C ${SEATD_BUILD_DIR} install -j${HARDWARE_THREADS}"
+                ]
+            },
+            {
+                "cwd": "${WAYLAND_SRC_DIR}",
+                "cmds": [
+                    "bash -c \"rm -rf ${WAYLAND_BUILD_DIR} | true\"",
+                    "meson setup ${WAYLAND_BUILD_DIR} ${WAYLAND_MESON_ARGS}",
+                    "ninja -C ${WAYLAND_BUILD_DIR} install -j${HARDWARE_THREADS}"
+                ]
+            },
+            {
+                "env": {
+                    "PATH": "${INSTALL_PREFIX}/bin:$PATH",
+                    "LD_LIBRARY_PATH": "${LD_LIBRARY_PATH}:${INSTALL_PREFIX}/lib64/libweston-13:${INSTALL_PREFIX}/lib64:${INSTALL_PREFIX}/x86_64-linux-gnu/libweston-13:${INSTALL_PREFIX}/x86_64-linux-gnu",
+                    "PKG_CONFIG_PATH": "${INSTALL_PREFIX}/share/pkgconfig:${INSTALL_PREFIX}/lib64/pkgconfig:${INSTALL_PREFIX}/lib64/pkgconfig:${INSTALL_PREFIX}/lib/x86_64-linux-gnu/pkgconfig"
+                },
+                "cwd": "${WAYLAND_PROTOCOLS_SRC_DIR}",
+                "cmds": [
+                    "bash -c \"rm -rf ${WAYLAND_PROTOCOLS_BUILD_DIR} | true\"",
+                    "meson setup ${WAYLAND_PROTOCOLS_BUILD_DIR} ${WAYLAND_PROTOCOLS_MESON_ARGS}",
+                    "ninja -C ${WAYLAND_PROTOCOLS_BUILD_DIR} install -j${HARDWARE_THREADS}"
+                ]
+            },
+            {
+                "env": {
+                    "PATH": "${INSTALL_PREFIX}/bin:$PATH",
+                    "LD_LIBRARY_PATH": "${LD_LIBRARY_PATH}:${INSTALL_PREFIX}/lib64/libweston-13:${INSTALL_PREFIX}/lib64:${INSTALL_PREFIX}/x86_64-linux-gnu/libweston-13:${INSTALL_PREFIX}/x86_64-linux-gnu",
+                    "PKG_CONFIG_PATH": "${INSTALL_PREFIX}/share/pkgconfig:${INSTALL_PREFIX}/lib64/pkgconfig:${INSTALL_PREFIX}/lib64/pkgconfig:${INSTALL_PREFIX}/lib/x86_64-linux-gnu/pkgconfig"
+                },
+                "cwd": "${WESTON_SRC_DIR}",
+                "cmds": [
+                    "bash -c \"rm -rf ${WESTON_BUILD_DIR} | true\"",
+                    "meson setup ${WESTON_BUILD_DIR} ${WESTON_MESON_ARGS}",
+                    "ninja -C ${WESTON_BUILD_DIR} install -j${HARDWARE_THREADS}"
+                ]
+            },
+            {
+                "env": {
+                    "PATH": "${INSTALL_PREFIX}/bin:$PATH",
+                    "LD_LIBRARY_PATH": "${LD_LIBRARY_PATH}:${INSTALL_PREFIX}/lib64/libweston-13:${INSTALL_PREFIX}/lib64:${INSTALL_PREFIX}/x86_64-linux-gnu/libweston-13:${INSTALL_PREFIX}/x86_64-linux-gnu",
+                    "PKG_CONFIG_PATH": "${INSTALL_PREFIX}/share/pkgconfig:${INSTALL_PREFIX}/lib64/pkgconfig:${INSTALL_PREFIX}/lib64/pkgconfig:${INSTALL_PREFIX}/lib/x86_64-linux-gnu/pkgconfig"
+                },
+                "cwd": "${AGL_COMPOSITOR_SRC_DIR}",
+                "cmds": [
+                    "bash -c \"rm -rf ${AGL_COMPOSITOR_BUILD_DIR} | true\"",
+                    "meson setup ${AGL_COMPOSITOR_BUILD_DIR} ${AGL_COMPOSITOR_MESON_ARGS}",
+                    "ninja -C ${AGL_COMPOSITOR_BUILD_DIR} install -j${HARDWARE_THREADS}"
+                ]
+            },
+            {
+                "env": {
+                    "PATH": "${INSTALL_PREFIX}/bin:$PATH",
+                    "LD_LIBRARY_PATH": "${LD_LIBRARY_PATH}:${INSTALL_PREFIX}/lib64/libweston-13:${INSTALL_PREFIX}/lib64:${INSTALL_PREFIX}/x86_64-linux-gnu/libweston-13:${INSTALL_PREFIX}/x86_64-linux-gnu",
+                    "PKG_CONFIG_PATH": "${INSTALL_PREFIX}/share/pkgconfig:${INSTALL_PREFIX}/lib64/pkgconfig:${INSTALL_PREFIX}/lib64/pkgconfig:${INSTALL_PREFIX}/lib/x86_64-linux-gnu/pkgconfig"
+                },
+                "cwd": "${WAYPP_SRC_DIR}",
+                "cmds": [
+                    "bash -c \"rm -rf ${WAYPP_BUILD_DIR} | true\"",
+                    "cmake -G Ninja ${WAYPP_CMAKE_ARGS} -S ${WAYPP_SRC_DIR} -B ${WAYPP_BUILD_DIR}",
+                    "ninja -C ${WAYPP_BUILD_DIR} -j${HARDWARE_THREADS}"
+                ]
+            }
+        ]
+    }
+}
diff --git a/configs/amd-acs.json b/configs/amd-acs.json
index 8d93f84..34dff86 100644
--- a/configs/amd-acs.json
+++ b/configs/amd-acs.json
@@ -12,7 +12,7 @@
     "env": {
         "PATH": "${FLUTTER_WORKSPACE}/.config/flutter_workspace/toolchain-common-ninja:${FLUTTER_WORKSPACE}/.config/flutter_workspace/toolchain-common-cmake/cmake-3.31.0/bin:$PATH",
         "LD_LIBRARY_PATH": "${FLUTTER_WORKSPACE}/.config/flutter_workspace/toolchain-common-cmake/cmake-3.31.0/lib",
-        "INSTALL_PREFIX": "${FLUTTER_WORKSPACE}/app/amdgpu/",
+        "INSTALL_PREFIX": "${FLUTTER_WORKSPACE}/amdgpu/",
         "AMD_ACS_WAYLAND_SRC_DIR": "${FLUTTER_WORKSPACE}/app/wayland",
         "AMD_ACS_WAYLAND_BUILD_DIR": "${FLUTTER_WORKSPACE}/app/wayland/buildDir",
         "AMD_ACS_WAYLAND_MESON_ARGS": "-Dbuildtype=${MESON_BUILD_TYPE} --prefix=${INSTALL_PREFIX}",
@@ -84,8 +84,9 @@
             },
             {
                 "env": {
+                    "PATH": "${INSTALL_PREFIX}/bin:$PATH",
                     "LD_LIBRARY_PATH": "${LD_LIBRARY_PATH}:${INSTALL_PREFIX}/lib64/libweston-13:${INSTALL_PREFIX}/lib64:${INSTALL_PREFIX}/x86_64-linux-gnu/libweston-13:${INSTALL_PREFIX}/x86_64-linux-gnu",
-                    "PKG_CONFIG_PATH": "${INSTALL_PREFIX}/lib64/pkgconfig/:${INSTALL_PREFIX}/lib64/pkgconfig/:${INSTALL_PREFIX}/x86_64-linux-gnu/pkgconfig/:${INSTALL_PREFIX}/x86_64-linux-gnu/pkgconfig/:${INSTALL_PREFIX}/share/pkgconfig/"
+                    "PKG_CONFIG_PATH": "${INSTALL_PREFIX}/share/pkgconfig:${INSTALL_PREFIX}/lib64/pkgconfig:${INSTALL_PREFIX}/lib64/pkgconfig:${INSTALL_PREFIX}/lib/x86_64-linux-gnu/pkgconfig"
                 },
                 "cwd": "${AMD_ACS_WAYLAND_PROTOCOLS_SRC_DIR}",
                 "cmds": [
@@ -96,8 +97,9 @@
             },
             {
                 "env": {
+                    "PATH": "${INSTALL_PREFIX}/bin:$PATH",
                     "LD_LIBRARY_PATH": "${LD_LIBRARY_PATH}:${INSTALL_PREFIX}/lib64/libweston-13:${INSTALL_PREFIX}/lib64:${INSTALL_PREFIX}/x86_64-linux-gnu/libweston-13:${INSTALL_PREFIX}/x86_64-linux-gnu",
-                    "PKG_CONFIG_PATH": "${INSTALL_PREFIX}/lib64/pkgconfig/:${INSTALL_PREFIX}/lib64/pkgconfig/:${INSTALL_PREFIX}/x86_64-linux-gnu/pkgconfig/:${INSTALL_PREFIX}/x86_64-linux-gnu/pkgconfig/:${INSTALL_PREFIX}/share/pkgconfig/"
+                    "PKG_CONFIG_PATH": "${INSTALL_PREFIX}/share/pkgconfig:${INSTALL_PREFIX}/lib64/pkgconfig:${INSTALL_PREFIX}/lib64/pkgconfig:${INSTALL_PREFIX}/lib/x86_64-linux-gnu/pkgconfig"
                 },
                 "cwd": "${AMD_ACS_WESTON_SRC_DIR}",
                 "cmds": [
diff --git a/configs/desktop-homescreen.json b/configs/desktop-homescreen.json
index fb0ef9d..f2376f4 100644
--- a/configs/desktop-homescreen.json
+++ b/configs/desktop-homescreen.json
@@ -34,7 +34,7 @@
     "PLUGIN_WEBVIEW": "-DBUILD_PLUGIN_WEBVIEW_FLUTTER_VIEW=${FLUTTER_WORKSPACE_CEF_PREBUILT_LOAD} -DCEF_ROOT=${FLUTTER_WORKSPACE}/app/ivi-homescreen-plugins/plugins/webview_flutter_view/third_party/cef_binary_128.4.9+g9840ad9+chromium-128.0.6613.120_linux64_minimal",
     "PLUGIN_WEBRTC": "-DBUILD_PLUGIN_WEBRTC=${FLUTTER_WORKSPACE_LIBWEBRTC_LOAD} -DLIBWEBRTC_INC_DIR=${LIBWEBRTC_INC_DIR} -DLIBWEBRTC_LIB=${LIBWEBRTC_LIB}",
     "PLUGIN_ARGS": "-DBUILD_PLUGIN_FILAMENT_VIEW=ON ${PLUGIN_WEBVIEW} -DBUILD_PLUGIN_NAV_RENDER_VIEW=${FLUTTER_WORKSPACE_MAPLIBRE_VULKAN_LOAD} -DBUILD_PLUGIN_LAYER_PLAYGROUND_VIEW=OFF -DBUILD_PLUGIN_AUDIOPLAYERS_LINUX=OFF -DBUILD_PLUGIN_URL_LAUNCHER=ON -DBUILD_PLUGIN_FILE_SELECTOR=ON -DBUILD_PLUGIN_GO_ROUTER=ON -DBUILD_PLUGIN_SECURE_STORAGE=ON -DBUILD_PLUGIN_DESKTOP_WINDOW_LINUX=ON ${PLUGIN_FIREBASE} ${PLUGIN_RIVE} ${PLUGIN_PDF} ${FLUGIN_FILAMENT_VIEW} ${PLUGIN_WEBRTC} ${PLUGIN_CAMERA} ${PLUGIN_FLATPAK}",
-    "HOMESCREEN_CMAKE_ARGS": "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DLLVM_CONFIG=${LLVM_CONFIG} -DSANITIZE_ADDRESS=OFF -DENABLE_DLT=OFF -DBUILD_UNIT_TESTS=OFF -DBUILD_DOCS=OFF -DBUILD_CRASH_HANDLER=OFF -DENABLE_IVI_SHELL_CLIENT=OFF -DENABLE_XDG_CLIENT=ON -DENABLE_AGL_SHELL_CLIENT=OFF -DENABLE_LTO=ON -DENABLE_CLANG_STATIC_LINK=ON -DDEBUG_PLATFORM_MESSAGES=OFF -DBUILD_BACKEND_WAYLAND_EGL=ON -DBUILD_BACKEND_WAYLAND_VULKAN=OFF -DBUILD_EGL_TRANSPARENCY=ON -DBUILD_EGL_ENABLE_3D=ON -DBUILD_EGL_ENABLE_MULTISAMPLE=ON -DPLUGINS_DIR=${PLUGINS_DIR} ${PLUGIN_ARGS}",
+    "HOMESCREEN_CMAKE_ARGS": "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DLLVM_CONFIG=${LLVM_CONFIG} -DSANITIZE_ADDRESS=OFF -DENABLE_DLT=OFF -DBUILD_UNIT_TESTS=OFF -DBUILD_DOCS=OFF -DBUILD_CRASH_HANDLER=OFF -DENABLE_IVI_SHELL_CLIENT=OFF -DENABLE_XDG_CLIENT=ON -DENABLE_AGL_SHELL_CLIENT=${FLUTTER_WORKSPACE_AGL_COMPOSITOR_LOAD} -DENABLE_LTO=ON -DENABLE_CLANG_STATIC_LINK=ON -DDEBUG_PLATFORM_MESSAGES=OFF -DBUILD_BACKEND_WAYLAND_EGL=ON -DBUILD_BACKEND_WAYLAND_VULKAN=OFF -DBUILD_EGL_TRANSPARENCY=ON -DBUILD_EGL_ENABLE_3D=ON -DBUILD_EGL_ENABLE_MULTISAMPLE=ON -DPLUGINS_DIR=${PLUGINS_DIR} ${PLUGIN_ARGS}",
     "HOMESCREEN_EXE": "LD_LIBRARY_PATH=${LIBWEBRTC_LIB_DIR}:${RIVE_TEXT_LIB_DIR} SPDLOG_LEVEL=debug ${HOMESCREEN_BUILD_DIR}/shell/homescreen -b ${PLATFORM_ID_DIR_RELATIVE}",
     "PING_CMD": "[ -n \"$WAYLAND_DISPLAY\" ] && echo \"Type=wayland\"",
     "CREATE_BUNDLE_FOLDER": "mkdir -p ${PLATFORM_ID_DIR_RELATIVE}/data",
diff --git a/configs/weston-imx.json b/configs/weston-imx.json
index 435cd9a..0ed037e 100644
--- a/configs/weston-imx.json
+++ b/configs/weston-imx.json
@@ -12,7 +12,7 @@
     "env": {
         "PATH": "${FLUTTER_WORKSPACE}/.config/flutter_workspace/toolchain-common-ninja:${FLUTTER_WORKSPACE}/.config/flutter_workspace/toolchain-common-cmake/cmake-3.31.0/bin:$PATH",
         "LD_LIBRARY_PATH": "${FLUTTER_WORKSPACE}/.config/flutter_workspace/toolchain-common-cmake/cmake-3.31.0/lib",
-        "INSTALL_PREFIX": "${FLUTTER_WORKSPACE}/app/imxgpu/",
+        "INSTALL_PREFIX": "${FLUTTER_WORKSPACE}/imxgpu/",
         "WAYLAND_PROTOCOLS_IMX_SRC_DIR": "${FLUTTER_WORKSPACE}/app/wayland-protocols-imx",
         "WAYLAND_PROTOCOLS_IMX_BUILD_DIR": "${FLUTTER_WORKSPACE}/app/wayland-protocols-imx/buildDir",
         "WAYLAND_PROTOCOLS_IMX_MESON_ARGS": "-Dbuildtype=${MESON_BUILD_TYPE} --prefix=${INSTALL_PREFIX}",
@@ -70,7 +70,7 @@
             {
                 "env": {
                     "LD_LIBRARY_PATH": "${LD_LIBRARY_PATH}:${INSTALL_PREFIX}/lib64/libweston-13:${INSTALL_PREFIX}/lib64:${INSTALL_PREFIX}/x86_64-linux-gnu/libweston-13:${INSTALL_PREFIX}/x86_64-linux-gnu",
-                    "PKG_CONFIG_PATH": "${INSTALL_PREFIX}/lib64/pkgconfig/:${INSTALL_PREFIX}/lib64/pkgconfig/:${INSTALL_PREFIX}/x86_64-linux-gnu/pkgconfig/:${INSTALL_PREFIX}/x86_64-linux-gnu/pkgconfig/:${INSTALL_PREFIX}/share/pkgconfig/"
+                    "PKG_CONFIG_PATH": "${INSTALL_PREFIX}/share/pkgconfig:${INSTALL_PREFIX}/lib64/pkgconfig:${INSTALL_PREFIX}/lib64/pkgconfig:${INSTALL_PREFIX}/lib/x86_64-linux-gnu/pkgconfig"
                 },
                 "cwd": "${WAYLAND_PROTOCOLS_IMX_SRC_DIR}",
                 "cmds": [
@@ -81,8 +81,9 @@
             },
             {
                 "env": {
+                    "PATH": "${INSTALL_PREFIX}/bin:$PATH",
                     "LD_LIBRARY_PATH": "${LD_LIBRARY_PATH}:${INSTALL_PREFIX}/lib64/libweston-13:${INSTALL_PREFIX}/lib64:${INSTALL_PREFIX}/x86_64-linux-gnu/libweston-13:${INSTALL_PREFIX}/x86_64-linux-gnu",
-                    "PKG_CONFIG_PATH": "${INSTALL_PREFIX}/lib64/pkgconfig/:${INSTALL_PREFIX}/lib64/pkgconfig/:${INSTALL_PREFIX}/x86_64-linux-gnu/pkgconfig/:${INSTALL_PREFIX}/x86_64-linux-gnu/pkgconfig/:${INSTALL_PREFIX}/share/pkgconfig/"
+                    "PKG_CONFIG_PATH": "${INSTALL_PREFIX}/share/pkgconfig:${INSTALL_PREFIX}/lib64/pkgconfig:${INSTALL_PREFIX}/lib64/pkgconfig:${INSTALL_PREFIX}/lib/x86_64-linux-gnu/pkgconfig"
                 },
                 "cwd": "${WESTON_IMX_SRC_DIR}",
                 "cmds": [