diff --git a/postfix/config.sls b/postfix/config.sls
index 9121e9a..8378afe 100644
--- a/postfix/config.sls
+++ b/postfix/config.sls
@@ -144,11 +144,11 @@ postfix-config-file-managed-{{ mapping }}:
       - pkg: postfix-init-pkg-installed-postfix
       - file: postfix-config-file-managed-main.cf
   {%- if need_postmap %}
-postfix-config-cmd-wait-{{ mapping }}:
-  cmd.wait:
+postfix-config-cmd-run-{{ mapping }}:
+  cmd.run:
     - name: {{ postfix.xbin_prefix }}/sbin/postmap {{ file_path }}
     - cwd: /
-    - watch:
+    - onchanges:
       - file: postfix-config-file-managed-{{ mapping }}
     - watch_in:
       - service: postfix-init-service-running-postfix
diff --git a/postfix/init.sls b/postfix/init.sls
index 7aebf5f..fa97ef4 100644
--- a/postfix/init.sls
+++ b/postfix/init.sls
@@ -76,11 +76,11 @@ postfix-init-file-managed-alias-database:
       - pkg: postfix-init-pkg-installed-postfix
 
   {%- if need_newaliases %}
-postfix-init-cmd-wait-new-aliases:
-  cmd.wait:
+postfix-init-cmd-run-new-aliases:
+  cmd.run:
     - name: newaliases
     - cwd: /
-    - watch:
+    - onchanges:
       - file: {{ file_path }}
   {%- endif %}
 {% else %}