diff --git a/dovecot/handlers/main.yml b/dovecot/handlers/main.yml
index ac2a9d33dbacd55048bdaa8512a30b335e385cd2..9f0e6958d5e69f86315ff94e58e0c7dba9831818 100644
--- a/dovecot/handlers/main.yml
+++ b/dovecot/handlers/main.yml
@@ -1,5 +1,5 @@
 ---
 
 - name: restart dovecot
-  service: name=dovecto state=restarted
+  service: name=dovecot state=restarted
 
diff --git a/dovecot/tasks/main.yml b/dovecot/tasks/main.yml
index ee20fda794f50d44db6b8e8e8b20f863c117f2ce..add2bf4fea5bc4599b55820d8c41321ccf21fbcc 100644
--- a/dovecot/tasks/main.yml
+++ b/dovecot/tasks/main.yml
@@ -9,21 +9,22 @@
     - dovecot-managesieved
     - dovecot-sieve
   tags: 
-    - packages
     - dovecot
+    - mail
 
 - name: ensure all configs are present
   template: src={{item.src}} dest={{item.dest}}
   with_items:
-    - { src: 'templates/dovecot.j2', dest: '/etc/dovecot/dovecot.conf' }
-    - { src: 'templates/conf.d/10-auth.conf.j2', dest: '/etc/splat/conf.d/10-auth.conf' }
-    - { src: 'templates/conf.d/10-mail.conf.j2', dest: '/etc/splat/conf.d/10-mail.conf' }
-    - { src: 'templates/conf.d/10-master.conf.j2', dest: '/etc/splat/conf.d/10-master.conf' }
-    - { src: 'templates/conf.d/10-ssl.conf.j2', dest: '/etc/splat/conf.d/10-ssl.conf' }
-    - { src: 'templates/conf.d/auth-passwdfile.conf.ext.j2', dest: '/etc/splat/conf.d/auth-passwdfile.conf.ext.j2' }
+    - { src: 'templates/dovecot.conf.j2', dest: '/etc/dovecot/dovecot.conf' }
+    - { src: 'templates/conf.d/10-auth.conf.j2', dest: '/etc/dovecot/conf.d/10-auth.conf' }
+    - { src: 'templates/conf.d/10-mail.conf.j2', dest: '/etc/dovecot/conf.d/10-mail.conf' }
+    - { src: 'templates/conf.d/10-master.conf.j2', dest: '/etc/dovecot/conf.d/10-master.conf' }
+    - { src: 'templates/conf.d/10-ssl.conf.j2', dest: '/etc/dovecot/conf.d/10-ssl.conf' }
+    - { src: 'templates/conf.d/auth-passwdfile.conf.ext.j2', dest: '/etc/dovecot/conf.d/auth-passwdfile.conf.ext' }
   notify:
     - restart dovecot
   tags:
-    - config
     - dovecot
+    - mail
+