diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile
index a4a4c3a3..6b0490b9 100644
--- a/core/dovecot/Dockerfile
+++ b/core/dovecot/Dockerfile
@@ -6,7 +6,7 @@ RUN apk add --no-cache \
 # Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx
 RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart
 # Shared layer between dovecot and postfix
-RUN pip3 install git+https://github.com/Mailu/Podop.git
+RUN pip3 install "podop>=0.2.5"
 # Image specific layers under this line
 RUN apk add --no-cache \
   dovecot dovecot-lmtpd dovecot-pop3d dovecot-submissiond dovecot-pigeonhole-plugin rspamd-client \
diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile
index c298efa2..a6a4cf01 100644
--- a/core/postfix/Dockerfile
+++ b/core/postfix/Dockerfile
@@ -6,7 +6,7 @@ RUN apk add --no-cache \
 # Shared layer between admin, rspamd, postfix, dovecot, unbound and nginx
 RUN pip3 install git+https://github.com/Mailu/MailuStart.git#egg=mailustart
 # Shared layer between dovecot and postfix
-RUN pip3 install git+https://github.com/Mailu/Podop.git
+RUN pip3 install "podop>=0.2.5"
 # Image specific layers under this line
 
 RUN apk add --no-cache postfix postfix-pcre cyrus-sasl-plain