diff --git a/tasks/repo_pre_install.yml b/tasks/repo_pre_install.yml
index 4f47a7c..5117d28 100644
--- a/tasks/repo_pre_install.yml
+++ b/tasks/repo_pre_install.yml
@@ -76,6 +76,15 @@
     systemd_mounts: "{{ repo_server_systemd_mounts }}"
   when: repo_server_systemd_mounts | length > 0
 
+# NOTE(jrosser) ensure there is no race condition between mounting and using the filesystem
+- name: Wait until {{ repo_service_home_folder }} is a mounted
+  command: mountpoint -q {{ repo_service_home_folder }}/repo
+  changed_when: false
+  register: _repo_folder_is_mounted
+  retries: 5
+  delay: 2
+  until: _repo_folder_is_mounted.rc == 0
+
 # NOTE(jrosser) remove this task in release after Z
 - name: Restore repo content from archive into new shared filesystem
   unarchive: