diff --git a/roles/backup_client/handlers/main.yml b/roles/backup_client/handlers/main.yml
index 9c2c203396b40823746dc78e9bbca2a2712342ff..8ea1258846eae8bf2e41467310321dd4aeb4593d 100644
--- a/roles/backup_client/handlers/main.yml
+++ b/roles/backup_client/handlers/main.yml
@@ -4,9 +4,12 @@
   assemble: dest="/etc/duply/main/include" src="/etc/duply/main/patterns"
             owner=root group=root mode=600 backup=yes
 
-- name: Import encryption public keys
-  command: gpg2 --homedir /etc/duply/main/gnupg --import /etc/duply/main/public_encryption_keys.asc
+- name: Clean-up GnuPG keyring for import of new keys
+  shell: rm -f /etc/duply/main/gnupg/*
 
-- name: Import signing private keys
-  command: gpg2 --homedir /etc/duply/main/gnupg --import /etc/duply/main/private_signing_key.asc
-  when: backup_signing_key is defined
+- name: Import private keys
+  command: gpg2 --homedir /etc/duply/main/gnupg --import /etc/duply/main/private_keys.asc
+
+- name: Import public keys
+  command: gpg2 --homedir /etc/duply/main/gnupg --import /etc/duply/main/public_keys.asc
+  when: backup_additional_encryption_keys