Rework configuration files and fix network connections