diff --git a/files/master b/files/master
index aa9a7a986..42e7866d9 100644
--- a/files/master
+++ b/files/master
@@ -37,8 +37,9 @@ log_file: /opt/so/log/salt/master
 #
 file_roots:
   base:
-    - /opt/so/saltstack/default/salt
     - /opt/so/saltstack/local/salt
+    - /opt/so/saltstack/default/salt
+
 
 # The master_roots setting configures a master-only copy of the file_roots dictionary,
 # used by the state compiler.
@@ -54,8 +55,8 @@ file_roots:
 
 pillar_roots:
   base:
-    - /opt/so/saltstack/default/pillar
     - /opt/so/saltstack/local/pillar
+    - /opt/so/saltstack/default/pillar
 
 peer:
   .*: