diff --git a/.gitignore b/.gitignore
index 8d0d756..a84400f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,4 +58,5 @@ nginx-*.tar.gz*
 nginx-*/
 t/servroot
 response.txt
-valgrind-results.txt
\ No newline at end of file
+valgrind-results.txt
+log.txt
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index bd5c353..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,218 +0,0 @@
-######
-FROM ubuntu:18.04 as ubuntu18-builder
-
-RUN apt-get update && \
-    apt-get install -y build-essential libxslt1-dev
-
-COPY configure /tmp
-COPY config /tmp
-COPY Makefile /tmp
-COPY phantom_token.c /tmp
-ARG NGINX_VERSION
-ENV NGINX_VERSION=$NGINX_VERSION
-ADD nginx-$NGINX_VERSION.tar.gz /tmp/
-
-WORKDIR /tmp
-RUN ./configure && make
-
-######
-FROM ubuntu:20.04 as ubuntu20-builder
-
-RUN apt-get update && \
-    apt-get install -y build-essential wget
-
-COPY configure /tmp
-COPY config /tmp
-COPY Makefile /tmp
-COPY phantom_token.c /tmp
-ARG NGINX_VERSION
-ENV NGINX_VERSION=$NGINX_VERSION
-ADD nginx-$NGINX_VERSION.tar.gz /tmp/
-
-WORKDIR /tmp
-RUN wget https://sourceforge.net/projects/pcre/files/pcre/8.45/pcre-8.45.tar.gz && mkdir -p pcre && tar -xz -C pcre -f pcre-8.45.tar.gz --strip-components=1
-RUN wget https://www.zlib.net/zlib-1.3.tar.gz && mkdir -p zlib && tar -xz -C zlib -f zlib-1.3.tar.gz --strip-components=1
-RUN CONFIG_OPTS="--with-pcre=../pcre --with-zlib=../zlib" ./configure && make
-
-######
-FROM ubuntu:22.04 as ubuntu22-builder
-
-RUN apt-get update && \
-    apt-get install -y build-essential wget
-
-COPY configure /tmp
-COPY config /tmp
-COPY Makefile /tmp
-COPY phantom_token.c /tmp
-ARG NGINX_VERSION
-ENV NGINX_VERSION=$NGINX_VERSION
-ADD nginx-$NGINX_VERSION.tar.gz /tmp/
-
-WORKDIR /tmp
-RUN wget https://sourceforge.net/projects/pcre/files/pcre/8.45/pcre-8.45.tar.gz && mkdir -p pcre && tar -xz -C pcre -f pcre-8.45.tar.gz --strip-components=1
-RUN wget https://www.zlib.net/zlib-1.3.tar.gz && mkdir -p zlib && tar -xz -C zlib -f zlib-1.3.tar.gz --strip-components=1
-RUN CONFIG_OPTS="--with-pcre=../pcre --with-zlib=../zlib" ./configure && make
-
-######
-FROM centos:7 as centos7-builder
-
-RUN yum install -y \
-     gcc pcre-devel zlib-devel make
-
-COPY configure /tmp
-COPY config /tmp
-COPY Makefile /tmp
-COPY phantom_token.c /tmp
-ARG NGINX_VERSION
-ENV NGINX_VERSION=$NGINX_VERSION
-ADD nginx-$NGINX_VERSION.tar.gz /tmp/
-
-WORKDIR /tmp
-RUN ./configure && make
-
-######
-FROM quay.io/centos/centos:stream9 as centos-stream9-builder
-
-RUN yum install -y \
-     gcc pcre-devel zlib-devel make
-
-COPY configure /tmp
-COPY config /tmp
-COPY Makefile /tmp
-COPY phantom_token.c /tmp
-ARG NGINX_VERSION
-ENV NGINX_VERSION=$NGINX_VERSION
-ADD nginx-$NGINX_VERSION.tar.gz /tmp/
-
-WORKDIR /tmp
-RUN ./configure && make
-
-######
-FROM debian:buster as debian10-builder
-
-RUN apt update && apt install -y \
-    wget build-essential git tree software-properties-common dirmngr apt-transport-https ufw
-
-COPY configure /tmp
-COPY config /tmp
-COPY Makefile /tmp
-COPY phantom_token.c /tmp
-ARG NGINX_VERSION
-ENV NGINX_VERSION=$NGINX_VERSION
-ADD nginx-$NGINX_VERSION.tar.gz /tmp/
-
-WORKDIR /tmp
-RUN wget https://sourceforge.net/projects/pcre/files/pcre/8.45/pcre-8.45.tar.gz && mkdir -p pcre && tar -xz -C pcre -f pcre-8.45.tar.gz --strip-components=1
-RUN wget https://www.zlib.net/zlib-1.3.tar.gz && mkdir -p zlib && tar -xz -C zlib -f zlib-1.3.tar.gz --strip-components=1
-RUN CONFIG_OPTS="--with-pcre=../pcre --with-zlib=../zlib" ./configure && make
-
-######
-FROM debian:bullseye as debian11-builder
-
-RUN apt update && apt install -y \
-    wget build-essential git tree software-properties-common dirmngr apt-transport-https ufw
-
-COPY configure /tmp
-COPY config /tmp
-COPY Makefile /tmp
-COPY phantom_token.c /tmp
-ARG NGINX_VERSION
-ENV NGINX_VERSION=$NGINX_VERSION
-ADD nginx-$NGINX_VERSION.tar.gz /tmp/
-
-WORKDIR /tmp
-RUN wget https://sourceforge.net/projects/pcre/files/pcre/8.45/pcre-8.45.tar.gz && mkdir -p pcre && tar -xz -C pcre -f pcre-8.45.tar.gz --strip-components=1
-RUN wget https://www.zlib.net/zlib-1.3.tar.gz && mkdir -p zlib && tar -xz -C zlib -f zlib-1.3.tar.gz --strip-components=1
-RUN CONFIG_OPTS="--with-pcre=../pcre --with-zlib=../zlib" ./configure && make
-
-######
-FROM debian:bookworm as debian12-builder
-
-RUN apt update && apt install -y \
-    wget build-essential git tree software-properties-common dirmngr apt-transport-https ufw
-
-COPY configure /tmp
-COPY config /tmp
-COPY Makefile /tmp
-COPY phantom_token.c /tmp
-ARG NGINX_VERSION
-ENV NGINX_VERSION=$NGINX_VERSION
-ADD nginx-$NGINX_VERSION.tar.gz /tmp/
-
-WORKDIR /tmp
-RUN wget https://sourceforge.net/projects/pcre/files/pcre/8.45/pcre-8.45.tar.gz && mkdir -p pcre && tar -xz -C pcre -f pcre-8.45.tar.gz --strip-components=1
-RUN wget https://www.zlib.net/zlib-1.3.tar.gz && mkdir -p zlib && tar -xz -C zlib -f zlib-1.3.tar.gz --strip-components=1
-RUN CONFIG_OPTS="--with-pcre=../pcre --with-zlib=../zlib" ./configure && make
-
-######
-FROM amazonlinux:2 as amzn2-builder
-
-RUN yum install -y \
- gcc pcre-devel zlib-devel make
-
-COPY configure /tmp
-COPY config /tmp
-COPY Makefile /tmp
-COPY phantom_token.c /tmp
-ARG NGINX_VERSION
-ENV NGINX_VERSION=$NGINX_VERSION
-ADD nginx-$NGINX_VERSION.tar.gz /tmp/
-
-WORKDIR /tmp
-RUN ./configure && make
-
-######
-FROM amazonlinux:2023 as amzn2023-builder
-
-RUN yum install -y \
- gcc pcre-devel zlib-devel make
-
-COPY configure /tmp
-COPY config /tmp
-COPY Makefile /tmp
-COPY phantom_token.c /tmp
-ARG NGINX_VERSION
-ENV NGINX_VERSION=$NGINX_VERSION
-ADD nginx-$NGINX_VERSION.tar.gz /tmp/
-
-WORKDIR /tmp
-RUN ./configure && make
-
-######
-FROM alpine as alpine-builder
-
-RUN apk add --no-cache --virtual .build-deps \
-    gcc libc-dev make openssl-dev pcre-dev zlib-dev linux-headers libxslt-dev \
-    gd-dev geoip-dev perl-dev libedit-dev mercurial bash alpine-sdk findutils bash
-
-COPY configure /tmp
-COPY config /tmp
-COPY Makefile /tmp
-COPY phantom_token.c /tmp
-ARG NGINX_VERSION
-ENV NGINX_VERSION=$NGINX_VERSION
-ADD nginx-$NGINX_VERSION.tar.gz /tmp/
-
-WORKDIR /tmp
-RUN ./configure && make
-
-######
-FROM alpine
-
-ARG NGINX_VERSION
-ENV NGINX_VERSION=$NGINX_VERSION
-COPY --from=ubuntu18-builder /tmp/nginx-$NGINX_VERSION/objs/ngx_curity_http_phantom_token_module.so /build/ubuntu.18.04.ngx_curity_http_phantom_token_module_$NGINX_VERSION.so
-COPY --from=ubuntu20-builder /tmp/nginx-$NGINX_VERSION/objs/ngx_curity_http_phantom_token_module.so /build/ubuntu.20.04.ngx_curity_http_phantom_token_module_$NGINX_VERSION.so
-COPY --from=ubuntu22-builder /tmp/nginx-$NGINX_VERSION/objs/ngx_curity_http_phantom_token_module.so /build/ubuntu.22.04.ngx_curity_http_phantom_token_module_$NGINX_VERSION.so
-COPY --from=centos7-builder /tmp/nginx-$NGINX_VERSION/objs/ngx_curity_http_phantom_token_module.so /build/centos.7.ngx_curity_http_phantom_token_module_$NGINX_VERSION.so
-COPY --from=centos-stream9-builder /tmp/nginx-$NGINX_VERSION/objs/ngx_curity_http_phantom_token_module.so /build/centos.stream.9.ngx_curity_http_phantom_token_module_$NGINX_VERSION.so
-COPY --from=debian10-builder /tmp/nginx-$NGINX_VERSION/objs/ngx_curity_http_phantom_token_module.so /build/debian.buster.ngx_curity_http_phantom_token_module_$NGINX_VERSION.so
-COPY --from=debian11-builder /tmp/nginx-$NGINX_VERSION/objs/ngx_curity_http_phantom_token_module.so /build/debian.bullseye.ngx_curity_http_phantom_token_module_$NGINX_VERSION.so
-COPY --from=debian12-builder /tmp/nginx-$NGINX_VERSION/objs/ngx_curity_http_phantom_token_module.so /build/debian.bookworm.ngx_curity_http_phantom_token_module_$NGINX_VERSION.so
-COPY --from=amzn2-builder /tmp/nginx-$NGINX_VERSION/objs/ngx_curity_http_phantom_token_module.so /build/amzn2.ngx_curity_http_phantom_token_module_$NGINX_VERSION.so
-COPY --from=amzn2023-builder /tmp/nginx-$NGINX_VERSION/objs/ngx_curity_http_phantom_token_module.so /build/amzn2023.ngx_curity_http_phantom_token_module_$NGINX_VERSION.so
-COPY --from=alpine-builder /tmp/nginx-$NGINX_VERSION/objs/ngx_curity_http_phantom_token_module.so /build/alpine.ngx_curity_http_phantom_token_module_$NGINX_VERSION.so
-
-ENTRYPOINT ["sleep"]
-
-CMD ["300"]
diff --git a/README.md b/README.md
index e97c5e2..9fa4fc3 100644
--- a/README.md
+++ b/README.md
@@ -241,19 +241,18 @@ This module is compatible with Curity Identity Server versions >= 2.2. It has be
 
 Pre-built binaries of this module are provided for the following versions of NGINX on the corresponding operating system distributions:
 
-|                                    | NGINX 1.25.1 / NGINX Plus R30 | NGINX 1.23.4 / NGINX Plus R29 | NGINX 1.23.2 / NGINX Plus R28 | NGINX 1.21.6 / NGINX Plus R27 | NGINX 1.21.5 / NGINX Plus R26 |
+|                                    | NGINX 1.25.5 / NGINX Plus R32 | NGINX 1.25.3 / NGINX Plus R31 | NGINX 1.25.1 / NGINX Plus R30 | NGINX 1.23.4 / NGINX Plus R29 | NGINX 1.23.2 / NGINX Plus R28 |
 | -----------------------------------|:-----------------------------:|:-----------------------------:|:-----------------------------:|:------------------------------:|:-----------------------------:|
-| Amazon Linux 2                     | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/amzn2.ngx_curity_http_phantom_token_module_1.25.1.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/amzn2.ngx_curity_http_phantom_token_module_1.23.4.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/amzn2.ngx_curity_http_phantom_token_module_1.23.2.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/amzn2.ngx_curity_http_phantom_token_module_1.21.6.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/amzn2.ngx_curity_http_phantom_token_module_1.21.5.so)           |
-| Amazon Linux 2023                  | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/amzn2023.ngx_curity_http_phantom_token_module_1.25.1.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/amzn2023.ngx_curity_http_phantom_token_module_1.23.4.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/amzn2023.ngx_curity_http_phantom_token_module_1.23.2.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/amzn2023.ngx_curity_http_phantom_token_module_1.21.6.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/amzn2023.ngx_curity_http_phantom_token_module_1.21.5.so)           |
-| CentOS 7.0+                        | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/centos.7.ngx_curity_http_phantom_token_module_1.25.1.so)        | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/centos.7.ngx_curity_http_phantom_token_module_1.23.4.so)        | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/centos.7.ngx_curity_http_phantom_token_module_1.23.2.so)        | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/centos.7.ngx_curity_http_phantom_token_module_1.21.6.so)        | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/centos.7.ngx_curity_http_phantom_token_module_1.21.5.so)        |
-| CentOS Stream 9.0+                 | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/centos.stream.9.ngx_curity_http_phantom_token_module_1.25.1.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/centos.stream.9.ngx_curity_http_phantom_token_module_1.23.4.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/centos.stream.9.ngx_curity_http_phantom_token_module_1.23.2.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/centos.stream.9.ngx_curity_http_phantom_token_module_1.21.6.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/centos.stream.9.ngx_curity_http_phantom_token_module_1.21.5.so) |
-| Debian 10.0 (Buster)               | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/debian.buster.ngx_curity_http_phantom_token_module_1.25.1.so)   | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/debian.buster.ngx_curity_http_phantom_token_module_1.23.4.so)   | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/debian.buster.ngx_curity_http_phantom_token_module_1.23.2.so)   | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/debian.buster.ngx_curity_http_phantom_token_module_1.21.6.so)   | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/debian.buster.ngx_curity_http_phantom_token_module_1.21.5.so)   |
-| Debian 11.0 (Bullseye)             | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/debian.bullseye.ngx_curity_http_phantom_token_module_1.25.1.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/debian.bullseye.ngx_curity_http_phantom_token_module_1.23.4.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/debian.bullseye.ngx_curity_http_phantom_token_module_1.23.2.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/debian.bullseye.ngx_curity_http_phantom_token_module_1.21.6.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/debian.bullseye.ngx_curity_http_phantom_token_module_1.21.5.so) |
-| Debian 12.0 (Bookworm)             | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/debian.bookworm.ngx_curity_http_phantom_token_module_1.25.1.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/debian.bookworm.ngx_curity_http_phantom_token_module_1.23.4.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/debian.bookworm.ngx_curity_http_phantom_token_module_1.23.2.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/debian.bookworm.ngx_curity_http_phantom_token_module_1.21.6.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/debian.bookworm.ngx_curity_http_phantom_token_module_1.21.5.so) |
-| Alpine                             | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/alpine.ngx_curity_http_phantom_token_module_1.25.1.so)          | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/alpine.ngx_curity_http_phantom_token_module_1.23.4.so)          | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/alpine.ngx_curity_http_phantom_token_module_1.23.2.so)          | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/alpine.ngx_curity_http_phantom_token_module_1.21.6.so)          | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/alpine.ngx_curity_http_phantom_token_module_1.21.5.so)          |
-| Ubuntu 18.04 LTS (Bionic Beaver)   | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/ubuntu.18.04.ngx_curity_http_phantom_token_module_1.25.1.so)    | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/ubuntu.18.04.ngx_curity_http_phantom_token_module_1.23.4.so)    | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/ubuntu.18.04.ngx_curity_http_phantom_token_module_1.23.2.so)    | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/ubuntu.18.04.ngx_curity_http_phantom_token_module_1.21.6.so)    | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/ubuntu.18.04.ngx_curity_http_phantom_token_module_1.21.5.so)    |
-| Ubuntu 20.04 LTS (Focal Fossa)     | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/ubuntu.20.04.ngx_curity_http_phantom_token_module_1.25.1.so)    | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/ubuntu.20.04.ngx_curity_http_phantom_token_module_1.23.4.so)    | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/ubuntu.20.04.ngx_curity_http_phantom_token_module_1.23.2.so)    | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/ubuntu.20.04.ngx_curity_http_phantom_token_module_1.21.6.so)    | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/ubuntu.20.04.ngx_curity_http_phantom_token_module_1.21.5.so)    |
-| Ubuntu 22.04 LTS (Jammy Jellyfish) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/ubuntu.22.04.ngx_curity_http_phantom_token_module_1.25.1.so)    | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/ubuntu.22.04.ngx_curity_http_phantom_token_module_1.23.4.so)    | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/ubuntu.22.04.ngx_curity_http_phantom_token_module_1.23.2.so)    | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/ubuntu.22.04.ngx_curity_http_phantom_token_module_1.21.6.so)    | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.5.0/ubuntu.22.04.ngx_curity_http_phantom_token_module_1.21.5.so)    |
+| Alpine                             | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/alpine.ngx_curity_http_phantom_token_module_1.25.5.so)          | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/alpine.ngx_curity_http_phantom_token_module_1.25.3.so)          | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/alpine.ngx_curity_http_phantom_token_module_1.25.1.so)          | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/alpine.ngx_curity_http_phantom_token_module_1.23.4.so)          | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/alpine.ngx_curity_http_phantom_token_module_1.23.2.so)          |
+| Debian 11.0 (Bullseye)             | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/debian.bullseye.ngx_curity_http_phantom_token_module_1.25.5.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/debian.bullseye.ngx_curity_http_phantom_token_module_1.25.3.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/debian.bullseye.ngx_curity_http_phantom_token_module_1.25.1.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/debian.bullseye.ngx_curity_http_phantom_token_module_1.23.4.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/debian.bullseye.ngx_curity_http_phantom_token_module_1.23.2.so) |
+| Debian 12.0 (Bookworm)             | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/debian.bookworm.ngx_curity_http_phantom_token_module_1.25.5.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/debian.bookworm.ngx_curity_http_phantom_token_module_1.25.3.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/debian.bookworm.ngx_curity_http_phantom_token_module_1.25.1.so) | X | X |
+| Ubuntu 20.04 LTS (Focal Fossa)     | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/ubuntu.20.04.ngx_curity_http_phantom_token_module_1.25.5.so)    | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/ubuntu.20.04.ngx_curity_http_phantom_token_module_1.25.3.so)    | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/ubuntu.20.04.ngx_curity_http_phantom_token_module_1.25.1.so)    | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/ubuntu.20.04.ngx_curity_http_phantom_token_module_1.23.4.so)    | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/ubuntu.20.04.ngx_curity_http_phantom_token_module_1.23.2.so)    |
+| Ubuntu 22.04 LTS (Jammy Jellyfish) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/ubuntu.22.04.ngx_curity_http_phantom_token_module_1.25.5.so)    | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/ubuntu.22.04.ngx_curity_http_phantom_token_module_1.25.3.so)    | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/ubuntu.22.04.ngx_curity_http_phantom_token_module_1.25.1.so)    | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/ubuntu.22.04.ngx_curity_http_phantom_token_module_1.23.4.so)    | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/ubuntu.22.04.ngx_curity_http_phantom_token_module_1.23.2.so)    |
+| Ubuntu 24.04 LTS (Noble Numbat) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/ubuntu.24.04.ngx_curity_http_phantom_token_module_1.25.5.so)    | X | X | X | X |
+| Amazon Linux 2                     | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/amzn2.ngx_curity_http_phantom_token_module_1.25.5.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/amzn2.ngx_curity_http_phantom_token_module_1.25.3.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/amzn2.ngx_curity_http_phantom_token_module_1.25.1.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/amzn2.ngx_curity_http_phantom_token_module_1.23.4.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/amzn2.ngx_curity_http_phantom_token_module_1.23.2.so)           |
+| Amazon Linux 2023                  | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/amzn2023.ngx_curity_http_phantom_token_module_1.25.5.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/amzn2023.ngx_curity_http_phantom_token_module_1.25.3.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/amzn2023.ngx_curity_http_phantom_token_module_1.25.1.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/amzn2023.ngx_curity_http_phantom_token_module_1.23.4.so)           | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/amzn2023.ngx_curity_http_phantom_token_module_1.23.2.so)           |
+| CentOS 7.0+                        | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/centos.7.ngx_curity_http_phantom_token_module_1.25.5.so)        | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/centos.7.ngx_curity_http_phantom_token_module_1.25.3.so)        | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/centos.7.ngx_curity_http_phantom_token_module_1.25.1.so)        | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/centos.7.ngx_curity_http_phantom_token_module_1.23.4.so)        | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/centos.7.ngx_curity_http_phantom_token_module_1.23.2.so)        |
+| CentOS Stream 9.0+                 | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/centos.stream.9.ngx_curity_http_phantom_token_module_1.25.5.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/centos.stream.9.ngx_curity_http_phantom_token_module_1.25.3.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/centos.stream.9.ngx_curity_http_phantom_token_module_1.25.1.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/centos.stream.9.ngx_curity_http_phantom_token_module_1.23.4.so) | [⇓](https://github.com/curityio/nginx_phantom_token_module/releases/download/1.6.0/centos.stream.9.ngx_curity_http_phantom_token_module_1.23.2.so) |
 
 ## Status
 This module is fit for production usage. 
diff --git a/build.sh b/build.sh
index aee8849..f651efc 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,50 @@
 #!/bin/bash
 
-NGINX_VERSION=${NGINX_VERSION:-1.25.1}
+#########################################################################
+# Builds a particular NGINX version for a particular Linux OS and version
+#########################################################################
+
+NGINX_VERSION=${NGINX_VERSION:-1.25.5}
 NGINX_TARBALL=nginx-${NGINX_VERSION}.tar.gz
+LINUX_DISTRO=${LINUX_DISTRO:-alpine}
+
+if [ "$LINUX_DISTRO" != 'alpine' ] &&
+   [ "$LINUX_DISTRO" != 'debian11' ] &&
+   [ "$LINUX_DISTRO" != 'debian12' ] &&
+   [ "$LINUX_DISTRO" != 'ubuntu20' ] &&
+   [ "$LINUX_DISTRO" != 'ubuntu22' ] &&
+   [ "$LINUX_DISTRO" != 'ubuntu24' ] &&
+   [ "$LINUX_DISTRO" != 'amazon2' ] &&
+   [ "$LINUX_DISTRO" != 'amazon2023' ] &&
+   [ "$LINUX_DISTRO" != 'centos7' ] &&
+   [ "$LINUX_DISTRO" != 'centosstream9' ]; then
+  echo "$LINUX_DISTRO is not a supported Linux distribution"
+  exit 1
+fi
+
+function getLibraryPrefix() {
+  if [ "$LINUX_DISTRO" == 'alpine' ]; then
+    echo 'alpine'
+  elif [ "$LINUX_DISTRO" == 'debian11' ]; then
+    echo 'debian.bullseye'
+  elif [ "$LINUX_DISTRO" == 'debian12' ]; then
+    echo 'debian.bookworm'
+  elif [ "$LINUX_DISTRO" == 'ubuntu20' ]; then
+    echo 'ubuntu.20.04'
+  elif [ "$LINUX_DISTRO" == 'ubuntu22' ]; then
+    echo 'ubuntu.22.04'
+  elif [ "$LINUX_DISTRO" == 'ubuntu24' ]; then
+    echo 'ubuntu.24.04'
+  elif [ "$LINUX_DISTRO" == 'amazon2' ]; then
+    echo 'amzn2'
+  elif [ "$LINUX_DISTRO" == 'amazon2023' ]; then
+    echo 'amzn2023'
+  elif [ "$LINUX_DISTRO" == 'centos7' ]; then
+    echo 'centos.7'
+  elif [ "$PREFIX" == 'centosstream9' ]; then
+    echo 'centos.stream.9'
+  fi
+}
 
 if [[ ! -r $NGINX_TARBALL ]]; then
   if [ -z "$DOWNLOAD_PROGRAM" ]; then
@@ -14,7 +57,7 @@ if [[ ! -r $NGINX_TARBALL ]]; then
         exit 1
       fi
   fi
-    $DOWNLOAD_PROGRAM https://nginx.org/download/nginx-"${NGINX_VERSION}".tar.gz
+  $DOWNLOAD_PROGRAM https://nginx.org/download/nginx-"${NGINX_VERSION}".tar.gz
 fi
 
 docker build --no-cache -t nginx-module-builder \
@@ -22,10 +65,16 @@ docker build --no-cache -t nginx-module-builder \
   --build-arg NGINX_VERSION="$NGINX_VERSION" \
   --build-arg NGINX_DEBUG=n \
   --build-arg DYNAMIC_MODULE=Y \
-  -f Dockerfile .
+  -f dockerfiles/$LINUX_DISTRO.Dockerfile .
+if [ $? -ne 0 ]; then
+  echo "Docker build problem encountered for OS $LINUX_DISTRO and NGINX $NGINX_VERSION"
+  exit 1
+fi
 
-docker run --name nginx-modules -d nginx-module-builder 300
-docker cp nginx-modules:/build/ .
+mkdir -p build
+LIBRARY_PREFIX=$(getLibraryPrefix)
+docker run --name nginx-modules -d nginx-module-builder
+docker cp nginx-modules:/tmp/nginx-$NGINX_VERSION/objs/ngx_curity_http_phantom_token_module.so ./build/$LIBRARY_PREFIX.ngx_curity_http_phantom_token_module_$NGINX_VERSION.so
 docker stop -t 0 nginx-modules
 docker rm nginx-modules
 docker rmi nginx-module-builder
diff --git a/buildall.sh b/buildall.sh
new file mode 100755
index 0000000..0ed575c
--- /dev/null
+++ b/buildall.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+##################################################################################
+# Builds an entire release with all supported NGINX versions and Linux OS versions
+##################################################################################
+
+export NGINX_VERSIONS=('1.25.5' '1.25.3' '1.25.1' '1.23.4' '1.23.2')
+export LINUX_DISTROS=('alpine' 'debian11' 'debian12' 'ubuntu20' 'ubuntu22' 'ubuntu24' 'amazon2' 'amazon2023' 'centos7' 'centosstream9')
+rm log.txt 2>/dev/null
+
+#
+# Avoid building modules for platforms NGINX does not support
+#
+function isValidBuild() {
+    local LINUX_DISTRO_PARAM=$1
+    local NGINX_VERSION_PARAM=$2
+
+    if [ "$LINUX_DISTRO_PARAM" == 'ubuntu24' ] && [[ '1.25.5' > "$NGINX_VERSION_PARAM" ]]; then
+      echo 'false'
+    elif [ "$LINUX_DISTRO_PARAM" == 'debian12' ] && [[ '1.25.1' > "$NGINX_VERSION_PARAM" ]]; then
+      echo 'false'
+    else
+      echo 'true'
+    fi
+}
+
+#
+# Build modules for all supported environments and versions
+#
+for LINUX_DISTRO in ${LINUX_DISTROS[@]}
+do
+  for NGINX_VERSION in ${NGINX_VERSIONS[@]}
+  do
+    if [ "$(isValidBuild $LINUX_DISTRO $NGINX_VERSION)" == 'true' ]; then
+      
+      echo "Building the NGINX $NGINX_VERSION phantom token module for $LINUX_DISTRO ..."
+      ./build.sh 1>>./log.txt 2>&1
+      if [ $? -ne 0 ]; then
+        exit 1
+      fi
+
+    else
+      echo "Skipping unsupported build for NGINX $NGINX_VERSION and $LINUX_DISTRO ..."
+    fi
+  done
+done
diff --git a/configure b/configure
index 1834e07..0dc156b 100755
--- a/configure
+++ b/configure
@@ -4,7 +4,7 @@ set -e
 
 SRC_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
-NGINX_VERSION=${NGINX_VERSION:-1.25.1}
+NGINX_VERSION=${NGINX_VERSION:-1.25.5}
 BUILD_INFO_FILE="$SRC_DIR/.build.info"
 test -f "$BUILD_INFO_FILE" && . "$BUILD_INFO_FILE"
 
diff --git a/dockerfiles/alpine.Dockerfile b/dockerfiles/alpine.Dockerfile
new file mode 100644
index 0000000..9791bef
--- /dev/null
+++ b/dockerfiles/alpine.Dockerfile
@@ -0,0 +1,16 @@
+FROM alpine
+
+RUN apk add --no-cache --virtual .build-deps \
+    gcc libc-dev make pcre2-dev zlib-dev linux-headers libxslt-dev \
+    gd-dev geoip-dev perl-dev libedit-dev mercurial bash alpine-sdk findutils bash
+
+COPY configure /tmp
+COPY config /tmp
+COPY Makefile /tmp
+COPY phantom_token.c /tmp
+ARG NGINX_VERSION
+ENV NGINX_VERSION=$NGINX_VERSION
+ADD nginx-$NGINX_VERSION.tar.gz /tmp/
+
+WORKDIR /tmp
+RUN ./configure && make
diff --git a/dockerfiles/amazon2.Dockerfile b/dockerfiles/amazon2.Dockerfile
new file mode 100644
index 0000000..6a9180e
--- /dev/null
+++ b/dockerfiles/amazon2.Dockerfile
@@ -0,0 +1,15 @@
+FROM amazonlinux:2 as amzn2-builder
+
+RUN yum install -y \
+ gcc pcre-devel zlib-devel make
+
+COPY configure /tmp
+COPY config /tmp
+COPY Makefile /tmp
+COPY phantom_token.c /tmp
+ARG NGINX_VERSION
+ENV NGINX_VERSION=$NGINX_VERSION
+ADD nginx-$NGINX_VERSION.tar.gz /tmp/
+
+WORKDIR /tmp
+RUN ./configure && make
diff --git a/dockerfiles/amazon2023.Dockerfile b/dockerfiles/amazon2023.Dockerfile
new file mode 100644
index 0000000..1e5d6d2
--- /dev/null
+++ b/dockerfiles/amazon2023.Dockerfile
@@ -0,0 +1,15 @@
+FROM amazonlinux:2023 as amzn2023-builder
+
+RUN yum install -y \
+ gcc pcre-devel zlib-devel make
+
+COPY configure /tmp
+COPY config /tmp
+COPY Makefile /tmp
+COPY phantom_token.c /tmp
+ARG NGINX_VERSION
+ENV NGINX_VERSION=$NGINX_VERSION
+ADD nginx-$NGINX_VERSION.tar.gz /tmp/
+
+WORKDIR /tmp
+RUN ./configure && make
diff --git a/dockerfiles/centos7.Dockerfile b/dockerfiles/centos7.Dockerfile
new file mode 100644
index 0000000..d9c3ee3
--- /dev/null
+++ b/dockerfiles/centos7.Dockerfile
@@ -0,0 +1,15 @@
+FROM centos:7 as centos7-builder
+
+RUN yum install -y \
+     gcc pcre-devel zlib-devel make
+
+COPY configure /tmp
+COPY config /tmp
+COPY Makefile /tmp
+COPY phantom_token.c /tmp
+ARG NGINX_VERSION
+ENV NGINX_VERSION=$NGINX_VERSION
+ADD nginx-$NGINX_VERSION.tar.gz /tmp/
+
+WORKDIR /tmp
+RUN ./configure && make
diff --git a/dockerfiles/centosstream9.Dockerfile b/dockerfiles/centosstream9.Dockerfile
new file mode 100644
index 0000000..54d6e5d
--- /dev/null
+++ b/dockerfiles/centosstream9.Dockerfile
@@ -0,0 +1,15 @@
+FROM quay.io/centos/centos:stream9 as centos-stream9-builder
+
+RUN yum install -y \
+     gcc pcre-devel zlib-devel make
+
+COPY configure /tmp
+COPY config /tmp
+COPY Makefile /tmp
+COPY phantom_token.c /tmp
+ARG NGINX_VERSION
+ENV NGINX_VERSION=$NGINX_VERSION
+ADD nginx-$NGINX_VERSION.tar.gz /tmp/
+
+WORKDIR /tmp
+RUN ./configure && make
diff --git a/dockerfiles/debian11.Dockerfile b/dockerfiles/debian11.Dockerfile
new file mode 100644
index 0000000..893bc41
--- /dev/null
+++ b/dockerfiles/debian11.Dockerfile
@@ -0,0 +1,15 @@
+FROM debian:bullseye as debian11-builder
+
+RUN apt update && apt install -y \
+    build-essential git tree software-properties-common dirmngr apt-transport-https ufw libpcre2-dev zlib1g-dev
+
+COPY configure /tmp
+COPY config /tmp
+COPY Makefile /tmp
+COPY phantom_token.c /tmp
+ARG NGINX_VERSION
+ENV NGINX_VERSION=$NGINX_VERSION
+ADD nginx-$NGINX_VERSION.tar.gz /tmp/
+
+WORKDIR /tmp
+RUN CONFIG_OPTS="--with-pcre=../pcre --with-zlib=../zlib" ./configure && make
diff --git a/dockerfiles/debian12.Dockerfile b/dockerfiles/debian12.Dockerfile
new file mode 100644
index 0000000..320c044
--- /dev/null
+++ b/dockerfiles/debian12.Dockerfile
@@ -0,0 +1,15 @@
+FROM debian:bookworm as debian12-builder
+
+RUN apt update && apt install -y \
+    build-essential git tree software-properties-common dirmngr apt-transport-https ufw libpcre2-dev zlib1g-dev
+
+COPY configure /tmp
+COPY config /tmp
+COPY Makefile /tmp
+COPY phantom_token.c /tmp
+ARG NGINX_VERSION
+ENV NGINX_VERSION=$NGINX_VERSION
+ADD nginx-$NGINX_VERSION.tar.gz /tmp/
+
+WORKDIR /tmp
+RUN CONFIG_OPTS="--with-pcre=../pcre --with-zlib=../zlib" ./configure && make
diff --git a/dockerfiles/ubuntu20.Dockerfile b/dockerfiles/ubuntu20.Dockerfile
new file mode 100644
index 0000000..f04e4f3
--- /dev/null
+++ b/dockerfiles/ubuntu20.Dockerfile
@@ -0,0 +1,15 @@
+FROM ubuntu:20.04
+
+RUN apt-get update && \
+    apt-get install -y build-essential libpcre2-dev zlib1g-dev
+
+COPY configure /tmp
+COPY config /tmp
+COPY Makefile /tmp
+COPY phantom_token.c /tmp
+ARG NGINX_VERSION
+ENV NGINX_VERSION=$NGINX_VERSION
+ADD nginx-$NGINX_VERSION.tar.gz /tmp/
+
+WORKDIR /tmp
+RUN ./configure && make
diff --git a/dockerfiles/ubuntu22.Dockerfile b/dockerfiles/ubuntu22.Dockerfile
new file mode 100644
index 0000000..3f8f853
--- /dev/null
+++ b/dockerfiles/ubuntu22.Dockerfile
@@ -0,0 +1,15 @@
+FROM ubuntu:22.04
+
+RUN apt-get update && \
+    apt-get install -y build-essential libpcre2-dev zlib1g-dev
+
+COPY configure /tmp
+COPY config /tmp
+COPY Makefile /tmp
+COPY phantom_token.c /tmp
+ARG NGINX_VERSION
+ENV NGINX_VERSION=$NGINX_VERSION
+ADD nginx-$NGINX_VERSION.tar.gz /tmp/
+
+WORKDIR /tmp
+RUN ./configure && make
diff --git a/dockerfiles/ubuntu24.Dockerfile b/dockerfiles/ubuntu24.Dockerfile
new file mode 100644
index 0000000..5d9f652
--- /dev/null
+++ b/dockerfiles/ubuntu24.Dockerfile
@@ -0,0 +1,15 @@
+FROM ubuntu:24.04
+
+RUN apt-get update && \
+    apt-get install -y build-essential libpcre2-dev zlib1g-dev
+
+COPY configure /tmp
+COPY config /tmp
+COPY Makefile /tmp
+COPY phantom_token.c /tmp
+ARG NGINX_VERSION
+ENV NGINX_VERSION=$NGINX_VERSION
+ADD nginx-$NGINX_VERSION.tar.gz /tmp/
+
+WORKDIR /tmp
+RUN ./configure && make
diff --git a/resources/memorytest/debian10/Dockerfile b/resources/memorytest/debian10/Dockerfile
deleted file mode 100644
index d586943..0000000
--- a/resources/memorytest/debian10/Dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# For Debian we need to install some dependencies and then install nginx
-# http://nginx.org/en/linux_packages.html#Debian
-#
-
-FROM debian:buster
-ARG NGINX_DEPLOY_VERSION
-
-RUN apt update
-RUN apt install -y curl gnupg2 ca-certificates lsb-release debian-archive-keyring
-
-RUN curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor \
-    | tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null
-
-RUN echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] \
-http://nginx.org/packages/mainline/debian `lsb_release -cs` nginx" \
-    | tee /etc/apt/sources.list.d/nginx.list
-
-# 'apt list -a nginx' shows versions available
-RUN apt update
-RUN apt install -y nginx=$NGINX_DEPLOY_VERSION-1~buster valgrind
diff --git a/resources/memorytest/run.sh b/resources/memorytest/run.sh
index 509e8e9..12405b5 100755
--- a/resources/memorytest/run.sh
+++ b/resources/memorytest/run.sh
@@ -29,7 +29,7 @@ if [ "$DISTRO" == '' ]; then
   DISTRO='alpine'
 fi
 if [ "$NGINX_DEPLOY_VERSION" == '' ]; then
-  NGINX_DEPLOY_VERSION='1.25.1'
+  NGINX_DEPLOY_VERSION='1.25.5'
 fi
 echo "Deploying for $DISTRO with NGINX version $NGINX_DEPLOY_VERSION ..."
 
@@ -38,61 +38,47 @@ echo "Deploying for $DISTRO with NGINX version $NGINX_DEPLOY_VERSION ..."
 #
 case $DISTRO in
 
-  'ubuntu18')
-    MODULE_FILE="ubuntu.18.04.ngx_curity_http_phantom_token_module_$NGINX_DEPLOY_VERSION.so"
-    MODULE_FOLDER='/usr/lib/nginx/modules'
-    NGINX_PATH='/usr/sbin/nginx'
-    CONF_PATH='/etc/nginx/nginx.conf'
-    ;;
-  
-  'ubuntu20')
-    MODULE_FILE="ubuntu.20.04.ngx_curity_http_phantom_token_module_$NGINX_DEPLOY_VERSION.so"
+  'alpine')
+    MODULE_FILE="alpine.ngx_curity_http_phantom_token_module_$NGINX_DEPLOY_VERSION.so"
     MODULE_FOLDER='/usr/lib/nginx/modules'
     NGINX_PATH='/usr/sbin/nginx'
     CONF_PATH='/etc/nginx/nginx.conf'
     ;;
 
-  'ubuntu22')
-    MODULE_FILE="ubuntu.22.04.ngx_curity_http_phantom_token_module_$NGINX_DEPLOY_VERSION.so"
+  'debian11')
+    MODULE_FILE="debian.bullseye.ngx_curity_http_phantom_token_module_$NGINX_DEPLOY_VERSION.so"
     MODULE_FOLDER='/usr/lib/nginx/modules'
     NGINX_PATH='/usr/sbin/nginx'
     CONF_PATH='/etc/nginx/nginx.conf'
     ;;
 
-  'centos7')
-    MODULE_FILE="centos.7.ngx_curity_http_phantom_token_module_$NGINX_DEPLOY_VERSION.so"
-    MODULE_FOLDER='/etc/nginx/modules'
-    NGINX_PATH='/usr/sbin/nginx'
-    CONF_PATH='/etc/nginx/nginx.conf'
-    ;;
-
-  'centosstream9')
-    MODULE_FILE="centos.stream.9.ngx_curity_http_phantom_token_module_$NGINX_DEPLOY_VERSION.so"
-    MODULE_FOLDER='/etc/nginx/modules'
+  'debian12')
+    MODULE_FILE="debian.bookworm.ngx_curity_http_phantom_token_module_$NGINX_DEPLOY_VERSION.so"
+    MODULE_FOLDER='/usr/lib/nginx/modules'
     NGINX_PATH='/usr/sbin/nginx'
     CONF_PATH='/etc/nginx/nginx.conf'
     ;;
 
-  'debian10')
-    MODULE_FILE="debian.buster.ngx_curity_http_phantom_token_module_$NGINX_DEPLOY_VERSION.so"
+  'ubuntu20')
+    MODULE_FILE="ubuntu.20.04.ngx_curity_http_phantom_token_module_$NGINX_DEPLOY_VERSION.so"
     MODULE_FOLDER='/usr/lib/nginx/modules'
     NGINX_PATH='/usr/sbin/nginx'
     CONF_PATH='/etc/nginx/nginx.conf'
     ;;
 
-  'debian11')
-    MODULE_FILE="debian.bullseye.ngx_curity_http_phantom_token_module_$NGINX_DEPLOY_VERSION.so"
+  'ubuntu22')
+    MODULE_FILE="ubuntu.22.04.ngx_curity_http_phantom_token_module_$NGINX_DEPLOY_VERSION.so"
     MODULE_FOLDER='/usr/lib/nginx/modules'
     NGINX_PATH='/usr/sbin/nginx'
     CONF_PATH='/etc/nginx/nginx.conf'
     ;;
 
-  'debian12')
-    MODULE_FILE="debian.bookworm.ngx_curity_http_phantom_token_module_$NGINX_DEPLOY_VERSION.so"
+  'ubuntu24')
+    MODULE_FILE="ubuntu.24.04.ngx_curity_http_phantom_token_module_$NGINX_DEPLOY_VERSION.so"
     MODULE_FOLDER='/usr/lib/nginx/modules'
     NGINX_PATH='/usr/sbin/nginx'
     CONF_PATH='/etc/nginx/nginx.conf'
-    ;;    
+    ;;
 
   'amazon2')
     MODULE_FILE="amzn2.ngx_curity_http_phantom_token_module_$NGINX_DEPLOY_VERSION.so"
@@ -106,15 +92,21 @@ case $DISTRO in
     MODULE_FOLDER='/etc/nginx/modules'
     NGINX_PATH='/usr/sbin/nginx'
     CONF_PATH='/etc/nginx/nginx.conf'
-    ;;    
+    ;;   
 
-  'alpine')
-    MODULE_FILE="alpine.ngx_curity_http_phantom_token_module_$NGINX_DEPLOY_VERSION.so"
-    MODULE_FOLDER='/usr/lib/nginx/modules'
+  'centos7')
+    MODULE_FILE="centos.7.ngx_curity_http_phantom_token_module_$NGINX_DEPLOY_VERSION.so"
+    MODULE_FOLDER='/etc/nginx/modules'
+    NGINX_PATH='/usr/sbin/nginx'
+    CONF_PATH='/etc/nginx/nginx.conf'
+    ;;
+
+  'centosstream9')
+    MODULE_FILE="centos.stream.9.ngx_curity_http_phantom_token_module_$NGINX_DEPLOY_VERSION.so"
+    MODULE_FOLDER='/etc/nginx/modules'
     NGINX_PATH='/usr/sbin/nginx'
     CONF_PATH='/etc/nginx/nginx.conf'
     ;;
-  
 esac
 
 #
diff --git a/resources/memorytest/ubuntu18/Dockerfile b/resources/memorytest/ubuntu24/Dockerfile
similarity index 85%
rename from resources/memorytest/ubuntu18/Dockerfile
rename to resources/memorytest/ubuntu24/Dockerfile
index dcc8ee0..4ae848d 100644
--- a/resources/memorytest/ubuntu18/Dockerfile
+++ b/resources/memorytest/ubuntu24/Dockerfile
@@ -3,7 +3,7 @@
 # http://nginx.org/en/linux_packages.html#Ubuntu
 #
 
-FROM ubuntu:18.04
+FROM ubuntu:24.04
 ARG NGINX_DEPLOY_VERSION
 
 RUN apt update
@@ -18,5 +18,5 @@ http://nginx.org/packages/mainline/ubuntu `lsb_release -cs` nginx" \
 
 # 'apt list -a nginx' shows versions available
 RUN apt update
-RUN apt install -y nginx=$NGINX_DEPLOY_VERSION-1~bionic valgrind
-
+RUN apt list -a nginx
+RUN apt install -y nginx=$NGINX_DEPLOY_VERSION-1~jammy valgrind