diff --git a/.SRCINFO b/.SRCINFO
index 0f5ab0007cc41..2e85b1399dea0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nvidia-390xx-utils
 	pkgver = 390.157
-	pkgrel = 9
+	pkgrel = 10
 	url = https://www.nvidia.com/
 	arch = x86_64
 	license = custom
@@ -8,6 +8,8 @@ pkgbase = nvidia-390xx-utils
 	source = nvidia-drm-outputclass.conf
 	source = nvidia-390xx-utils.sysusers
 	source = nvidia-390xx.rules
+	source = systemd-homed-override.conf
+	source = systemd-suspend-override.conf
 	source = https://us.download.nvidia.com/XFree86/Linux-x86_64/390.157/NVIDIA-Linux-x86_64-390.157.run
 	source = kernel-6.2.patch
 	source = kernel-6.3.patch
@@ -20,6 +22,8 @@ pkgbase = nvidia-390xx-utils
 	b2sums = 8e24aea70b139185bd682b080d32aeda673e6e92b45a90e6f6e0d736674180400bc8bd1aa5c66b8d033fc9d5e0cfffed456a87298bd93a3afbbc30b8dc48c4e9
 	b2sums = c1da4ce5784e43385465913a95053a3e54f800aac6f1b49f33e2a77504d76da5e6db6ec7074fbe7ba5f52dcef9e1ebaa620942c33ff825a56caba5c9c8b0d1be
 	b2sums = 67e32932eeddda8fef667d25c34faf7b3a02f01cf9c15a97e5613bd44a0e8dcf7396e25399a52701f55dd18054c689720f237bb07d5bd580394d8dc8c9d05534
+	b2sums = a797a5bca65281ba35ed535f625dd997e649b91064226b59f3288c833f2f358fd3dea32674e0f5968de1eb025e4872e4b8b7883c5dfdb1f7116257ddfae4fe22
+	b2sums = b8ada501cc9a88d440d91efaeddb52b4bba7582d2dbc6fdefcf109a8a8a2a030070aa8567569eacaa30b1bb9447c0a90b4907a9bba850bed4a4ad284c6f0f575
 	b2sums = 44b855cd11f3b2f231f9fb90492ae2e67a67ea3ea83c413e7c90956d38c9730a8bd0321281ae03c6afce633d102f5b499aed25622b9bfd31bdd2c98f0717e95b
 	b2sums = dd1153903badbb9c2401c583a983ce5a413da2afffa6dd3ef6e839933a1c994518d5bfbcaf6800496e0d40785a4e7eb0770c8a739fe231ad3085c541bcb3f2b2
 	b2sums = 09f674b2bd55d40df072b70598b78d6a4e57f80a974f99d39b9cd95e0e20cd5698b9b48671b5cb85fcda780d4badc84c8caa5104d2a5c5f85b37841109101701
diff --git a/PKGBUILD b/PKGBUILD
index c05a4bee3c5ae..24013a03cc663 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 pkgbase=nvidia-390xx-utils
 pkgname=('nvidia-390xx-utils' 'opencl-nvidia-390xx' 'nvidia-390xx-dkms')
 pkgver=390.157
-pkgrel=9
+pkgrel=10
 arch=('x86_64')
 url="https://www.nvidia.com/"
 license=('custom')
@@ -17,6 +17,8 @@ _pkg="NVIDIA-Linux-x86_64-${pkgver}"
 source=('nvidia-drm-outputclass.conf'
         'nvidia-390xx-utils.sysusers'
         'nvidia-390xx.rules'
+        'systemd-homed-override.conf'
+        'systemd-suspend-override.conf'
         "https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
         kernel-6.2.patch
         kernel-6.3.patch
@@ -29,6 +31,8 @@ source=('nvidia-drm-outputclass.conf'
 b2sums=('8e24aea70b139185bd682b080d32aeda673e6e92b45a90e6f6e0d736674180400bc8bd1aa5c66b8d033fc9d5e0cfffed456a87298bd93a3afbbc30b8dc48c4e9'
         'c1da4ce5784e43385465913a95053a3e54f800aac6f1b49f33e2a77504d76da5e6db6ec7074fbe7ba5f52dcef9e1ebaa620942c33ff825a56caba5c9c8b0d1be'
         '67e32932eeddda8fef667d25c34faf7b3a02f01cf9c15a97e5613bd44a0e8dcf7396e25399a52701f55dd18054c689720f237bb07d5bd580394d8dc8c9d05534'
+        'a797a5bca65281ba35ed535f625dd997e649b91064226b59f3288c833f2f358fd3dea32674e0f5968de1eb025e4872e4b8b7883c5dfdb1f7116257ddfae4fe22'
+        'b8ada501cc9a88d440d91efaeddb52b4bba7582d2dbc6fdefcf109a8a8a2a030070aa8567569eacaa30b1bb9447c0a90b4907a9bba850bed4a4ad284c6f0f575'
         '44b855cd11f3b2f231f9fb90492ae2e67a67ea3ea83c413e7c90956d38c9730a8bd0321281ae03c6afce633d102f5b499aed25622b9bfd31bdd2c98f0717e95b'
         'dd1153903badbb9c2401c583a983ce5a413da2afffa6dd3ef6e839933a1c994518d5bfbcaf6800496e0d40785a4e7eb0770c8a739fe231ad3085c541bcb3f2b2'
         '09f674b2bd55d40df072b70598b78d6a4e57f80a974f99d39b9cd95e0e20cd5698b9b48671b5cb85fcda780d4badc84c8caa5104d2a5c5f85b37841109101701'
@@ -241,6 +245,13 @@ package_nvidia-390xx-utils() {
 
     install -Dm644 "${srcdir}/nvidia-390xx.rules" "$pkgdir"/usr/lib/udev/rules.d/60-nvidia-390xx.rules
 
+    # Fix for system freeze upon systemctl suspend/hibernate since systemd v256
+    install -Dm644 "${srcdir}"/systemd-homed-override.conf "${pkgdir}"/usr/lib/systemd/systemd-homed.service.d/10-nvidia-no-freeze-session.conf
+    install -Dm644 "${srcdir}"/systemd-suspend-override.conf "${pkgdir}"/usr/lib/systemd/systemd-suspend.service.d/10-nvidia-no-freeze-session.conf
+    install -Dm644 "${srcdir}"/systemd-suspend-override.conf "${pkgdir}"/usr/lib/systemd/systemd-suspend-then-hibernate.service.d/10-nvidia-no-freeze-session.conf
+    install -Dm644 "${srcdir}"/systemd-suspend-override.conf "${pkgdir}"/usr/lib/systemd/systemd-hibernate.service.d/10-nvidia-no-freeze-session.conf
+    install -Dm644 "${srcdir}"/systemd-suspend-override.conf "${pkgdir}"/usr/lib/systemd/systemd-hybrid-sleep.service.d/10-nvidia-no-freeze-session.conf
+
     echo "blacklist nouveau" | install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
     echo "nvidia-uvm" | install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf"
 
diff --git a/systemd-homed-override.conf b/systemd-homed-override.conf
new file mode 100644
index 0000000000000..605d11333826b
--- /dev/null
+++ b/systemd-homed-override.conf
@@ -0,0 +1,2 @@
+[Service]
+Environment="SYSTEMD_HOME_LOCK_FREEZE_SESSION=false"
diff --git a/systemd-suspend-override.conf b/systemd-suspend-override.conf
new file mode 100644
index 0000000000000..2a45482ff718d
--- /dev/null
+++ b/systemd-suspend-override.conf
@@ -0,0 +1,2 @@
+[Service]
+Environment="SYSTEMD_SLEEP_FREEZE_USER_SESSIONS=false"