diff --git a/config/ansible/templates/geesefs-mount.sh.j2 b/config/ansible/templates/geesefs-mount.sh.j2
index 543e833..9b8c693 100644
--- a/config/ansible/templates/geesefs-mount.sh.j2
+++ b/config/ansible/templates/geesefs-mount.sh.j2
@@ -4,15 +4,25 @@
 export AWS_ACCESS_KEY_ID="{{ lookup('community.general.onepassword', 'mfk2qgnaplgtk6xmfc3r6w6neq', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='AWS_ACCESS_KEY_ID') }}"
 export AWS_SECRET_ACCESS_KEY="{{ lookup('community.general.onepassword', 'mfk2qgnaplgtk6xmfc3r6w6neq', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='AWS_SECRET_ACCESS_KEY') }}"
 
-# Mount GeeseFS
-sudo -E geesefs \
-  --endpoint https://hel1.your-objectstorage.com \
-  --list-type=2 \
-  --disable-xattr \
-  --no-implicit-dir \
-  --no-dir-object \
-  -o allow_other \
-  --uid 1000 \
-  --gid 100 \
-  mvl-sh \
-  /mnt/object_storage
+# Ensure the mount is available at all times
+while true; do
+  if ! mountpoint -q /mnt/object_storage; then
+    sudo -E geesefs \
+      --endpoint https://hel1.your-objectstorage.com \
+      --list-type=2 \
+      --disable-xattr \
+      --no-implicit-dir \
+      --no-dir-object \
+      -o allow_other \
+      --uid 1000 \
+      --gid 100 \
+      mvl-sh \
+      /mnt/object_storage
+    
+    # If it failed die
+    if [ $? -ne 0 ]; then
+      exit 1
+    fi
+  fi
+  sleep 5
+done