diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b71d9caae894017c61d6085d9208f61f7598ac44..54028a7f5df287b456a6c0373d8e7156afb4fd04 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -93,7 +93,8 @@ docker-bench-security:
         - sed -i -e '/networks/,+3d' $MODIFIED_IMAGE/docker-compose.yml
         # if secrets.example files exist, remove the .example extension to be able to start the container
         - if [[ -d $MODIFIED_IMAGE/secrets ]]; then for i in $MODIFIED_IMAGE/secrets/*.example ; do cp $i $(echo $i| cut -d '.' -f1,2); done; fi;
-        - docker volume create $CONTAINER_NAME
+        # let docker-compose create the required volumes and networks
+        - sed -i -e 's/external: true/external: false/g' $MODIFIED_IMAGE/docker-compose.yml
     script:
         - cd $MODIFIED_IMAGE
         - docker-compose up -d
diff --git a/pica-etherpad/docker-compose.yml b/pica-etherpad/docker-compose.yml
index 6e9a5303c109f5ae2a513cb1a5e9cc6f8d12d703..b824e94ae28356f8bcc19e039aaf68efd40af6f3 100755
--- a/pica-etherpad/docker-compose.yml
+++ b/pica-etherpad/docker-compose.yml
@@ -2,8 +2,8 @@ version : "2.4"
 
 volumes:
   etherpad-db-volume:
-    external: 
-        name: "etherpad-db"
+    external: true
+    name: "etherpad-db"
 
 networks:
   docker_default: