diff --git a/roles/float-base-docker/templates/run.sh.j2 b/roles/float-base-docker/templates/run.sh.j2
index f593301925118243a50f04112d2f8d4f0cae735a..79476d1474971202b25d90b7951ca586074303b0 100644
--- a/roles/float-base-docker/templates/run.sh.j2
+++ b/roles/float-base-docker/templates/run.sh.j2
@@ -118,6 +118,11 @@ exec /usr/bin/podman run \
   --rm --name {{ item.service }}-{{ item.container.name }} \
   --no-healthcheck \
   --replace \
+{# Bindmount /etc/hosts to pick up service moves (also disables podman's
+  /etc/hosts generation
+#}
+  --no-hosts \
+  --mount=type=bind,source=/etc/hosts,destination=/etc/hosts,ro=true \
   $opts \
 {% for opt in g.options %}
   {{ opt }} \