More Dockerization Optimizations