Use /srv/ instead of /org/ on quantz and nono