diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index ab20a0788ba2a70d2770af5863826d7b674e7db5..5cdfc4d1e3be085557812dd64cae495d5988f7bc 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       - caosnet
     volumes:
       - type: bind
-        source: "$EXEPATH/.docker/cert"
+        source: ./cert
         target: /opt/caosdb/cert
       - type: bind
         source: "$EXEPATH/integrationtests/full_test/extroot"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6df21a92342130daf08fc94a7fba2c7731ba9160..f0732fd2550a655595bc386eae4c71f5b64752a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,6 +31,7 @@ services:
 
 stages: 
   - setup
+  - cert
   - style
   - test
 
@@ -42,7 +43,7 @@ test:
     entrypoint: ["/bin/sh", "-c"]
   script:
       - if [[ "$CAOSDB_TAG" == "" ]]; then
-            CAOSDB_TAG=master-latest;
+            CAOSDB_TAG=dev-latest;
         fi
       - echo $CAOSDB_TAG
       - docker login -u testuser -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
@@ -57,6 +58,7 @@ test:
       - docker-compose -f .docker/docker-compose.yml down
       - rc=`cat result`  
       - exit $rc
+  dependencies: [cert]
   artifacts:
     paths:
       - caosdb_log.txt
@@ -79,7 +81,17 @@ build-testenv:
         -t $CI_REGISTRY_IMAGE:latest .
       - docker push $CI_REGISTRY_IMAGE:latest
 
-
+cert:
+  tags: [notls]
+  stage: cert
+  image: $CI_REGISTRY_IMAGE:latest
+  artifacts:
+    paths:
+      - .docker/cert/
+    expire_in: 1 week
+  script:
+      - cd .docker
+      - CAOSHOSTNAME=caosdb-server ./cert.sh
 style:
   tags: [notls]
   stage: style