diff --git a/scripts/integration-prepare-homeserver.sh b/scripts/integration-prepare-homeserver.sh
index 9ddcdf17..b29d62aa 100755
--- a/scripts/integration-prepare-homeserver.sh
+++ b/scripts/integration-prepare-homeserver.sh
@@ -13,6 +13,6 @@ echo "Homeserver is up."
 
 sed -i "s/localhost/$IP_ADDRESS/g" test_driver/test_config.dart
 
-curl -XPOST -d '{"username":"alice", "password":"AliceInWonderland", "inhibit_login":true, "auth": {"type":"m.login.dummy"}}' "http://$IP_ADDRESS/_matrix/client/r0/register"
-curl -XPOST -d '{"username":"bob", "password":"JoWirSchaffenDas", "inhibit_login":true, "auth": {"type":"m.login.dummy"}}' "http://$IP_ADDRESS/_matrix/client/r0/register"
-curl -XPOST -d '{"username":"trudy", "password":"HaveIBeenPwned", "inhibit_login":true, "auth": {"type":"m.login.dummy"}}' "http://$IP_ADDRESS/_matrix/client/r0/register"
+curl -fS --retry 3 -XPOST -d '{"username":"alice", "password":"AliceInWonderland", "inhibit_login":true, "auth": {"type":"m.login.dummy"}}' "http://$IP_ADDRESS/_matrix/client/r0/register"
+curl -fS --retry 3 -XPOST -d '{"username":"bob", "password":"JoWirSchaffenDas", "inhibit_login":true, "auth": {"type":"m.login.dummy"}}' "http://$IP_ADDRESS/_matrix/client/r0/register"
+curl -fS --retry 3 -XPOST -d '{"username":"trudy", "password":"HaveIBeenPwned", "inhibit_login":true, "auth": {"type":"m.login.dummy"}}' "http://$IP_ADDRESS/_matrix/client/r0/register"
diff --git a/scripts/integration-server-dendrite.sh b/scripts/integration-server-dendrite.sh
index 56c118f3..ab20d1fa 100755
--- a/scripts/integration-server-dendrite.sh
+++ b/scripts/integration-server-dendrite.sh
@@ -10,5 +10,5 @@ docker run --rm --entrypoint="" \
   -tls-cert /mnt/server.crt \
   -tls-key /mnt/server.key
 
- docker run -d --volume="$(pwd)/test_driver/dendrite/data":/etc/dendrite:rw \
+docker run -d --volume="$(pwd)/test_driver/dendrite/data":/etc/dendrite:rw \
   --name dendrite -p 80:8008 matrixdotorg/dendrite-monolith:latest -really-enable-open-registration
diff --git a/scripts/integration-server-synapse.sh b/scripts/integration-server-synapse.sh
index 9e54fb1d..c16804f1 100755
--- a/scripts/integration-server-synapse.sh
+++ b/scripts/integration-server-synapse.sh
@@ -1,3 +1,5 @@
 #!/usr/bin/env bash
-chown -R 991:991 test_driver/synapse
-docker run -d --name synapse --user 991:991 --volume="$(pwd)/test_driver/synapse/data":/data:rw -p 80:80 matrixdotorg/synapse:latest
+docker run -d --name synapse --tmpfs /data \
+    --volume="$(pwd)/test_driver/synapse/data/homeserver.yaml":/data/homeserver.yaml:rw \
+    --volume="$(pwd)/test_driver/synapse/data/localhost.log.config":/data/localhost.log.config:rw \
+    -p 80:80 matrixdotorg/synapse:latest