Make corrections to build stage

Merged Grahn, Ethan Kalob requested to merge fix-docker-build into main

Merge request reports