diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a1fa3064132a84c28f0ad7b3ec6de2f0b5243b23..d084139476fe2ea9874549e85dbecf0df06e6326 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ build-tag:
   image: registry.gitlab.eox.at/esa/prism/vs/docker-base-testing:latest
   stage: build
   services:
-    - docker:19.03.12-dind
+    - docker:19.03.13-dind
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
@@ -44,7 +44,7 @@ build-master-staging:
   image: registry.gitlab.eox.at/esa/prism/vs/docker-base-testing:latest
   stage: build
   services:
-    - docker:19.03.12-dind
+    - docker:19.03.13-dind
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
@@ -84,7 +84,7 @@ build:
   image: registry.gitlab.eox.at/esa/prism/vs/docker-base-testing:latest
   stage: build
   services:
-    - docker:19.03.12-dind
+    - docker:19.03.13-dind
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
diff --git a/testing/Dockerfile b/testing/Dockerfile
index e423222bc456c31610997c52d20bebe97d606751..c210be98b71cc94acbfe839b59e6e5518088b0ca 100644
--- a/testing/Dockerfile
+++ b/testing/Dockerfile
@@ -27,7 +27,7 @@
 
 # this image is built manually and pushed to registry.gitlab.eox.at/esa/prism/vs/docker-base-testing
 
-FROM docker:latest
+FROM docker:19.03.13-dind
 
 RUN apk update && apk add bash postgresql-dev gcc g++ python3 python3-dev musl-dev py-pip libffi-dev openssl-dev make gdal==3.1.4-r0 gdal-dev==3.1.4-r0
 
diff --git a/testing/registrar_test.sh b/testing/registrar_test.sh
index 1d3e0aae949070ee26ac6c741be58b5eb0a6fe08..cbf978fbfa81bf86444d2127cfee1325c1be118c 100755
--- a/testing/registrar_test.sh
+++ b/testing/registrar_test.sh
@@ -8,7 +8,7 @@ IFS=","
 
 while read product; do
     docker exec -e OS_PASSWORD=$OS_PASSWORD -i $(docker ps -qf "name=emg-pvs_registrar") \
-        python3 /registrar.py \
+        /wait-initialized.sh && python3 /registrar.py \
             --objects-prefix $product \
             --service-url $SERVICE_URL \
             --reporting-dir "/mnt/reports" \