diff --git a/.s2i/bin/assemble b/.s2i/bin/assemble
index b1758b3495c740de67cb888e37a93f6964b3bab4..1c26aff8106cff5c75b0193deb56a608a996c0a1 100644
--- a/.s2i/bin/assemble
+++ b/.s2i/bin/assemble
@@ -13,6 +13,3 @@ sed -ri \
 
 echo "Assembling"
 /usr/libexec/s2i/assemble
-
-echo "Extra libs"
-php composer.phar require php-imap/php-imap
diff --git a/Dockerfile b/Dockerfile
index bfe7a58f959d7cdd47e79d149d085184f1f1ef6a..a0d7f16bd68cff139e5cbd82dc7999877affc203 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,5 +8,12 @@ RUN yum install -y \
 RUN yum install -y \
     php-imap
 
+# Fix php-imap location
+RUN cp /etc/php.d/imap.ini /etc/opt/rh/rh-php73/php.d/20-imap.ini
+RUN cp /etc/php.d/imap.ini \
+    /opt/rh/rh-php73/register.content/etc/opt/rh/rh-php73/php.d/20-imap.ini
+RUN cp /usr/lib64/php/modules/imap.so \
+    /opt/rh/rh-php73/root/usr/lib64/php/modules/imap.so
+
 # Make sure the final image runs as unprivileged user
 USER 1001