Better dockerizing :+1: