diff --git a/.gitmodules b/.gitmodules
index 5ed2017..ac97744 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,20 +1,20 @@
 [submodule "base-image/meta-openembedded"]
 	path = base-image/meta-openembedded
 	url = git://git.openembedded.org/meta-openembedded
-	branch = sumo
+	branch = hardknott
 [submodule "base-image/poky"]
 	path = base-image/poky
 	url = git://git.yoctoproject.org/poky
-	branch = sumo
+	branch = hardknott
 [submodule "base-image/meta-raspberrypi"]
 	path = base-image/meta-raspberrypi
 	url = git://git.yoctoproject.org/meta-raspberrypi
-	branch = sumo
+	branch = hardknott
 [submodule "base-image/meta-gstreamer1.0"]
 	path = base-image/meta-gstreamer1.0
 	url = https://github.com/OSSystems/meta-gstreamer1.0
-	branch = sumo
+	branch = master
 [submodule "base-image/meta-webkit"]
 	path = base-image/meta-webkit
 	url = https://github.com/Igalia/meta-webkit
-	branch = sumo
+	branch = main
diff --git a/base-image/meta-gstreamer1.0 b/base-image/meta-gstreamer1.0
index 59dfad7..cabd7f4 160000
--- a/base-image/meta-gstreamer1.0
+++ b/base-image/meta-gstreamer1.0
@@ -1 +1 @@
-Subproject commit 59dfad71768cf53f7863cbe53432cbb77a25a6ee
+Subproject commit cabd7f4582bc905317fe4c50fc41a32d45bb762a
diff --git a/base-image/meta-openembedded b/base-image/meta-openembedded
index 8760fac..9ee0e08 160000
--- a/base-image/meta-openembedded
+++ b/base-image/meta-openembedded
@@ -1 +1 @@
-Subproject commit 8760facba1bceb299b3613b8955621ddaa3d4c3f
+Subproject commit 9ee0e08ba2395b9cb93f2273bb1018adb3630407
diff --git a/base-image/meta-raspberrypi b/base-image/meta-raspberrypi
index 2d40b00..11209a4 160000
--- a/base-image/meta-raspberrypi
+++ b/base-image/meta-raspberrypi
@@ -1 +1 @@
-Subproject commit 2d40b000021bc8a9ef7f329ed0ad410f8d227b97
+Subproject commit 11209a4981f03db9988de84752da0076ff6b8f17
diff --git a/base-image/meta-resin-wpe/conf/layer.conf b/base-image/meta-resin-wpe/conf/layer.conf
index d69daaa..c7a086a 100644
--- a/base-image/meta-resin-wpe/conf/layer.conf
+++ b/base-image/meta-resin-wpe/conf/layer.conf
@@ -7,4 +7,4 @@ BBFILE_COLLECTIONS += "resin-wpe"
 BBFILE_PATTERN_resin-wpe := "^${LAYERDIR}/"
 BBFILE_PRIORITY_resin-wpe = "99"
 
-LAYERSERIES_COMPAT_resin-wpe = "sumo"
+LAYERSERIES_COMPAT_resin-wpe = "hardknott"
diff --git a/base-image/meta-resin-wpe/conf/samples/local.conf.sample b/base-image/meta-resin-wpe/conf/samples/local.conf.sample
index e2ba7ab..f49997f 100644
--- a/base-image/meta-resin-wpe/conf/samples/local.conf.sample
+++ b/base-image/meta-resin-wpe/conf/samples/local.conf.sample
@@ -26,14 +26,19 @@ PATCHRESOLVE = "noop"
 
 CONF_VERSION = "1"
 
-DISTRO_FEATURES_append = " opengl wayland"
+DISTRO_FEATURES_append = " opengl egl"
+DISTRO_FEATURES_remove = " x11"
 
 # Install hardware acceleration codecs
 IMAGE_FEATURES_append = " hwcodecs"
 
 # Use proprietary Broadcom OpenGL drivers and wpebackend-rdk
 PREFERRED_PROVIDER_virtual/wpebackend = "wpebackend-rdk"
-PACKAGECONFIG_pn-wpebackend-rdk = "rpi"
+PACKAGECONFIG_pn-wpebackend-rdk = "rpi libinput libinput-udev"
+DISABLE_VC4GRAPHICS = "1"
+
+# Disable Mesa GBM
+PACKAGECONFIG_remove_pn-mesa-gl = " gbm"
 
 # Enable H.264 decoding in hardware
 IMAGE_INSTALL_append = " gstreamer1.0-omx"
@@ -44,6 +49,6 @@ PACKAGECONFIG_append_pn-cairo = " glesv2 egl"
 PACKAGECONFIG_append_pn-wpewebkit = " 2dcanvas"
 
 # Specify versions
-PREFERRED_VERSION_cog = "0.2.%"
-PREFERRED_VERSION_libwpe = "1.0.%"
-PREFERRED_VERSION_wpewebkit = "2.22.%"
+PREFERRED_VERSION_cog = "0.10.%"
+PREFERRED_VERSION_libwpe = "1.10.%"
+PREFERRED_VERSION_wpewebkit = "2.32.%"
diff --git a/base-image/meta-webkit b/base-image/meta-webkit
index 0fd8a2e..3eface4 160000
--- a/base-image/meta-webkit
+++ b/base-image/meta-webkit
@@ -1 +1 @@
-Subproject commit 0fd8a2eeb86b97799b22f5e5be03bd8132d8eeda
+Subproject commit 3eface464fcd85d5281221a733a255010118257b
diff --git a/base-image/poky b/base-image/poky
index 5ddf7ff..9df1d44 160000
--- a/base-image/poky
+++ b/base-image/poky
@@ -1 +1 @@
-Subproject commit 5ddf7fff992b065ee512878d2fe65f3e35d818cf
+Subproject commit 9df1d44de50b175c736d9f7e52f730fac25e3c12