diff --git a/docker/federation-test/run-tests.sh b/docker/federation-test/run-tests.sh
index b2d319ddd..fdb0e129b 100755
--- a/docker/federation-test/run-tests.sh
+++ b/docker/federation-test/run-tests.sh
@@ -7,6 +7,11 @@ popd
 
 sudo docker build ../../ --file ../federation/Dockerfile --tag lemmy-federation:latest
 
+for Item in alpha beta gamma ; do
+  sudo mkdir -p volumes/pictrs_$Item
+  sudo chown -R 991:991 volumes/pictrs_$Item
+done
+
 sudo docker-compose --file ../federation/docker-compose.yml --project-directory . up -d
 
 pushd ../../ui
diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml
index 900f7c9ca..d5f9a5225 100644
--- a/docker/federation/docker-compose.yml
+++ b/docker/federation/docker-compose.yml
@@ -10,6 +10,7 @@ services:
     volumes:
       # Hack to make this work from both docker/federation/ and docker/federation-test/
       - ../federation/nginx.conf:/etc/nginx/nginx.conf
+    restart: on-failure
     depends_on:
       - lemmy_alpha
       - pictrs_alpha