diff --git a/meta-chromium/conf/layer.conf b/meta-chromium/conf/layer.conf
index d2de2af72..1ddabff3b 100644
--- a/meta-chromium/conf/layer.conf
+++ b/meta-chromium/conf/layer.conf
@@ -9,6 +9,6 @@ BBFILE_PATTERN_chromium-browser-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_chromium-browser-layer = "7"
 
 LAYERVERSION_chromium-browser-layer = "1"
-LAYERSERIES_COMPAT_chromium-browser-layer = "scarthgap styhead walnascar"
+LAYERSERIES_COMPAT_chromium-browser-layer = "scarthgap styhead walnascar whinlatter"
 
 LAYERDEPENDS_chromium-browser-layer = "clang-layer core openembedded-layer"
diff --git a/meta-chromium/recipes-browser/chromium/chromium.inc b/meta-chromium/recipes-browser/chromium/chromium.inc
index e2a4f585f..d87519f25 100644
--- a/meta-chromium/recipes-browser/chromium/chromium.inc
+++ b/meta-chromium/recipes-browser/chromium/chromium.inc
@@ -6,7 +6,7 @@ CVE_PRODUCT = "chromium:chromium google:chrome"
 SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz"
 SRC_URI[sha256sum] = "7c765bd13df842a28bb52279b8d711411ac6082151473e07bd70b9a482c0a0ac"
 
-S = "${WORKDIR}/chromium-${PV}"
+S = "${UNPACKDIR}/chromium-${PV}"
 
 # GCC is not tested or officially supported upstream, and supporting it here
 # requires an ever-growing amount of backports and custom patches, without any
@@ -604,3 +604,15 @@ LIC_FILES_CHKSUM = "\
     file://${S}/url/third_party/mozilla/LICENSE.txt;md5=437ced1e9b232651b0912a9594da43b2 \
     file://${S}/v8/LICENSE;md5=3f722db07a0a940a6c859c5c9c2c78fd \
     "
+
+unlink_gitfiles() {
+    rm -f ${S}/.git-blame-ignore-revs
+    rm -f ${S}/.gitallowed
+    rm -f ${S}/.gitattributes
+    rm -f ${S}/.gitignore
+    rm -f ${S}/.gitmodules
+}
+
+do_unpack:append() {
+    bb.build.exec_func('unlink_gitfiles', d)
+}
diff --git a/meta-chromium/recipes-browser/chromium/gn-native_136.0.7103.113.bb b/meta-chromium/recipes-browser/chromium/gn-native_136.0.7103.113.bb
index 5a3225be9..674283371 100644
--- a/meta-chromium/recipes-browser/chromium/gn-native_136.0.7103.113.bb
+++ b/meta-chromium/recipes-browser/chromium/gn-native_136.0.7103.113.bb
@@ -6,7 +6,7 @@ require chromium.inc
 
 inherit native
 
-S = "${WORKDIR}/chromium-${PV}"
+S = "${UNPACKDIR}/chromium-${PV}"
 
 # bootstrap.py --no_clean hardcodes the build location to out_bootstrap.
 # Omitting --no_clean causes the script to create a temporary directory with a