Merge branch 'main' of https://git.mysmce.com/heliocloud/heliocloud-docker-images into main