diff --git a/docker/swoole/Dockerfile b/docker/swoole/Dockerfile
index 401fbd08..d86d140f 100644
--- a/docker/swoole/Dockerfile
+++ b/docker/swoole/Dockerfile
@@ -1,74 +1,72 @@
-FROM fedora:37
-
-MAINTAINER Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch>
+FROM apheleia/almalinux9
 
 ARG SWOOLE_VERSION=master
 ENV HOME=/opt/app-root/src
 
-LABEL io.k8s.description="Platform for serving PHP applications under Swoole" \
-      io.k8s.display-name="Swoole ${SWOOLE_VERSION}" \
-      io.openshift.expose-services="8000:http" \
-      io.openshift.tags="builder,php,swoole"
 
-RUN dnf -y update && \
+RUN dnf module reset php && \
+    dnf install -y https://rpms.remirepo.net/enterprise/remi-release-9.rpm && \
+    dnf module -y enable php:remi-8.1 && \
+    dnf module -y enable nodejs:20 && \
     dnf -y install \
+        --setopt=install_weak_deps=False \
+        --setopt 'tsflags=nodocs' \
         composer \
         diffutils \
         file \
         git \
         make \
         npm \
         openssl-devel \
         openssl \
-        curl \
         patch \
         iputils \
         bind-utils \
         mariadb \
         procps-ng \
         php-cli \
         php-common \
         php-devel \
         php-ldap \
         php-mysqlnd \
         php-opcache \
         php-pecl-apcu \
         php-sodium \
         re2c \
         wget && \
     git clone https://github.com/swoole/swoole-src.git/ /swoole-src.git/ && \
         cd /swoole-src.git/ && \
         git checkout -f ${SWOOLE_VERSION} && \
         git clean -d -f -x && \
         phpize --clean && \
         phpize && \
         ./configure \
             --enable-sockets \
             --disable-mysqlnd \
             --enable-openssl && \
         make -j4 && \
         make install && \
         cd / && \
     rm -rf /swoole-src.git/ && \
     dnf -y remove \
         diffutils \
         file \
         make \
         openssl-devel \
         php-devel \
         re2c && \
     dnf clean all && \
     echo "extension=swoole.so" >> /etc/php.d/swoole.ini && \
     php -m 2>&1 | grep -q swoole
 
 RUN id default || (groupadd -g 1001 default && useradd -d /opt/app-root/ -u 1001 -g 1001 default)
 
 USER 1001
 
 WORKDIR ${HOME}
 
 COPY /rootfs /
 
 EXPOSE 8000
 
 CMD [ "/usr/local/bin/usage" ]
diff --git a/docker/webapp/Dockerfile b/docker/webapp/Dockerfile
index 0e657247..94102da0 100755
--- a/docker/webapp/Dockerfile
+++ b/docker/webapp/Dockerfile
@@ -1,30 +1,28 @@
 FROM apheleia/swoole:latest
 
-MAINTAINER Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch>
-
 USER root
 
-RUN dnf -y install findutils gnupg2 git rsync procps-ng php-sodium && \
+RUN dnf -y install findutils gnupg2 git rsync && \
     dnf clean all
 
 EXPOSE 8000
 
 ARG GIT_REF=master
 ARG GIT_REMOTE=https://git.kolab.org/source/kolab.git
 ARG CONFIG=config.prod
 #Set this to prod or dev
 ARG RELEASE_MODE=prod
 COPY build.sh /build.sh
 RUN /build.sh && \
     chgrp -R 0 /opt/app-root/src && \
     chmod -R g=u /opt/app-root/src && \
     chown -R 1001:0 /opt/app-root/src
 
 COPY init.sh /init.sh
 COPY update.sh /update.sh
 
 USER 1001
 
 ENV KOLAB_ROLE=combined
 
 CMD [ "/init.sh" ]