diff --git a/data/Dockerfiles/acme/Dockerfile b/data/Dockerfiles/acme/Dockerfile
index 1554e6a8..44e7030b 100644
--- a/data/Dockerfiles/acme/Dockerfile
+++ b/data/Dockerfiles/acme/Dockerfile
@@ -4,13 +4,29 @@ LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
 
 RUN apk add --update --no-cache \
 	bash \
-	acme-client \
 	curl \
 	openssl \
 	bind-tools \
 	jq \
+  libressl-dev \
+  libbsd-dev \
+  libseccomp-dev \
 	mariadb-client \
-  tini
+  tini \
+  make \
+  gcc \
+  libressl \
+  libc-dev \
+  linux-headers \
+  ca-certificates \
+  && curl -s https://kristaps.bsd.lv/acme-client/snapshots/acme-client-portable.tgz | tar xfvz - \
+  && cd acme-client-* \
+  && sed -i 's/LE-SA-v1.1.1-August-1-2016.pdf/LE-SA-v1.2-November-15-2017.pdf/g' main.c \
+  && make \
+  && make install \
+  && cd .. \
+  && rm -rf acme-client-* \
+  && apk del libressl-dev libbsd-dev libseccomp-dev libc-dev linux-headers
 
 COPY docker-entrypoint.sh /srv/docker-entrypoint.sh
 
diff --git a/data/Dockerfiles/acme/docker-entrypoint.sh b/data/Dockerfiles/acme/docker-entrypoint.sh
index a859684d..d29d812e 100755
--- a/data/Dockerfiles/acme/docker-entrypoint.sh
+++ b/data/Dockerfiles/acme/docker-entrypoint.sh
@@ -8,6 +8,11 @@ if [[ "${SKIP_LETS_ENCRYPT}" =~ ^([yY][eE][sS]|[yY])+$ ]]; then
   exec $(readlink -f "$0")
 fi
 
+echo "Waiting for Docker API..."
+until ping dockerapi -c1 > /dev/null; do
+  sleep 1
+done
+
 ACME_BASE=/var/lib/acme
 SSL_EXAMPLE=/var/lib/ssl-example
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 62e5e499..cc97cbce 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -252,7 +252,7 @@ services:
       depends_on:
         - nginx-mailcow
         - mysql-mailcow
-      image: mailcow/acme:1.23
+      image: mailcow/acme:1.24
       build: ./data/Dockerfiles/acme
       dns:
         - 172.22.1.254