diff --git a/kernel/Makefile b/kernel/Makefile
index 78ad5b94..914b50d7 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -15,6 +15,7 @@
 KSOURCE ?= https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.18.5.tar.xz
 KIMAGE ?= kernel-build:0.1
 CURDIR := $(shell pwd)
+GIT_VERSION := $(shell git -C $(CURDIR) rev-parse --short=12 HEAD 2>/dev/null || echo unknown)
 
 .DEFAULT_GOAL := all
 
@@ -36,6 +37,7 @@ endif
 		--rm \
 		--memory 16g \
 		-v ${CURDIR}:/kernel \
+		--env LOCALVERSION=-cz-${GIT_VERSION} \
 		--cwd /kernel \
 		${KIMAGE} \
 		/bin/bash -c "./build.sh"
diff --git a/kernel/build.sh b/kernel/build.sh
index f59a20de..2f3b5c45 100755
--- a/kernel/build.sh
+++ b/kernel/build.sh
@@ -22,6 +22,6 @@ cp /kernel/config-arm64 /kbuild/.config
 (
   cd /kbuild
   make olddefconfig && \
-    make -j$((`nproc`-1)) && \
+    make -j$((`nproc`-1)) LOCALVERSION="${LOCALVERSION}" && \
     cp arch/arm64/boot/Image /kernel/vmlinux
 )
diff --git a/kernel/config-arm64 b/kernel/config-arm64
index 488d61c9..e24642df 100644
--- a/kernel/config-arm64
+++ b/kernel/config-arm64
@@ -160,6 +160,7 @@ CONFIG_CGROUPS=y
 CONFIG_PAGE_COUNTER=y
 # CONFIG_CGROUP_FAVOR_DYNMODS is not set
 CONFIG_MEMCG=y
+CONFIG_MEMCG_V1=y
 CONFIG_MEMCG_KMEM=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_WRITEBACK=y
@@ -172,6 +173,7 @@ CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_HUGETLB=y
 CONFIG_CPUSETS=y
+CONFIG_CPUSETS_V1=y
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y