diff --git a/config/hugo/Dockerfile b/config/hugo/Dockerfile
index 461880e..b59ec35 100644
--- a/config/hugo/Dockerfile
+++ b/config/hugo/Dockerfile
@@ -6,16 +6,17 @@ LABEL maintainer="Lieuwe Leene <lieuwe@leene.dev>"
 ARG HUGO_BASE="localhost"
 ARG SSL_ALGO=secp521r1
 
-RUN wget -O - "https://github.com/gohugoio/hugo/releases/download/$(wget -O - https://api.github.com/repos/gohugoio/hugo/releases/latest | grep -om 1 "/v[0-9.]*/hugo_[0-9.]*_Linux-64bit.tar.gz")" | tar -xz -C /tmp \
+RUN wget -O - "https://github.com/gohugoio/hugo/releases/download/$(wget -O - https://api.github.com/repos/gohugoio/hugo/releases/latest | grep -om 1 "v[0-9.]*/hugo_extended_[0-9.]*_Linux-64bit.tar.gz")" | tar -xz -C /tmp \
     && mkdir -p /usr/local/sbin \
     && mv /tmp/hugo /usr/local/sbin/hugo \
     && rm -rf /tmp/${HUGO_ID}_linux_amd64 \
     && rm -rf /tmp/LICENSE.md \
     && rm -rf /tmp/README.md
 
-RUN apk add --update git asciidoctor libc6-compat libstdc++ \
+RUN apk add --update git gcompat asciidoctor libc6-compat libstdc++ \
     && apk upgrade \
     && apk add --no-cache ca-certificates \
+    && ln -s /lib/libc.so.6 /usr/lib/libresolv.so.2 \
     && git clone https://github.com/lleene/hugo-site.git /src \
     && git clone https://github.com/lleene/hermit.git /src/themes/hermit \
     && /usr/local/sbin/hugo -b ${BASE_URL}/ -s /src -d /public --minify
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 1c4a773..c3b037f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -18,12 +18,12 @@ services:
     <<: *defaults
     image: certbot/dns-cloudflare
     container_name: certbot
-    command: certonly --non-interactive --dns-cloudflare --dns-cloudflare-credentials /config/credentials.ini --agree-tos --email admin@${NGINX_HOST} -d ${NGINX_HOST} -d mail.${NGINX_HOST} -d inbox.${NGINX_HOST} -d lieuwe.${NGINX_HOST} -d nextcloud.${NGINX_HOST} -d git.${NGINX_HOST} --server https://acme-v02.api.letsencrypt.org/directory
+    command: certonly --non-interactive --dns-cloudflare --dns-cloudflare-credentials /config/credentials.ini --agree-tos --email admin@${NGINX_HOST} -d ${NGINX_HOST} -d lieuwe.${NGINX_HOST} -d mail.${NGINX_HOST} -d inbox.${NGINX_HOST} -d nextcloud.${NGINX_HOST} -d git.${NGINX_HOST} -d autodiscover.${NGINX_HOST} --server https://acme-v02.api.letsencrypt.org/directory
     volumes:
       - certbot_state:/var/lib/letsencrypt:z
       - nginx_archive:/etc/letsencrypt/archive:z
       - nginx_certs:/etc/letsencrypt/live:z
-      - ./config/nginx/credentials.ini:/config/credentials.ini:ro,z
+      - ./config/nginx/credentials.ini:/config/credentials.ini:z
 
   hugo-html:
     networks: