diff --git a/roles/debian/files/DefaultTimeoutStopSec.conf b/roles/debian/files/DefaultTimeoutStopSec.conf
new file mode 100644
index 0000000..1131f8c
--- /dev/null
+++ b/roles/debian/files/DefaultTimeoutStopSec.conf
@@ -0,0 +1,3 @@
+# Kill services after a shorter time (upstream default is up to 120 seconds).
+[Manager]
+DefaultTimeoutStopSec=15
diff --git a/roles/debian/tasks/main.yml b/roles/debian/tasks/main.yml
index 8fef5fc..7129043 100644
--- a/roles/debian/tasks/main.yml
+++ b/roles/debian/tasks/main.yml
@@ -25,3 +25,4 @@
 - import_tasks: packagekit.yml
   when: gui == true
 - import_tasks: timezone.yml
+- import_tasks: systemd.yml
diff --git a/roles/debian/tasks/systemd.yml b/roles/debian/tasks/systemd.yml
new file mode 100644
index 0000000..16ee2a0
--- /dev/null
+++ b/roles/debian/tasks/systemd.yml
@@ -0,0 +1,44 @@
+---
+# Copyright 2022 Anthony Perkins
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+- name: Create /etc/systemd/system.conf.d
+  become: true
+  ansible.builtin.file:
+    path: "/etc/systemd/system.conf.d"
+    state: directory
+    mode: '0755'
+- name: Create /etc/systemd/system.conf.d/DefaultTimeoutStopSec.conf
+  become: true
+  ansible.builtin.copy:
+    src: DefaultTimeoutStopSec.conf
+    dest: "/etc/systemd/system.conf.d/DefaultTimeoutStopSec.conf"
+  register: system_conf_d
+- name: Create /etc/systemd/user.conf.d
+  become: true
+  ansible.builtin.file:
+    path: "/etc/systemd/user.conf.d"
+    state: directory
+    mode: '0755'
+- name: Create /etc/systemd/user.conf.d/DefaultTimeoutStopSec.conf
+  become: true
+  ansible.builtin.copy:
+    src: DefaultTimeoutStopSec.conf
+    dest: "/etc/systemd/user.conf.d/DefaultTimeoutStopSec.conf"
+  register: user_conf_d
+- name: Reload systemd
+  become: true
+  ansible.builtin.systemd:
+    daemon_reload: true
+  when: system_conf_d.changed == true or user_conf_d.changed == true