diff --git a/changelog/bugfixes/2023-01-17-tmpfiles.md b/changelog/bugfixes/2023-01-17-tmpfiles.md
new file mode 100644
index 00000000000..3e8444bca7e
--- /dev/null
+++ b/changelog/bugfixes/2023-01-17-tmpfiles.md
@@ -0,0 +1 @@
+- Fixed a regression where machines failed to boot if they didn't have the `core` user or group in `/etc/passwd` or `/etc/group` ([baselayout#26](https://github.com/flatcar/baselayout/pull/26))
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index 3966cf427d2..12cd5977d01 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -9,7 +9,7 @@ CROS_WORKON_REPO="https://github.com"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
-	CROS_WORKON_COMMIT="718ae27067797175e3591020932c8873165aaf1d" # flatcar-master
+	CROS_WORKON_COMMIT="3444ce238e8f308d28cecb751796109869efef01" # TODO: flatcar-master
 	KEYWORDS="amd64 arm arm64 x86"
 fi