Redefine syntax for guest_environments, simplify and reword
Add docker related syntax