diff --git a/Dockerfile.jailson b/Dockerfile.jailson
new file mode 100644
index 0000000..ed4e1d9
--- /dev/null
+++ b/Dockerfile.jailson
@@ -0,0 +1,214 @@
+ARG SIGNAL_CLI_VERSION=0.13.22
+ARG LIBSIGNAL_CLIENT_VERSION=0.86.4
+ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION=0.13.22+morph027+1
+
+ARG SWAG_VERSION=1.16.4
+ARG GRAALVM_VERSION=21.0.0
+
+ARG BUILD_VERSION_ARG=unset
+
+FROM golang:1.24-bookworm AS buildcontainer
+
+ARG SIGNAL_CLI_VERSION
+ARG LIBSIGNAL_CLIENT_VERSION
+ARG SWAG_VERSION
+ARG GRAALVM_VERSION
+ARG BUILD_VERSION_ARG
+ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION
+
+COPY signal-cli-rest-api/ext/libraries/libsignal-client/v${LIBSIGNAL_CLIENT_VERSION} /tmp/libsignal-client-libraries
+COPY signal-cli-rest-api/ext/libraries/libsignal-client/signal-cli-native.patch /tmp/signal-cli-native.patch
+
+# use architecture specific libsignal_jni.so
+RUN arch="$(uname -m)"; \
+        case "$arch" in \
+            aarch64) cp /tmp/libsignal-client-libraries/arm64/libsignal_jni.so /tmp/libsignal_jni.so ;; \
+			armv7l) cp /tmp/libsignal-client-libraries/armv7/libsignal_jni.so /tmp/libsignal_jni.so ;; \
+            x86_64) cp /tmp/libsignal-client-libraries/x86-64/libsignal_jni.so /tmp/libsignal_jni.so ;; \
+			*) echo "Unknown architecture" && exit 1 ;; \
+        esac;
+
+RUN dpkg-reconfigure debconf --frontend=noninteractive \
+	&& apt-get update \
+	&& apt-get -y install --no-install-recommends \
+		wget software-properties-common git locales zip unzip \
+		file build-essential libz-dev zlib1g-dev \
+	&& rm -rf /var/lib/apt/lists/* 
+
+RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
+    dpkg-reconfigure --frontend=noninteractive locales && \
+    update-locale LANG=en_US.UTF-8
+
+ENV JAVA_OPTS="-Djdk.lang.Process.launchMechanism=vfork"
+
+ENV LANG en_US.UTF-8
+
+RUN go install github.com/swaggo/swag/cmd/swag@v${SWAG_VERSION}
+
+
+RUN arch="$(uname -m)"; \
+        case "$arch" in \
+            aarch64) wget -nv https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${GRAALVM_VERSION}/graalvm-community-jdk-${GRAALVM_VERSION}_linux-aarch64_bin.tar.gz -O /tmp/gvm.tar.gz ;; \
+            armv7l) echo "GRAALVM doesn't support 32bit" ;; \
+            x86_64) wget -nv https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${GRAALVM_VERSION}/graalvm-community-jdk-${GRAALVM_VERSION}_linux-x64_bin.tar.gz -O /tmp/gvm.tar.gz ;; \
+			*) echo "Invalid architecture" ;; \
+        esac;
+
+COPY signal-cli /tmp/signal-cli
+
+RUN cd /tmp && mkdir -p /tmp/graalvm && tar xf gvm.tar.gz -C /tmp/graalvm --strip-components=1
+
+RUN cd /tmp/signal-cli \
+		&& sed -i 's/Signal-Android\/5.22.3/Signal-Android\/5.51.7/g' src/main/java/org/asamk/signal/BaseConfig.java
+
+RUN cd /tmp/signal-cli \
+		&& export GRAALVM_HOME=/tmp/graalvm \
+		&& export PATH=/tmp/graalvm/bin:$PATH \
+		&& ./gradlew build
+
+RUN cd /tmp/signal-cli \
+		&& export GRAALVM_HOME=/tmp/graalvm \
+		&& export PATH=/tmp/graalvm/bin:$PATH \
+		&& ./gradlew installDist
+
+RUN cd /tmp/signal-cli \
+		&& export GRAALVM_HOME=/tmp/graalvm \
+		&& export PATH=/tmp/graalvm/bin:$PATH \
+		&& ./gradlew distTar
+
+RUN cd /tmp/signal-cli \
+		&& export GRAALVM_HOME=/tmp/graalvm \
+		&& export PATH=/tmp/graalvm/bin:$PATH \
+		&& ./gradlew fatJar
+
+RUN cd /tmp/signal-cli \
+		&& export GRAALVM_HOME=/tmp/graalvm \
+		&& export PATH=/tmp/graalvm/bin:$PATH \
+		&& ./gradlew run --args="--help"
+
+RUN cd /tmp/signal-cli \
+		&& ls build/install/signal-cli/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar || (echo "\n\nsignal-client jar file with version ${LIBSIGNAL_CLIENT_VERSION} not found. Maybe the version needs to be bumped in the signal-cli-rest-api Dockerfile?\n\n" && echo "Available version: \n" && ls build/install/signal-cli/lib/libsignal-client-* && echo "\n\n" && exit 1)
+
+
+RUN cd /tmp \
+		&& cp signal-cli/build/install/signal-cli/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar libsignal-client.jar \
+		&& zip -qu libsignal-client.jar libsignal_jni.so
+
+RUN cd /tmp/signal-cli \
+		&& export GRAALVM_HOME=/tmp/graalvm \
+		&& export PATH=/tmp/graalvm/bin:$PATH \
+		&& git apply /tmp/signal-cli-native.patch \
+		&& ./gradlew -q nativeCompile;
+
+RUN cp /tmp/signal-cli/build/install/signal-cli/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar /tmp/signal-cli/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar
+
+RUN cp /tmp/signal-cli/build/install/signal-cli/lib/signal-cli-*.jar /tmp/signal-cli/lib/
+
+RUN ls /tmp/signal-cli/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar || (echo "\n\nsignal-client jar file with version ${LIBSIGNAL_CLIENT_VERSION} not found. Maybe the version needs to be bumped in the signal-cli-rest-api Dockerfile?\n\n" && echo "Available version: \n" && ls /tmp/signal-cli/lib/libsignal-client-* && echo "\n\n" && exit 1)
+
+# workaround until upstream is fixed
+RUN cd /tmp/signal-cli/lib \
+	&& unzip signal-cli*.jar \
+	&& sed -i 's/Signal-Android\/5.22.3/Signal-Android\/5.51.7/g' org/asamk/signal/BaseConfig.class \
+	&& zip -r signal-cli*.jar org/ META-INF/ \
+	&& rm -rf META-INF \
+	&& rm -rf org
+
+RUN ls /tmp/signal-cli/lib/
+
+RUN cd /tmp/ \
+	&& zip -qu /tmp/signal-cli/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar libsignal_jni.so \
+	&& zip -qr signal-cli.zip signal-cli/* \
+    && unzip -q /tmp/signal-cli.zip -d /opt \
+	&& rm -f /tmp/signal-cli.zip
+
+COPY signal-cli-rest-api/src/api /tmp/signal-cli-rest-api-src/api
+COPY signal-cli-rest-api/src/client /tmp/signal-cli-rest-api-src/client
+COPY signal-cli-rest-api/src/datastructs /tmp/signal-cli-rest-api-src/datastructs
+COPY signal-cli-rest-api/src/utils /tmp/signal-cli-rest-api-src/utils
+COPY signal-cli-rest-api/src/scripts /tmp/signal-cli-rest-api-src/scripts
+COPY signal-cli-rest-api/src/main.go /tmp/signal-cli-rest-api-src/
+COPY signal-cli-rest-api/src/go.mod /tmp/signal-cli-rest-api-src/
+COPY signal-cli-rest-api/src/go.sum /tmp/signal-cli-rest-api-src/
+COPY signal-cli-rest-api/src/plugin_loader.go /tmp/signal-cli-rest-api-src/
+
+# build signal-cli-rest-api
+RUN ls -la /tmp/signal-cli-rest-api-src
+RUN cd /tmp/signal-cli-rest-api-src && ${GOPATH}/bin/swag init
+RUN cd /tmp/signal-cli-rest-api-src && go build -o signal-cli-rest-api main.go
+RUN cd /tmp/signal-cli-rest-api-src && go test ./client -v && go test ./utils -v
+
+# build supervisorctl_config_creator
+RUN cd /tmp/signal-cli-rest-api-src/scripts && go build -o jsonrpc2-helper
+
+# build plugin_loader
+RUN cd /tmp/signal-cli-rest-api-src && go build -buildmode=plugin -o signal-cli-rest-api_plugin_loader.so plugin_loader.go
+
+# Start a fresh container for release container
+
+# eclipse-temurin doesn't provide a OpenJDK 21 image for armv7 (see https://github.com/adoptium/containers/issues/502). Until this
+# is fixed we use the standard ubuntu image
+#FROM eclipse-temurin:21-jre-jammy
+
+FROM ubuntu:jammy
+
+ENV GIN_MODE=release
+
+ENV PORT=8080
+
+ARG SIGNAL_CLI_VERSION
+ARG BUILD_VERSION_ARG
+
+ENV BUILD_VERSION=$BUILD_VERSION_ARG
+ENV SIGNAL_CLI_REST_API_PLUGIN_SHARED_OBJ_DIR=/usr/bin/
+
+RUN dpkg-reconfigure debconf --frontend=noninteractive \
+	&& apt-get update \
+	&& apt-get install -y --no-install-recommends util-linux supervisor netcat openjdk-21-jre cron curl locales \
+	&& rm -rf /var/lib/apt/lists/* 
+
+COPY --from=buildcontainer /tmp/signal-cli-rest-api-src/signal-cli-rest-api /usr/bin/signal-cli-rest-api
+COPY --from=buildcontainer /tmp/signal-cli/build/install/signal-cli /opt/signal-cli-${SIGNAL_CLI_VERSION}
+COPY --from=buildcontainer /tmp/signal-cli/build/native/nativeCompile/signal-cli /opt/signal-cli-${SIGNAL_CLI_VERSION}/bin/signal-cli-native
+COPY --from=buildcontainer /tmp/signal-cli-rest-api-src/scripts/jsonrpc2-helper /usr/bin/jsonrpc2-helper
+COPY --from=buildcontainer /tmp/signal-cli-rest-api-src/signal-cli-rest-api_plugin_loader.so /usr/bin/signal-cli-rest-api_plugin_loader.so
+COPY signal-cli-rest-api/entrypoint.sh /entrypoint.sh
+
+
+RUN groupadd -g 1000 signal-api \
+	&& useradd --no-log-init -M -d /home -s /bin/bash -u 1000 -g 1000 signal-api \
+	&& ln -s /opt/signal-cli-${SIGNAL_CLI_VERSION}/bin/signal-cli /usr/bin/signal-cli \
+	&& ln -s /opt/signal-cli-${SIGNAL_CLI_VERSION}/bin/signal-cli-native /usr/bin/signal-cli-native \
+	&& mkdir -p /signal-cli-config/ \
+	&& mkdir -p /home/.local/share/signal-cli
+
+# remove the temporary created signal-cli-native on armv7, as GRAALVM doesn't support 32bit
+RUN arch="$(uname -m)"; \
+        case "$arch" in \
+            armv7l) echo "GRAALVM doesn't support 32bit" && rm /opt/signal-cli-${SIGNAL_CLI_VERSION}/bin/signal-cli-native /usr/bin/signal-cli-native  ;; \
+        esac;
+
+RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
+    dpkg-reconfigure --frontend=noninteractive locales && \
+    update-locale LANG=en_US.UTF-8
+
+ENV LANG en_US.UTF-8
+
+EXPOSE ${PORT}
+
+ENV SIGNAL_CLI_CONFIG_DIR=/home/.local/share/signal-cli
+ENV SIGNAL_CLI_UID=1000
+ENV SIGNAL_CLI_GID=1000
+ENV SIGNAL_CLI_CHOWN_ON_STARTUP=true
+
+RUN echo '#!/bin/bash\n\
+find /tmp -name "libsignal*" -mtime +1 -delete\n\
+find /tmp -name "sqlite-*" -mtime +1 -delete' > /usr/local/bin/cleanup.sh && \
+    chmod +x /usr/local/bin/cleanup.sh
+
+RUN echo "0 0 * * * /usr/local/bin/cleanup.sh >> /var/log/cron.log 2>&1" | crontab -
+
+HEALTHCHECK --interval=20s --timeout=10s --retries=3 \
+    CMD curl -f http://localhost:${PORT}/v1/health || exit 1
+
+ENTRYPOINT cron && /entrypoint.sh