diff --git a/roles/pmg/tasks/cleanup.yml b/roles/pmg/tasks/cleanup.yml
index 3a805a6..209bbe6 100644
--- a/roles/pmg/tasks/cleanup.yml
+++ b/roles/pmg/tasks/cleanup.yml
@@ -11,7 +11,9 @@
     - /usr/local/bin/dmarc_reports
     - /etc/cron.d/opendmarc
     - /etc/pmg/templates/main.cf.in
+    - /etc/pmg/templates/master.cf.in
     - /etc/mail/spamassassin/scores.cf
+  notify: pmgconfig sync
   tags: pmg
 
 - name: Disable unused services
diff --git a/roles/pmg/tasks/main.yml b/roles/pmg/tasks/main.yml
index 7d7dc84..b2498ef 100644
--- a/roles/pmg/tasks/main.yml
+++ b/roles/pmg/tasks/main.yml
@@ -63,13 +63,6 @@
   file: path=/etc/pmg/templates state=directory
   tags: pmg
 
-- name: Copy custom templates
-  template: src={{ item }}.j2 dest=/etc/pmg/templates/{{ item }}
-  with_items:
-    - master.cf.in
-  notify: pmgconfig sync
-  tags: pmg
-
 - name: Check if pmg backup dir exists
   stat: path=/var/lib/pmg/backup
   register: pmg_backup