diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f9e87de4776b22abcc5088efac65438cd22ce24..1a7e5d9ff85be7fb34a95d210a207aae01a7ae5e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,6 +52,7 @@ pica-ci-base:
 set-variables:
   stage: ci-base
   tags: [build]
+  image: $REGISTRY_PROD/pica-ci-base
   script:
     - chmod +x ./get-modified-image.sh
     - ./get-modified-image.sh
diff --git a/pica-etherpad/entrypoint.sh b/pica-etherpad/entrypoint.sh
index ad3980aa9c7c8fcbc3281888061e949c588a2172..eda98879a10d38f59b9e71a14cb067045ba18aa2 100644
--- a/pica-etherpad/entrypoint.sh
+++ b/pica-etherpad/entrypoint.sh
@@ -28,7 +28,7 @@ RESULT=`mysql -u${ETHERPAD_DB_USER} -p${ETHERPAD_DB_PASSWORD} \
 	-e "SHOW DATABASES LIKE '${ETHERPAD_DB_NAME}'"`
 
 if [ "$RESULT" != $ETHERPAD_DB_NAME ]; then
-	# mysql database does not exist, create it
+	# Mysql database does not exist, create it
 	echo "Creating database ${ETHERPAD_DB_NAME}"
 
 	mysql -u${ETHERPAD_DB_USER} -p${ETHERPAD_DB_PASSWORD} -h${ETHERPAD_DB_HOST} \