diff --git a/testing/docker-compose.yml b/testing/docker-compose.yml
index 89c1551c..5b65cc27 100644
--- a/testing/docker-compose.yml
+++ b/testing/docker-compose.yml
@@ -130,9 +130,9 @@ services:
       - "/bin/sh"
       - "-c"
       - if [ ! -f "/out/c4gh.sec.pem" ]; then wget -qO- "https://github.com/neicnordic/crypt4gh/releases/latest/download/crypt4gh_linux_x86_64.tar.gz" | tar zxf -;
-        ./crypt4gh generate -n c4gh -p privatekeypass && mv *.pem /out/; fi
+        ./crypt4gh generate -n /shared/c4gh -p privatekeypass; fi;
     volumes:
-      - /tmp:/out
+      - shared:/shared
   ## auth is here only for providing the /info endpoint, no other functionality will work with current configuration
   auth:
     profiles: ["login"]
@@ -141,19 +141,22 @@ services:
     depends_on:
       oidc:
         condition: service_healthy
+      keygen:
+          condition: service_completed_successfully
     environment:
       - ELIXIR_ID=sda-cli
       - ELIXIR_PROVIDER=http://${DOCKERHOST:-localhost}:9090
       - ELIXIR_SECRET=wHPVQaYXmdDHg  #not used but required so that auth starts
       - S3INBOX=s3.example.com
-      - PUBLICFILE=/c4gh.pub.pem
+      - PUBLICFILE=/shared/c4gh.pub.pem
       - RESIGNJWT=false
     extra_hosts:
       - ${DOCKERHOST:-localhost}:host-gateway
     volumes:
-      - /tmp/c4gh.pub.pem:/c4gh.pub.pem
+      - shared:/shared
     ports:
       - 8080:8080
 volumes:
   data:
   dbdata:
+  shared: