diff --git a/roles/pvc/tasks/keydb/main.yml b/roles/pvc/tasks/keydb/main.yml
index d23d27d..b287c86 100644
--- a/roles/pvc/tasks/keydb/main.yml
+++ b/roles/pvc/tasks/keydb/main.yml
@@ -27,6 +27,16 @@
     mode: 0640
   notify: restart keydb
 
+- name: install keydb unit override file
+  template:
+    src: keydb/override.conf.j2
+    dest: /etc/systemd/system/keydb-server.service.d/override.conf
+  register: systemd
+
+- name: reload systemd to apply changes
+  command: systemctl daemon-reload
+  when: systemd.changed
+
 - name: start but disable services (managed by PVC)
   service:
     name: "{{ item }}"
diff --git a/roles/pvc/templates/keydb/override.conf.j2 b/roles/pvc/templates/keydb/override.conf.j2
new file mode 100644
index 0000000..a83de73
--- /dev/null
+++ b/roles/pvc/templates/keydb/override.conf.j2
@@ -0,0 +1,2 @@
+[Service]
+TimeoutStopSec=30