diff --git a/salt/files/master b/salt/files/master
index bfa6640..e0a67d9 100644
--- a/salt/files/master
+++ b/salt/files/master
@@ -379,8 +379,12 @@ file_ignore_glob:
 # fileserver_backend:
 #   - git
 #   - roots
-{{ get_config('fileserver_backend', '[]') }}
-
+{% if 'fileserver_backend' in master -%}
+fileserver_backend:
+{% for backend in master['fileserver_backend'] -%}
+  - {{ backend }}
+{%- endfor %}
+{% endif %}
 # Git fileserver backend configuration
 # When using the git fileserver backend at least one git remote needs to be
 # defined. The user running the salt master will need read access to the repo.
@@ -393,8 +397,12 @@ file_ignore_glob:
 # environments.
 # Note:  file:// repos will be treated as a remote, so refs you want used must
 # exist in that repo as *local* refs.
-{{ get_config('gitfs_remotes', '[]') }}
-
+{% if 'gitfs_remotes' in master -%}
+gitfs_remotes:
+{% for remote in master['gitfs_remotes'] -%}
+  - {{ remote }}
+{%- endfor %}
+{% endif %}
 
 #####         Pillar settings        #####
 ##########################################