diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 620603b..8fb3749 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -29,24 +29,24 @@ repos:
           - commit-msg
 
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.1
     hooks:
       - id: codespell
 
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.35.1
+    rev: v1.37.1
     hooks:
       - id: yamllint
         args: [-c=.yamllint]
 
   - repo: https://github.com/3mdeb/hooks
-    rev: v0.1.3
+    rev: v0.1.7
     hooks:
       - id: namespell
         args: [--fix]
 
   - repo: https://github.com/priv-kweihmann/oelint-adv
-    rev: 6.6.2
+    rev: 8.1.2
     hooks:
       - id: oelint-adv
         args: [--rulefile=.oelint-ruleset.json, --hide=info, --quiet]
diff --git a/conf/layer.conf b/conf/layer.conf
index 9cef414..7e2a3d2 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -9,4 +9,8 @@ BBFILE_PRIORITY_dasharo = "80"
 
 LAYERVERSION_dasharo = "1"
 
-LAYERSERIES_COMPAT_dasharo = "scarthgap master"
+LAYERSERIES_COMPAT_dasharo = "whinlatter master"
+
+# See this comment:
+# https://github.com/Dasharo/meta-dasharo/pull/7#issuecomment-3052659291
+PREFERRED_VERSION_converged-security-suite = "2.6.0"
diff --git a/recipes-bsp/flashrom/flashrom_git.bb b/recipes-bsp/flashrom/flashrom_git.bb
index f45aed7..d3ccc85 100644
--- a/recipes-bsp/flashrom/flashrom_git.bb
+++ b/recipes-bsp/flashrom/flashrom_git.bb
@@ -12,6 +12,4 @@ BRANCH = "dasharo-release"
 SRC_URI = "git://github.com/Dasharo/flashrom.git;branch=${BRANCH};protocol=https"
 SRCREV = "a961af7a39138216660b410a4a0bec48ef0fdd35"
 
-S = "${WORKDIR}/git"
-
 inherit meson pkgconfig
diff --git a/recipes-bsp/fwupd/fwupd-efi_1.2.bb b/recipes-bsp/fwupd/fwupd-efi_1.2.bb
index 77517c2..5381523 100644
--- a/recipes-bsp/fwupd/fwupd-efi_1.2.bb
+++ b/recipes-bsp/fwupd/fwupd-efi_1.2.bb
@@ -7,9 +7,9 @@ DEPENDS = "gnu-efi"
 
 SRC_URI = "\
     git://github.com/fwupd/fwupd-efi;protocol=https;branch=main \
-    file://cc.patch"
+    file://cc.patch \
+"
 SRCREV = "8de5918507dcc797e612aac688d6b60b90053f54"
-S = "${WORKDIR}/git"
 
 COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux"
 
@@ -20,8 +20,7 @@ SBAT_DISTRO_ID ?= "${DISTRO}"
 SBAT_DISTRO_SUMMARY ?= "${DISTRO_NAME}"
 SBAT_DISTRO_URL ?= ""
 
-EXTRA_OEMESON += "\
-    -Defi-cc=${@meson_array('CC', d)}\
+EXTRA_OEMESON += " \
     -Defi-ld='${HOST_PREFIX}ld' \
     -Defi-includedir=${STAGING_INCDIR}/efi \
     -Defi-libdir=${STAGING_LIBDIR} \
@@ -29,7 +28,7 @@ EXTRA_OEMESON += "\
     -Defi_sbat_distro_summary='${SBAT_DISTRO_SUMMARY}' \
     -Defi_sbat_distro_url='${SBAT_DISTRO_URL}' \
     -Defi_sbat_distro_pkgname='${PN}' \
-    -Defi_sbat_distro_version='${PV}'\
+    -Defi_sbat_distro_version='${PV}' \
 "
 
 # The compile assumes GCC at present
diff --git a/recipes-bsp/fwupd/fwupd_2.0.1.bb b/recipes-bsp/fwupd/fwupd_2.0.1.bb
index 661c99a..764a5e4 100644
--- a/recipes-bsp/fwupd/fwupd_2.0.1.bb
+++ b/recipes-bsp/fwupd/fwupd_2.0.1.bb
@@ -9,8 +9,6 @@ SRC_URI = "git://git@github.com/Dasharo/fwupd;protocol=https;branch=dasharo-rele
 
 SRCREV = "1ad6f5156dae1d54963bd3999a89a86567216af2"
 
-S = "${WORKDIR}/git"
-
 inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages
 
 GIDOCGEN_MESON_OPTION = 'docs'
diff --git a/recipes-bsp/txe-secure-boot/files/a5df001.diff b/recipes-bsp/txe-secure-boot/files/a5df001.diff
index 64a17cc..89ef24f 100644
--- a/recipes-bsp/txe-secure-boot/files/a5df001.diff
+++ b/recipes-bsp/txe-secure-boot/files/a5df001.diff
@@ -18,6 +18,7 @@ it is something that they should worry about.
 
 This commit tries to explain what actually happens here.
 
+Upstream-Status: Pending
 Change-Id: Iaa2678f5ae7c243811484c0567ced97ae0b3fc0a
 Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
 ---
diff --git a/recipes-bsp/txe-secure-boot/smmstoretool_git.bb b/recipes-bsp/txe-secure-boot/smmstoretool_git.bb
index 1489530..b8350f0 100644
--- a/recipes-bsp/txe-secure-boot/smmstoretool_git.bb
+++ b/recipes-bsp/txe-secure-boot/smmstoretool_git.bb
@@ -2,33 +2,33 @@ SUMMARY = "Offline SMMSTORE variable modification tool"
 HOMEPAGE = "https://github.com/coreboot/coreboot"
 
 LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "\
-    file://${WORKDIR}/git/LICENSES/GPL-2.0-or-later.txt;md5=261bea1168c0bdfa73232ee90df11eb6\
+LIC_FILES_CHKSUM = " \
+    file://${UNPACKDIR}/${BP}/LICENSES/GPL-2.0-or-later.txt;md5=261bea1168c0bdfa73232ee90df11eb6 \
 "
 
 PV = "1.0+git${SRCPV}"
 
 SRC_URI = " \
-    git://github.com/coreboot/coreboot.git;branch=main;protocol=https\
-    file://a5df001.diff;patchdir=${WORKDIR}/git\
+    git://github.com/coreboot/coreboot.git;branch=main;protocol=https \
+    file://a5df001.diff;patchdir=${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX} \
 "
 
 SRCREV = "602653abed391ae1b1445ad86d0f05b8b5b678cb"
 
 inherit pkgconfig
 
-S = "${WORKDIR}/git/util/smmstoretool"
+S = "${UNPACKDIR}/${BP}/util/smmstoretool"
 
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-EXTRA_OEMAKE = ' \
-               DESTDIR="${D}" \
-               PREFIX="${prefix}" \
-               '
+EXTRA_OEMAKE = " \
+    DESTDIR="${D}" \
+    PREFIX="${prefix}" \
+"
 
 do_install() {
     oe_runmake install
 }
 
-FILES:${PN} += "\
-    ${bindir}/smmstoretool\
+FILES:${PN} += " \
+    ${bindir}/smmstoretool \
 "
diff --git a/recipes-dasharo/dasharo-configuration-utility/dasharo-configuration-utility_git.bb b/recipes-dasharo/dasharo-configuration-utility/dasharo-configuration-utility_git.bb
index 0f7ad44..ba3a97d 100644
--- a/recipes-dasharo/dasharo-configuration-utility/dasharo-configuration-utility_git.bb
+++ b/recipes-dasharo/dasharo-configuration-utility/dasharo-configuration-utility_git.bb
@@ -14,8 +14,6 @@ SRC_URI = "\
 
 SRCREV = "6817e69d8eab55bc72725a3be4a8627b8d71c31b"
 
-S = "${WORKDIR}/git"
-
 RDEPENDS:${PN} = " \
     bash \
     cbfstool \
diff --git a/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb b/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb
index e195afb..a1b2423 100644
--- a/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb
+++ b/recipes-support/dasharo-ectool/dasharo-ectool_0.3.8.bb
@@ -64,5 +64,3 @@ SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5c
 SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
 SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-
-S = "${WORKDIR}/git"
diff --git a/recipes-tests/converged-security-suite/converged-security-suite_2.6.0.bb b/recipes-tests/converged-security-suite/converged-security-suite_2.6.0.bb
new file mode 100644
index 0000000..caa4a42
--- /dev/null
+++ b/recipes-tests/converged-security-suite/converged-security-suite_2.6.0.bb
@@ -0,0 +1,27 @@
+SUMMARY = "Converged Security Suite's txt-suite"
+HOMEPAGE = "https://github.com/9elements/converged-security-suite"
+SECTION = "devel"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
+
+SRC_URI = "https://github.com/9elements/converged-security-suite/releases/download/v2.6.0/txt-suite"
+SRC_URI[sha256sum] = "1fc1ddae8369ae7938abaca797491b99f56d3f3acd5e951dc368c33482662eaa"
+
+S = "${UNPACKDIR}"
+
+do_install() {
+    install -d ${D}${bindir}
+    # install -m 0755 ${S}/amd-suite ${D}${bindir}
+    # install -m 0755 ${S}/bg-prov ${D}${bindir}
+    # install -m 0755 ${S}/bg-suite ${D}${bindir}
+    # install -m 0755 ${S}/pcr0tool ${D}${bindir}
+    # install -m 0755 ${S}/txt-prov ${D}${bindir}
+    install -m 0755 ${S}/txt-suite ${D}${bindir}
+}
+
+PACKAGES =+ "${PN}-amd ${PN}-bg ${PN}-txt ${PN}-tools"
+
+FILES:${PN}-amd += "${bindir}/amd-suite"
+FILES:${PN}-bg += "${bindir}/bg-prov ${bindir}/bg-suite"
+FILES:${PN}-txt += "${bindir}/txt-prov ${bindir}/txt-suite"
+FILES:${PN}-tools += "${bindir}/pcr0tool"
diff --git a/recipes-tests/converged-security-suite/converged-security-suite_2.8.2.bb b/recipes-tests/converged-security-suite/converged-security-suite_2.8.2.bb
new file mode 100644
index 0000000..cc1b970
--- /dev/null
+++ b/recipes-tests/converged-security-suite/converged-security-suite_2.8.2.bb
@@ -0,0 +1,22 @@
+SUMMARY = "Converged Security Suite's txt-suite"
+HOMEPAGE = "https://github.com/9elements/converged-security-suite"
+SECTION = "devel"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
+
+GO_IMPORT = "github.com/9elements/${BPN}"
+GO_EXTRA_LDFLAGS:append = " -X main.gitcommit=${SRCREV} -X main.gittag=${PV}"
+
+inherit go-mod
+
+SRC_URI = " \
+    git://${GO_IMPORT}.git;protocol=https;branch=main;destsuffix=${GO_SRCURI_DESTSUFFIX} \
+"
+SRCREV = "ba64392f925cee348bee70173b1286710e255fe2"
+
+PACKAGES =+ "${PN}-amd ${PN}-bg ${PN}-txt ${PN}-tools"
+
+FILES:${PN}-amd += "${bindir}/amd-suite"
+FILES:${PN}-bg += "${bindir}/bg-prov ${bindir}/bg-suite"
+FILES:${PN}-txt += "${bindir}/txt-prov ${bindir}/txt-suite"
+FILES:${PN}-tools += "${bindir}/pcr0tool"