Move some settings to env, remove spaces from apt command