Config option to allow container versions

Change-Id: I76d358a11f694ad07d40c8e42743b7a7186b1f88