Make docker deployment swarm compatible

Gurkiratrequested to merge
deployment into main

This MR includes squashed fix-ups of previous commits for cleaner history.

Merge request reports