admin yaml stragglers

Change-Id: I6034ec14aca6665a22ab2fa66b4b2e9a6da99ab2