diff --git a/Dockerfile b/Dockerfile
index a1b287ee..24e6d63c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM 0x2620/pandora-base:latest
+FROM code.0x2620.org/0x2620/pandora-base:latest
 
 LABEL maintainer="0x2620@0x2620.org"
 
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 916b9887..d0bbfa1f 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -66,7 +66,7 @@ if [ "$action" = "tasks" ]; then
         -A app worker \
         -Q default,celery -n ${name} \
         --pidfile /run/pandora/tasks.pid \
-        --maxtasksperchild 1000 \
+        --max-tasks-per-child 1000 \
         -l INFO
 fi
 if [ "$action" = "cron" ]; then
diff --git a/docker/setup-docker-compose.sh b/docker/setup-docker-compose.sh
index 09f9d392..71028bf0 100755
--- a/docker/setup-docker-compose.sh
+++ b/docker/setup-docker-compose.sh
@@ -1,18 +1,18 @@
 #!/bin/sh
-docker run code.0x2620.org/0x2620/pandora docker-compose.yml > docker-compose.yml
+docker run --rm code.0x2620.org/0x2620/pandora docker-compose.yml > docker-compose.yml
 if [ ! -e .env ]; then
-    docker run code.0x2620.org/0x2620/pandora .env > .env
+    docker run --rm code.0x2620.org/0x2620/pandora .env > .env
     echo .env >> .gitignore
 fi
 if [ ! -e config.jsonc ]; then
-    docker run code.0x2620.org/0x2620/pandora config.jsonc > config.jsonc
+    docker run --rm code.0x2620.org/0x2620/pandora config.jsonc > config.jsonc
 fi
 cat > README.md << EOF
 pan.do/ra docker instance
 
 this folder was created with
 
-    docker run code.0x2620.org/0x2620/pandora setup | sh
+    docker run --rm code.0x2620.org/0x2620/pandora setup | sh
 
 To start pan.do/ra adjust the files in this folder: