Add missing fields, fix identation, correct based in reviews

Signed-off-by: Ricardo Pchevuzinske Katz <[email protected]>

Fix the kep metadata with correct values

Signed-off-by: Abhishek Raut <[email protected]>

Author: rikatz