Reduce number of layers in Docker container

[helrond]

Is your feature request related to a problem? Please describe.

There are some opportunities for reducing the number of layers in the Docker file, which could speed up build times by enabling more meaningful caching.

Describe the solution you'd like

Combine and reorder lines in Dockerfile for a more efficient build process.