Final infrastructure set-up