diff --git a/Containerfile b/Containerfile
index 8ad682c8..a9587181 100644
--- a/Containerfile
+++ b/Containerfile
@@ -750,7 +750,6 @@ RUN /usr/libexec/containerbuild/image-info && \
     ; fi && \
     sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/input-remapper-gtk.desktop && \
     cp "/usr/share/ublue-os/firstboot/yafti.yml" "/usr/etc/yafti.yml" && \
-    sed -i 's/#HandlePowerKey=poweroff/HandlePowerKey=suspend/g' /usr/lib/systemd/logind.conf && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
     sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \
diff --git a/system_files/deck/shared/usr/etc/systemd/logind.conf.d/deck.conf b/system_files/deck/shared/usr/etc/systemd/logind.conf.d/deck.conf
new file mode 100644
index 00000000..008ea062
--- /dev/null
+++ b/system_files/deck/shared/usr/etc/systemd/logind.conf.d/deck.conf
@@ -0,0 +1,2 @@
+HandlePowerKey=suspend
+KillUserProcesses=true