diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf
index 54cb732..770c8d9 100644
--- a/salt/files/master.d/f_defaults.conf
+++ b/salt/files/master.d/f_defaults.conf
@@ -652,6 +652,30 @@ gitfs_remotes:
 # repository and defaults to the repository root.
 {{ get_config('gitfs_root', 'somefolder/otherfolder') }}
 
+# The gitfs_env_whitelist and gitfs_env_blacklist parameters allow for greater
+# control over which branches/tags are exposed as fileserver environments.
+{% if 'gitfs_env_whitelist' in cfg_master -%}
+gitfs_env_whitelist:
+  {%- for git_env in cfg_master['gitfs_env_whitelist'] %}
+  - {{ git_env }}
+  {%- endfor -%}
+{% else -%}
+# gitfs_env_whitelist:
+#   - base
+#   - v1.*
+{% endif %}
+
+{% if 'gitfs_env_blacklist' in cfg_master -%}
+gitfs_env_blacklist:
+  {%- for git_env in cfg_master['gitfs_env_blacklist'] %}
+  - {{ git_env }}
+  {%- endfor -%}
+{% else -%}
+# gitfs_env_blacklist:
+#   - bug/*
+#   - feature/*
+{% endif %}
+
 
 #####         Pillar settings        #####
 ##########################################