Next little API Docker rework

Merged JuniorJPDJ requested to merge docker-fixes into develop

Merge request reports