Make container in sync with bays and pods

fix attributes etc.

Change-Id: I72405b10ed936ab6f23f254f4b0fced61a80ed02