diff --git a/roles/backup_client/handlers/cleanup_gnupg.yml b/roles/backup_client/handlers/cleanup_gnupg.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a5bcd375f902f0caf4dcb1f9a14c0843890c4a21
--- /dev/null
+++ b/roles/backup_client/handlers/cleanup_gnupg.yml
@@ -0,0 +1,23 @@
+---
+
+# Can't use file module, since one of the files (GnuPG socket)
+# seems to disappear in middle of operation). This is change between
+# Jessie and Stretch.
+- name: Remove current keyring
+  command: "rm -rf /etc/duply/main/gnupg"
+  args:
+    warn: false
+  tags:
+    # [ANSIBLE0012] Commands should not change things if nothing needs doing
+    #   This task is invoked only if user is very specific about requiring to
+    #   run the handlers manually as a way to bring the system to consistency
+    #   after interrupted runs.
+    - skip_ansible_lint
+
+- name: Create keyring directory
+  file:
+    path: "/etc/duply/main/gnupg"
+    state: directory
+    owner: root
+    group: root
+    mode: 0700