diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-fs/zfs b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-fs/zfs
new file mode 100644
index 0000000000..62adecfe84
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-fs/zfs
@@ -0,0 +1,4 @@
+cros_post_src_install_rm_systemd_masks() {
+	rm "${D}$(systemd_get_systemunitdir)"/zfs-load-key.service
+	rm "${D}$(systemd_get_systemunitdir)"/zfs-import.service
+}
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-fs/zfs-kmod b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-fs/zfs-kmod
new file mode 100644
index 0000000000..55536d82a8
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/env/sys-fs/zfs-kmod
@@ -0,0 +1,2 @@
+: ${MODULES_ROOT:=$(echo ${SYSROOT}/lib/modules/*)}
+KERNEL_DIR="${MODULES_ROOT}/build"