diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init/check-gpu b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init/check-gpu
index 8be15e88b..76e14cdec 100755
--- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init/check-gpu
+++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston-init/check-gpu
@@ -9,16 +9,17 @@
 #===============================================================================
 
 check_dt_status() {
-    gcnano_dir=$(ls /proc/device-tree/soc/ | grep gpu)
-    if [ -z "$gcnano_dir" ] || [ ! -d /proc/device-tree/soc/$gcnano_dir ];
+    gcnano_path=$(find /proc/device-tree/soc* | grep gpu | head -n 1)
+    gcnano_dir=$(basename $gcnano_path)
+    if [ -z "$gcnano_dir" ] || [ ! -d $gcnano_path ];
     then
         echo "Gcnano in /proc/device-tree/soc/ is not available" > /dev/kmsg
         force_no_dtb_gpu="1"
     else
-        if [ ! -f /proc/device-tree/soc/$gcnano_dir/status ]; then
+        if [ ! -f $gcnano_path/status ]; then
             gcnano_status="okay"
         else
-            if $(grep -q "okay" /proc/device-tree/soc/$gcnano_dir/status); then
+            if $(grep -q "okay" $gcnano_path/status); then
                 gcnano_status="okay"
             fi
         fi
@@ -96,8 +97,14 @@ then
         sed -i "s/OPTARGS=--use-pixman/#OPTARGS=--use-pixman/g" /etc/default/weston
         sed -i "/#Autogenerated/d" /etc/default/weston
     fi
+    if [ ! -f /etc/default/weston ];
+    then
+        echo "#Autogenerated" > /etc/default/weston
+        echo "#OPTARGS=--use-pixman" >> /etc/default/weston
+        echo "WESTON_USER=root" >> /etc/default/weston
+    fi
 else
-    if [ -f /etc/default/weston ] && $(grep -q "Autogenerated" /etc/default/weston) ;
+    if [ -f /etc/default/weston ] && $(grep -q "pixman" /etc/default/weston) ;
     then
         echo "Weston already configured on pixman" > /dev/kmsg
     else