diff --git a/changelog/bugfixes/2026-08-06-baselayout-nss-files.md b/changelog/bugfixes/2026-08-06-baselayout-nss-files.md
new file mode 100644
index 00000000000..91cf0526045
--- /dev/null
+++ b/changelog/bugfixes/2026-08-06-baselayout-nss-files.md
@@ -0,0 +1 @@
+- Added missing symlinks protocols, services, rpc, networks from /usr/share/baselayout to /etc. ([Flatcar#1852](https://github.com/flatcar/Flatcar/issues/1852))
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/Manifest
index 8c98ec9901e..fcf2a864bda 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/Manifest
@@ -1 +1 @@
-DIST flatcar-baselayout-9cd8630fd00a78f1af2812791dda0331db963ba7.tar.gz 38900 BLAKE2B 256c5c373f717cd0ec5c68d723f47951be95ec691040124bc1259cf9453a2f3a5ac798c2c6ba4f5722b777f95eabeb0a4b00100b3700893da096b12efc6b8031 SHA512 cebb53beb7ac41c00083dbe89e0c263911423d95d21ffb27541c0449bc10a1c7b4bc383e4c9256afa4d87a3bebb54f7e08691e785aea0afc3c53e5eb71562626
+DIST flatcar-baselayout-509343f640e48feced4c861f14100c60457e55b9.tar.gz 38900 BLAKE2B 9bc6e37f7abd879e75563ed84699dd4c870d0f940c35727aace4ad43ff093c0ce161cd8ea68fc4aeea27c9e45c2d1ab18f20c8346484a768a2bb91da1c4ba19f SHA512 30bb32bd29035c0b0f8c3a5d02a2191b80282b0bd28cfbf8a331bf5293163052c1056c7531fa77739dae8fbc9d23c443bee137ba02f5d4de0cbb0bc068fc706e
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r22.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r23.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r22.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-3.6.8-r23.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild
index 4b53d97abbe..5c5da8ebe23 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/flatcar/baselayout.git"
 	inherit git-r3
 else
-	EGIT_VERSION="9cd8630fd00a78f1af2812791dda0331db963ba7" # flatcar-master
+	EGIT_VERSION="509343f640e48feced4c861f14100c60457e55b9" # flatcar-master
 	SRC_URI="https://github.com/flatcar/baselayout/archive/${EGIT_VERSION}.tar.gz -> flatcar-${PN}-${EGIT_VERSION}.tar.gz"
 	S="${WORKDIR}/${PN}-${EGIT_VERSION}"
 	KEYWORDS="amd64 arm64"