diff --git a/tools/packaging/kernel/configs/fragments/arm64/base.conf b/tools/packaging/kernel/configs/fragments/arm64/base.conf
index 5ce4ac8c8..b5202d876 100644
--- a/tools/packaging/kernel/configs/fragments/arm64/base.conf
+++ b/tools/packaging/kernel/configs/fragments/arm64/base.conf
@@ -37,7 +37,6 @@ CONFIG_ARM64_PAN=y
 CONFIG_ARM64_CNP=y
 CONFIG_ARM64_PMEM=y
 CONFIG_ARM64_RAS_EXTN=y
-CONFIG_ARM64_UAO=y
 # end of ARMv8.2 architectural feature
 
 CONFIG_NO_HZ_FULL=y
diff --git a/tools/packaging/kernel/configs/fragments/build-type/arm-experimental/no.conf b/tools/packaging/kernel/configs/fragments/build-type/arm-experimental/no.conf
new file mode 100644
index 000000000..e69de29bb
diff --git a/tools/packaging/kernel/configs/fragments/common/fs.conf b/tools/packaging/kernel/configs/fragments/common/fs.conf
index 4a702e092..ae4e3255f 100644
--- a/tools/packaging/kernel/configs/fragments/common/fs.conf
+++ b/tools/packaging/kernel/configs/fragments/common/fs.conf
@@ -26,7 +26,6 @@ CONFIG_FS_POSIX_ACL=y
 CONFIG_EXPORTFS=y
 CONFIG_EXPORTFS_BLOCK_OPS=y
 CONFIG_FILE_LOCKING=y
-CONFIG_MANDATORY_FILE_LOCKING=y
 # A bunch of these are required for systemd at least.
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y