diff --git a/salt/master.sls b/salt/master.sls
index 29cf496eb..10d5bb3c1 100644
--- a/salt/master.sls
+++ b/salt/master.sls
@@ -61,6 +61,7 @@ salt-master:
       - file: salt-master
            {%- endif %}
       - file: remove-old-master-conf-file
+    - order: last
     {% endif %}
     {% if salt_settings.master_remove_config %}
 remove-default-master-conf-file:
diff --git a/salt/minion.sls b/salt/minion.sls
index 199733247..0963282d9 100644
--- a/salt/minion.sls
+++ b/salt/minion.sls
@@ -107,6 +107,7 @@ salt-minion:
     - name: {{ salt_settings.minion_service }}
     - watch:
       - file: remove-old-minion-conf-file
+    - order: last
     {% endif %}
     {%- if not salt_settings.restart_via_at %}
   cmd.run: