diff --git a/roles/cvmfs_server_meta_info/tasks/main.yml b/roles/cvmfs_server_meta_info/tasks/main.yml
index 93c7ce02..f817dd4d 100644
--- a/roles/cvmfs_server_meta_info/tasks/main.yml
+++ b/roles/cvmfs_server_meta_info/tasks/main.yml
@@ -7,7 +7,7 @@
     group: root
     mode: 0644
   become: true
-  when: (cvmfs_repositories | length) > 0
+  when: (cvmfs_repositories | default(eessi_cvmfs_repositories, true) | length) > 0
 
 - name: Create meta information for each CVMFS repository
   ansible.builtin.include_tasks: repo_meta_info.yml
@@ -18,6 +18,6 @@
       recommended-stratum0: "http://{{ item.stratum0 }}/cvmfs/{{ item.repository }}"
       recommended-stratum1s: "{{ eessi_cvmfs_server_urls | selectattr('domain', 'in', item.repository) |
                                  map(attribute='urls') | map('regex_replace', '@fqrn@', item.repository) }}"
-  with_items: "{{ cvmfs_repositories | default(eessi_cvmfs_repositories) }}"
-  when: "'cvmfsstratum0servers' in group_names or cvmfs_role == 'stratum0'"
+  with_items: "{{ cvmfs_repositories | default(eessi_cvmfs_repositories, true) }}"
+  when: ('cvmfsstratum0servers' in group_names and inventory_hostname in groups['cvmfsstratum0servers']) or cvmfs_role == 'stratum0'
 ...