diff --git a/Dockerfile b/Dockerfile
index 91fc0d3..c98247f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,29 +1,28 @@
 # syntax=docker/dockerfile:1
 
-ARG MSMTP_VERSION=1.8.23
-ARG ALPINE_VERSION=3.17
-ARG XX_VERSION=1.2.1
+ARG MSMTP_VERSION=1.8.25
+ARG ALPINE_VERSION=3.18
+ARG XX_VERSION=1.3.0
 
 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
 FROM --platform=$BUILDPLATFORM alpine:${ALPINE_VERSION} AS base
 COPY --from=xx / /
-RUN apk --update --no-cache add clang curl file make pkgconf tar xz
+RUN apk --update --no-cache add clang curl file lld make musl-dev pkgconfig tar xz
 ARG MSMTP_VERSION
 WORKDIR /src
 RUN curl -sSL "https://marlam.de/msmtp/releases/msmtp-$MSMTP_VERSION.tar.xz" | tar xJv --strip 1
 
 FROM base AS builder
-ENV XX_CC_PREFER_LINKER=ld
 ARG TARGETPLATFORM
 RUN xx-apk --no-cache --no-scripts add g++ gettext-dev gnutls-dev libidn2-dev
 RUN <<EOT
-set -ex
-CXX=xx-clang++ ./configure --host=$(xx-clang --print-target-triple) --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-make -j$(nproc)
-make install
-xx-verify /usr/bin/msmtp
-xx-verify /usr/bin/msmtpd
-file /usr/bin/msmtpd
+  set -ex
+  CC=xx-clang CXX=xx-clang++ ./configure --host=$(xx-clang --print-target-triple) --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make -j$(nproc)
+  make install
+  xx-verify /usr/bin/msmtp
+  xx-verify /usr/bin/msmtpd
+  file /usr/bin/msmtpd
 EOT
 
 FROM crazymax/alpine-s6:${ALPINE_VERSION}-2.2.0.3
diff --git a/README.md b/README.md
index d7a252b..4f395f4 100644
--- a/README.md
+++ b/README.md
@@ -149,9 +149,10 @@ docker compose up -d
 
 ## Contributing
 
-Want to contribute? Awesome! The most basic way to show your support is to star the project, or to raise issues. You
-can also support this project by [**becoming a sponsor on GitHub**](https://github.com/sponsors/crazy-max) or by making
-a [Paypal donation](https://www.paypal.me/crazyws) to ensure this journey continues indefinitely!
+Want to contribute? Awesome! The most basic way to show your support is to star
+the project, or to raise issues. You can also support this project by [**becoming a sponsor on GitHub**](https://github.com/sponsors/crazy-max)
+or by making a [PayPal donation](https://www.paypal.me/crazyws) to ensure this
+journey continues indefinitely!
 
 Thanks again for your support, it is much appreciated! :pray: