diff --git a/auth/docker/agent.sh b/auth/docker/agent.sh
index 6802794..f734c62 100644
--- a/auth/docker/agent.sh
+++ b/auth/docker/agent.sh
@@ -1,9 +1,12 @@
 #!/bin/bash
 . ./d.props
+
 docker run \
-  -it \
-  --mount 'type=volume,src=aaf_config,dst=/opt/app/osaaf,volume-driver=local' \
-  --name aaf_agent_$USER \
-  ${ORG}/${PROJECT}/aaf_config:${VERSION} \
-  /bin/bash $*
-docker container rm aaf_agent_$USER > /dev/null
+    -it \
+    --rm \
+    --mount 'type=volume,src=aaf_config,dst='$CONF_ROOT_DIR',volume-driver=local' \
+    --add-host="$HOSTNAME:$HOST_IP" \
+    --add-host="aaf.osaaf.org:$HOST_IP" \
+    --name aaf_agent_$USER \
+    ${ORG}/${PROJECT}/aaf_config:${VERSION} \
+    /bin/bash "$@"