diff --git a/pog/cli.py b/pog/cli.py
index fb7637d..d7038d2 100644
--- a/pog/cli.py
+++ b/pog/cli.py
@@ -12,6 +12,9 @@ def __init__(self, config=None, kwargs=None, pog_cmd=None):
         self.kwargs = kwargs or {}
 
     def set_keyfiles(self, keyfiles):
+        for k in ('keyfile', 'decryption-keyfile', 'encryption-keyfile'):
+            self.config.pop(k, None)
+
         for f in keyfiles:
             if f.endswith('.decrypt'):
                 self.config['decryption-keyfile'] = f