diff --git a/apps/stalwart/Dockerfile b/apps/stalwart/Dockerfile
index 1a63628..327cfe8 100644
--- a/apps/stalwart/Dockerfile
+++ b/apps/stalwart/Dockerfile
@@ -21,15 +21,21 @@ RUN         apt update \
             && apt clean \
             && rm -rf /var/lib/apt/lists/*
 
-# Install Stalwart Mail Server
-RUN         curl -sSL https://stalw.art/install.sh | bash
-
 # Create directories
-RUN         mkdir -p /home/container/stalwart-mail \
+RUN         mkdir -p /home/container/stalwart-mail/bin \
             && mkdir -p /home/container/stalwart-mail/data \
             && mkdir -p /home/container/stalwart-mail/certs \
             && mkdir -p /home/container/stalwart-mail/logs
 
+# Install Stalwart Mail Server
+ARG         STALWART_VERSION=0.16.8
+RUN         cd /tmp \
+            && curl -sSL -o stalwart.tar.gz "https://github.com/stalwartlabs/mail-server/releases/download/v${STALWART_VERSION}/stalwart-x86_64-unknown-linux-gnu.tar.gz" \
+            && tar xzf stalwart.tar.gz \
+            && mv stalwart-* /home/container/stalwart-mail/bin/stalwart-mail \
+            && chmod +x /home/container/stalwart-mail/bin/stalwart-mail \
+            && rm -rf /tmp/*
+
 # Setup user
 RUN         useradd -m -d /home/container -s /bin/bash container \
             && chown -R container:container /home/container