diff --git a/docker/bootstrap/bootstrap.sh b/docker/bootstrap/bootstrap.sh
index ec63d56412..4957dbd47c 100755
--- a/docker/bootstrap/bootstrap.sh
+++ b/docker/bootstrap/bootstrap.sh
@@ -35,15 +35,15 @@ if [ ! -e "${lets_path}/live//options-ssl-nginx.conf" ] \
     echo "### Requesting Let's Encrypt certificate for $root_domain ..."
     # Format domain_args with the cartesian product of `root_domain` and `subdomains`
 
-    email_arg="--email $email"
-    domain_arg="-d $domain"
+    email_arg="--email ${email}"
+    domain_arg=$([ "${domain_root}" = "${domain}" ] && printf "-d ${domain_root}" || printf "-d ${domain_root} -d ${domain}")
 
     # Ask Let's Encrypt to create certificates, if challenge passed
     certbot certonly --webroot -w /var/www/certbot \
-            $email_arg \
-            $domain_arg \
+            ${email_arg} \
+            ${domain_arg} \
             --non-interactive \
-            --rsa-key-size $rsa_key_size \
+            --rsa-key-size ${rsa_key_size} \
             --agree-tos \
             --force-renewal
 
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index 46f9fdb4e3..b9315a3e69 100644
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -1,9 +1,9 @@
 FROM php:fpm-alpine
 
 RUN apk update && apk add gettext-dev icu-dev zlib-dev libpng-dev gmp-dev \
-        postgresql-dev postgresql-client composer > /dev/null
+        mariadb-dev mariadb-client postgresql-dev postgresql-client composer > /dev/null
 
-ARG exts=" bcmath exif gd gettext gmp intl mysqli opcache pdo_mysql"
+ARG exts=" bcmath exif gd gettext gmp intl mysqli opcache pdo pdo_mysql mysqli pdo_pgsql pgsql"
 
 RUN apk add --virtual .phpize-deps $PHPIZE_DEPS \
         && rm -rf /usr/share/php7 \