Update non-yuga configs

Change-Id: Ife93ce03acdae72f655dfb5edaf4bee73dd01557