diff --git a/build-images.sh b/build-images.sh
index 7ef7f9a9..d83b8f34 100644
--- a/build-images.sh
+++ b/build-images.sh
@@ -55,7 +55,7 @@ images+=("${repobase}/${reponame}")
 # davidep: avoid dovecot 2.3.19-r2 - userdb lookup crashes
 #
 reponame="mail-dovecot"
-container=$(buildah from docker.io/library/alpine:3.21.3)
+container=$(buildah from docker.io/library/alpine:3.22.2)
 buildah run "${container}" /bin/sh <<'EOF'
 set -e
 addgroup -g 101 -S vmail
@@ -74,20 +74,8 @@ apk add --no-cache rspamd-client
     mv -v .post-install /usr/local/bin/dovecot-post-install
     rm -rvf "${tmpdir}"
 )
-(
-    apk add --no-cache build-base git autoconf automake libtool dovecot-dev xapian-core-dev  icu-dev
-    mkdir /tmp/build
-    cd /tmp/build
-    git clone https://github.com/slusarz/dovecot-fts-flatcurve.git
-    cd dovecot-fts-flatcurve/
-    ash autogen.sh
-    ./configure --disable-static --with-dovecot=/usr/lib/dovecot/
-    make
-    make install
-    # clean what we installed
-    rm -rf /tmp/build
-    apk del build-base git autoconf automake libtool xapian-core-dev dovecot-dev icu-dev
-)
+# Install pre-built dovecot-fts-flatcurve package from Alpine repository
+apk add --no-cache dovecot-fts-flatcurve
 mkdir -p /var/lib/dovecot/dict/uquota
 mkdir -p /var/lib/umail
 sed -i 's/^!/#!/' /etc/dovecot/conf.d/10-auth.conf
@@ -125,7 +113,7 @@ images+=("${repobase}/${reponame}")
 # Postfix additional image
 #
 reponame="mail-postfix"
-container=$(buildah from docker.io/library/alpine:3.21.3)
+container=$(buildah from docker.io/library/alpine:3.22.2)
 buildah run "${container}" /bin/sh <<EOF
 set -e
 apk add --no-cache postfix gettext sqlite postfix-sqlite postfix-ldap openssl cyrus-sasl-login
@@ -149,7 +137,7 @@ images+=("${repobase}/${reponame}")
 # Rspamd additional image
 #
 reponame="mail-rspamd"
-container=$(buildah from docker.io/library/alpine:3.21.3)
+container=$(buildah from docker.io/library/alpine:3.22.2)
 buildah run "${container}" /bin/sh <<EOF
 set -e
 # Software installation order is important to preserve uid and gid allocation:
@@ -177,7 +165,7 @@ images+=("${repobase}/${reponame}")
 # ClamAV additional image
 #
 reponame="mail-clamav"
-container=$(buildah from docker.io/library/alpine:3.21.3)
+container=$(buildah from docker.io/library/alpine:3.22.2)
 buildah run "${container}" /bin/sh <<'EOF'
 set -e
 apk add --no-cache ncurses bash curl wget rsync bind-tools socat gpg gpg-agent