diff --git a/.gitignore b/.gitignore
index 61039ad..9210eec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,6 @@
 
 /setup.yml
 /setup.yml.srchash
+
+/group_vars/mash_servers
+/group_vars/mash_servers.srchash
diff --git a/group_vars/mash_servers b/group_vars/mash_servers_all
similarity index 100%
rename from group_vars/mash_servers
rename to group_vars/mash_servers_all
diff --git a/justfile b/justfile
index fd09aaf..557704b 100644
--- a/justfile
+++ b/justfile
@@ -39,7 +39,7 @@ install-service service *extra_args:
 setup-all *extra_args: (run-tags "setup-all,start" extra_args)
 
 # Runs the playbook with the given list of arguments
-run +extra_args: requirements-yml setup-yml
+run +extra_args: requirements-yml setup-yml group-vars-mash-servers
     ansible-playbook -i inventory/hosts setup.yml {{ extra_args }}
 
 # Runs the playbook with the given list of comma-separated tags and optional arguments
@@ -68,6 +68,10 @@ requirements-yml:
 setup-yml:
     @just --justfile {{ justfile() }} _ensure_file_prepared {{ justfile_directory() }}/setup.all.yml {{ justfile_directory() }}/setup.yml
 
+# Prepares the group_vars/mash_servers file
+group-vars-mash-servers:
+    @just --justfile {{ justfile() }} _ensure_file_prepared {{ justfile_directory() }}/group_vars/mash_servers_all {{ justfile_directory() }}/group_vars/mash_servers
+
 _ensure_file_prepared src_path dst_path:
     #!/usr/bin/env sh
     hash_path={{ dst_path }}.srchash