diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index d9681621086f763ccdb5c4676943835610e98bd6..c2909e7385673a4a583cfde9181af1dd2fc3ce62 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -7,4 +7,4 @@ RUN git clone https://gitlab.com/caosdb/caosdb-pylib.git && \
 COPY . /git
 RUN rm -r /git/.git && mv /git/.docker/pycaosdb.ini /git 
 WORKDIR /git
-CMD /wait-for-it.sh caosdb-server:10443 -t 120 -- tox
+CMD /wait-for-it.sh caosdb-server:10443 -t 300 -- tox
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bd7cdf9eeb178daf05c9e256e12bd668dd9b5521..5b652fd43d1db79cc0bbc1fad88670bcef5da24a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -73,7 +73,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