Split up by docker and non docker