diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile
index 1489a724..ec5a8467 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/usrpro/MailuStart.git#egg=mailustart
 # Shared layer between dovecot and postfix
-RUN pip3 install podop
+RUN pip3 install git+https://github.com/Nebukadneza/Podop.git@fix_py37
 # 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 074cf6a1..50be8d5c 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/usrpro/MailuStart.git#egg=mailustart
 # Shared layer between dovecot and postfix
-RUN pip3 install podop
+RUN pip3 install git+https://github.com/Nebukadneza/Podop.git@fix_py37
 # Image specific layers under this line
 
 RUN apk add --no-cache postfix postfix-pcre cyrus-sasl-plain rsyslog