Final deployment configuration tweaks (stable version)