diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/digi-webkit-examples/video-examples_0.1.bb b/meta-digi-dey/dynamic-layers/webkit/recipes-digi/connectcore-demo-example-webkit/video-examples_0.1.bb
similarity index 70%
rename from meta-digi-dey/dynamic-layers/webkit/recipes-browser/digi-webkit-examples/video-examples_0.1.bb
rename to meta-digi-dey/dynamic-layers/webkit/recipes-digi/connectcore-demo-example-webkit/video-examples_0.1.bb
index 88433346e..918effc34 100644
--- a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/digi-webkit-examples/video-examples_0.1.bb
+++ b/meta-digi-dey/dynamic-layers/webkit/recipes-digi/connectcore-demo-example-webkit/video-examples_0.1.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2020 Digi International.
+# Copyright (C) 2020-2022 Digi International.
 
 SUMMARY = "Short videos to demonstrate video playback on the WPE WebKit"
 DESCRIPTION = "This package contains fragments of the short film 'Big Buck Bunny', which are used to demonstrate how WebKit makes use of hardware acceleration for video decoding"
@@ -13,7 +13,15 @@ SRC_URI[sha256sum] = "97389f33d98c52d4311117366f0aa8dc78d00f51a787697af349de4668
 
 S = "${WORKDIR}/${PN}-${PV}"
 
-require digi-webkit-examples.inc
+WEBSERVER_ROOT = "srv/www"
+
+# List of video sample formats
+VIDEO_FORMATS = " \
+    mov \
+    webm \
+"
+# Name of the video sample
+VIDEO_NAME = "big_buck_bunny"
 
 # The package contains video files, no need to configure or compile
 do_configure[noexec] = "1"
@@ -26,3 +34,10 @@ do_install() {
 		install -m 644 ${S}/${VIDEO_NAME}.${format} ${D}/${WEBSERVER_ROOT}/videos
 	done
 }
+
+# All packages involved in the webkit examples install their files in the
+# webserver directory
+FILES:${PN} = "/${WEBSERVER_ROOT}/*"
+
+# Don't generate dbg or dev packages
+PACKAGES = "${PN}"
diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/digi-webkit-examples/webglsamples_git.bb b/meta-digi-dey/dynamic-layers/webkit/recipes-digi/connectcore-demo-example-webkit/webglsamples_git.bb
similarity index 56%
rename from meta-digi-dey/dynamic-layers/webkit/recipes-browser/digi-webkit-examples/webglsamples_git.bb
rename to meta-digi-dey/dynamic-layers/webkit/recipes-digi/connectcore-demo-example-webkit/webglsamples_git.bb
index 05293f767..c74e99efc 100644
--- a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/digi-webkit-examples/webglsamples_git.bb
+++ b/meta-digi-dey/dynamic-layers/webkit/recipes-digi/connectcore-demo-example-webkit/webglsamples_git.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2020 Digi International.
+# Copyright (C) 2020-2022 Digi International.
 
 SUMMARY = "A collection of WebGL samples"
 DESCRIPTION = "This repo contains several examples of the WebGL JavaScript API, which allows web browsers to render 2D and 3D graphics with direct access to the system's GPU."
@@ -11,9 +11,41 @@ SRCBRANCH = "master"
 
 SRC_URI = "${WEBGL_SAMPLES_SRC};branch=${SRCBRANCH}"
 SRCREV = "dc4428bdc6ef2177f71d9e7bab164c43f9e29302"
+
 S = "${WORKDIR}/git"
 
-require digi-webkit-examples.inc
+WEBSERVER_ROOT = "srv/www"
+
+# List of samples we want accesible via the landing page
+WEBGL_SAMPLES = " \
+    aquarium \
+    blob \
+    dynamic-cubemap \
+    electricflower \
+    field \
+    multiple-views \
+    spacerocks \
+    toon-shading \
+"
+# Folders containing elements required by the samples we've selected
+WEBGL_SAMPLE_DEPS = " \
+    colorpicker \
+    css \
+    fishtank \
+    fonts \
+    gradient-editor \
+    images \
+    jquery-ui-1.8.2.custom \
+    js \
+    lots-o-objects \
+    shared \
+    tdl \
+"
+# List of all folders that need to be installed
+WEBGL_REQUIRED = " \
+    ${WEBGL_SAMPLES} \
+    ${WEBGL_SAMPLE_DEPS} \
+"
 
 # The package contains static webpages, no need to configure or compile
 do_configure[noexec] = "1"
@@ -32,3 +64,10 @@ do_install() {
 		     -exec install -Dm 644 "{}" "${D}/${WEBSERVER_ROOT}/{}" \;
 	done
 }
+
+# All packages involved in the webkit examples install their files in the
+# webserver directory
+FILES:${PN} = "/${WEBSERVER_ROOT}/*"
+
+# Don't generate dbg or dev packages
+PACKAGES = "${PN}"