diff --git a/.docker-base/Dockerfile b/.docker-base/Dockerfile
index 923924e75e03c6ca8346b17cdf87eda78efd766f..02c7d5c3045f527c1f17c678633c0f42ee8ce3a5 100644
--- a/.docker-base/Dockerfile
+++ b/.docker-base/Dockerfile
@@ -1,12 +1,12 @@
 # Use docker as parent image
-FROM docker:19.03.0
+FROM docker:20.10
 
 # http://bugs.python.org/issue19846
 ENV LANG C.UTF-8
 
 # install dependencies
 RUN apk add --no-cache py3-pip python3 python3-dev gcc make \
-    git bash curl gettext  py3-requests 
+    git bash curl gettext  py3-requests
 RUN apk add --no-cache libffi-dev openssl-dev libc-dev libxslt libxslt-dev \
     libxml2 libxml2-dev
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ebbefaa39650ddaff45b856a8a4d44a2ac495d1..73a9abb0b5a525ddb74ddbf33003b03e35c1cacf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,8 +58,8 @@ test:
       - cd .docker 
       - /bin/sh ./run.sh
       - cd .. 
-      - docker logs docker_caosdb-server_1 &> caosdb_log.txt
-      - docker logs docker_sqldb_1 &> mariadb_log.txt
+      - docker logs docker-caosdb-server-1 &> caosdb_log.txt
+      - docker logs docker-sqldb-1 &> mariadb_log.txt
       - docker-compose -f .docker/docker-compose.yml down
       - rc=`cat .docker/result`  
       - exit $rc