diff --git a/features/_scicommon/file.include/etc/modprobe.d/disabled_efipstore.conf b/features/_scicommon/file.include/etc/modprobe.d/disabled_efipstore.conf
new file mode 100644
index 00000000..1e92dd6c
--- /dev/null
+++ b/features/_scicommon/file.include/etc/modprobe.d/disabled_efipstore.conf
@@ -0,0 +1,2 @@
+blacklist efi_pstore
+install efi_pstore /bin/true
diff --git a/features/_scicommon/file.include/etc/systemd/system/systemd-pstore.service b/features/_scicommon/file.include/etc/systemd/system/systemd-pstore.service
new file mode 100644
index 00000000..08f6956a
--- /dev/null
+++ b/features/_scicommon/file.include/etc/systemd/system/systemd-pstore.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Platform Persistent Storage Archival
+Documentation=man:systemd-pstore(8)
+ConditionDirectoryNotEmpty=/sys/fs/pstore
+ConditionVirtualization=!container
+DefaultDependencies=no
+Conflicts=shutdown.target
+Before=sysinit.target shutdown.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/lib/systemd/systemd-pstore
+RemainAfterExit=yes
+StateDirectory=systemd/pstore
+
+[Install]
+WantedBy=sysinit.target