[TASK] Proper rendering of mountpoints

Fixes #541 and inspired by @benjaminrau's 15e7b9fee6