diff --git a/roles/mail/tasks/main.yml b/roles/mail/tasks/main.yml
index 87b0f1b..b68dbc6 100644
--- a/roles/mail/tasks/main.yml
+++ b/roles/mail/tasks/main.yml
@@ -127,16 +127,15 @@
   become_user: amavis
 
 - name: Download GPG key for Sought ruleset
-  get_url: url=http://yerp.org/rules/GPG.KEY dest=/etc/spamassassin/sought_ruleset.key
+  get_url: url=http://yerp.org/rules/GPG.KEY dest=/etc/spamassassin/sought.key
 
 - name: Import GPG key for Sought ruleset
+  become: yes
   become_user: debian-spamd
-  register: gpg_import
-  command: sa-update --import /etc/spamassassin/sought_ruleset.key
-  changed_when: 'gpg_import.stderr.find("imported") != -1'
+  shell: sa-update --gpghomedir /var/lib/spamassassin/sa-update-keys --import /etc/spamassassin/sought.key && touch sought.imported chdir=/var/lib/spamassassin creates=sought.imported
 
 - name: Enable sa-update cron-job
-  cron: name=sa-update minute="0" hour="*/6" job="/usr/bin/sa-update -v --gpgkey 6C6191E3 --channel sought.rules.yerp.org --channel updates.spamassassin.org"
+  cron: name=sa-update minute="0" hour="*/6" job="/usr/bin/sa-update -v --gpghomedir /var/lib/spamassassin/sa-update-keys --gpgkey 6C6191E3 --channel sought.rules.yerp.org --channel updates.spamassassin.org"
 
 - name: Enable spamd cron-job
   copy: src={{ item }} dest=/etc/{{ item }}