Merge branch 'revert-bb3669f0' into 'develop'

Revert "Preparing develop to be merged with main (docker image tags)"

See merge request !47