Use container based infrastructure
Fix key-error