diff --git a/Dockerfile b/Dockerfile
index 224f316..c3800b4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -55,9 +55,9 @@ ENV LANG en_US.UTF-8
 RUN go install github.com/swaggo/swag/cmd/swag@v${SWAG_VERSION}
 
 
-RUN cd /tmp/ \
-	&& wget -nv https://github.com/AsamK/signal-cli/releases/download/v${SIGNAL_CLI_VERSION}/signal-cli-${SIGNAL_CLI_VERSION}.tar.gz -O /tmp/signal-cli.tar.gz \
-	&& tar xf signal-cli.tar.gz
+# RUN cd /tmp/ \
+# 	&& wget -nv https://github.com/AsamK/signal-cli/releases/download/v${SIGNAL_CLI_VERSION}/signal-cli-${SIGNAL_CLI_VERSION}.tar.gz -O /tmp/signal-cli.tar.gz \
+# 	&& tar xf signal-cli.tar.gz
 
 # build native image with graalvm
 
@@ -69,23 +69,91 @@ RUN arch="$(uname -m)"; \
 			*) echo "Invalid architecture" ;; \
         esac;
 
-RUN if [ "$(uname -m)" = "x86_64" ]; then \
-		cd /tmp \
-		&& git clone https://github.com/AsamK/signal-cli.git signal-cli-${SIGNAL_CLI_VERSION}-source \
-		&& cd signal-cli-${SIGNAL_CLI_VERSION}-source \
-		&& git checkout -q v${SIGNAL_CLI_VERSION} \
-		&& cd /tmp && mkdir -p /tmp/graalvm && tar xf gvm.tar.gz -C /tmp/graalvm --strip-components=1 \
+COPY signal-cli /tmp/signal-cli
+
+# RUN if [ "$(uname -m)" = "x86_64" ]; then \
+# 		cd /tmp \
+# 		&& git clone https://github.com/AsamK/signal-cli.git signal-cli-${SIGNAL_CLI_VERSION}-source \
+# 		&& cd signal-cli-${SIGNAL_CLI_VERSION}-source \
+# 		&& git checkout -q v${SIGNAL_CLI_VERSION} \
+# 		&& cd /tmp && mkdir -p /tmp/graalvm && tar xf gvm.tar.gz -C /tmp/graalvm --strip-components=1 \
+# 		&& export GRAALVM_HOME=/tmp/graalvm \
+# 		&& export PATH=/tmp/graalvm/bin:$PATH \
+# 		&& cd /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source \
+# 		&& sed -i 's/Signal-Android\/5.22.3/Signal-Android\/5.51.7/g' src/main/java/org/asamk/signal/BaseConfig.java \
+# 		&& ./gradlew build \
+# 		&& ./gradlew installDist \
+# 		&& 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) \
+# 		&& cd /tmp \
+# 		&& cp signal-cli-${SIGNAL_CLI_VERSION}-source/build/install/signal-cli/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar libsignal-client.jar \
+# 		&& zip -qu libsignal-client.jar libsignal_jni.so \
+# 		&& cd /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source \
+# 		&& git apply /tmp/signal-cli-native.patch \
+# 		&& git apply /tmp/signal-cli-native-arch.patch \
+# 		&& ./gradlew -q nativeCompile; \
+# 	elif [ "$(uname -m)" = "aarch64" ] ; then \
+# 		echo "Use native image from @morph027 (https://packaging.gitlab.io/signal-cli/) for arm64 - many thanks to @morph027" \
+# 		&& curl -fsSL https://packaging.gitlab.io/signal-cli/gpg.key | apt-key add - \
+# 		&& echo "deb https://packaging.gitlab.io/signal-cli focal main" > /etc/apt/sources.list.d/morph027-signal-cli.list \
+# 		&& mkdir -p /tmp/signal-cli-native \
+# 		&& cd /tmp/signal-cli-native \
+# 		#&& wget https://gitlab.com/packaging/signal-cli/-/jobs/3716873649/artifacts/download?file_type=archive -O /tmp/signal-cli-native/archive.zip \
+# 		#&& unzip archive.zip \
+# 		#&& mv signal-cli-native-arm64/*deb . \
+# 		&& apt-get -qq update \
+# 		&& apt-get -qq download signal-cli-native=${SIGNAL_CLI_NATIVE_PACKAGE_VERSION} < /dev/null > /dev/null \
+# 		&& ar x *.deb \
+# 		&& tar xf data.tar.gz \
+# 		&& mkdir -p /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source/build/native/nativeCompile \
+# 		&& cp /tmp/signal-cli-native/usr/bin/signal-cli-native  /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source/build/native/nativeCompile/signal-cli; \
+#     elif [ "$(uname -m)" = "armv7l" ] ; then \
+# 		echo "GRAALVM doesn't support 32bit" \
+# 		&& echo "Creating temporary file, otherwise the below copy doesn't work for armv7" \
+# 		&& mkdir -p /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source/build/native/nativeCompile \
+# 		&& touch /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source/build/native/nativeCompile/signal-cli; \
+#     else \
+# 		echo "Unknown architecture"; \
+#     fi;
+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 \
-		&& cd /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source \
-		&& sed -i 's/Signal-Android\/5.22.3/Signal-Android\/5.51.7/g' src/main/java/org/asamk/signal/BaseConfig.java \
-		&& ./gradlew build \
-		&& ./gradlew installDist \
-		&& 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) \
-		&& cd /tmp \
-		&& cp signal-cli-${SIGNAL_CLI_VERSION}-source/build/install/signal-cli/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar libsignal-client.jar \
-		&& zip -qu libsignal-client.jar libsignal_jni.so \
-		&& cd /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source \
 		&& git apply /tmp/signal-cli-native.patch \
 		&& ./gradlew -q nativeCompile; \
 	elif [ "$(uname -m)" = "aarch64" ] ; then \
@@ -114,21 +182,30 @@ RUN if [ "$(uname -m)" = "x86_64" ]; then \
 
 # replace libsignal-client
 
-RUN ls /tmp/signal-cli-${SIGNAL_CLI_VERSION}/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-${SIGNAL_CLI_VERSION}/lib/libsignal-client-* && echo "\n\n" && exit 1)
+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 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)
+
+RUN cp /tmp/signal-cli/build/install/signal-cli/lib/signal-cli-*.jar /tmp/signal-cli/lib/
+
+# replace libsignal-client
+
+# RUN ls /tmp/signal-cli-${SIGNAL_CLI_VERSION}/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-${SIGNAL_CLI_VERSION}/lib/libsignal-client-* && echo "\n\n" && exit 1)
+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-${SIGNAL_CLI_VERSION}/lib \
-	&& unzip signal-cli-${SIGNAL_CLI_VERSION}.jar \
+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-${SIGNAL_CLI_VERSION}.jar org/ META-INF/ \
+	&& zip -r signal-cli*.jar org/ META-INF/ \
 	&& rm -rf META-INF \
 	&& rm -rf org
 
 RUN cd /tmp/ \
-	&& zip -qu /tmp/signal-cli-${SIGNAL_CLI_VERSION}/lib/libsignal-client-${LIBSIGNAL_CLIENT_VERSION}.jar libsignal_jni.so \
-	&& zip -qr signal-cli-${SIGNAL_CLI_VERSION}.zip signal-cli-${SIGNAL_CLI_VERSION}/* \
-    && unzip -q /tmp/signal-cli-${SIGNAL_CLI_VERSION}.zip -d /opt \
-	&& rm -f /tmp/signal-cli-${SIGNAL_CLI_VERSION}.zip
+	&& 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 src/api /tmp/signal-cli-rest-api-src/api
 COPY src/client /tmp/signal-cli-rest-api-src/client
@@ -147,7 +224,7 @@ 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 
+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
@@ -176,8 +253,8 @@ RUN dpkg-reconfigure debconf --frontend=noninteractive \
 	&& 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 /opt/signal-cli-${SIGNAL_CLI_VERSION} /opt/signal-cli-${SIGNAL_CLI_VERSION}
-COPY --from=buildcontainer /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source/build/native/nativeCompile/signal-cli /opt/signal-cli-${SIGNAL_CLI_VERSION}/bin/signal-cli-native
+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 entrypoint.sh /entrypoint.sh
diff --git a/Dockerfile.jailson b/Dockerfile.jailson
new file mode 100644
index 0000000..ce79665
--- /dev/null
+++ b/Dockerfile.jailson
@@ -0,0 +1,213 @@
+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
diff --git a/README.md b/README.md
index 8b0d7c2..67f00ba 100644
--- a/README.md
+++ b/README.md
@@ -157,3 +157,15 @@ There are a bunch of environmental variables that can be set inside the docker c
 * `JSON_RPC_IGNORE_ATTACHMENTS`: When set to `true`, attachments are not automatically downloaded in json-rpc mode (default: `false`)
 * `JSON_RPC_IGNORE_STORIES`: When set to `true`, stories are not automatically downloaded in json-rpc mode (default: `false`)
 * `JSON_RPC_TRUST_NEW_IDENTITIES`: Choose how to trust new identities in json-rpc mode. Supported values: `on-first-use`, `always`, `never`. (default: `on-first-use`)
+
+
+remove-cache:
+	docker builder prune --all --force
+	docker buildx prune --all -f
+
+
+docker builder prune --all --force
+
+
+
+docker buildx build --memory=8g --memory-swap=8g --platform linux/amd64 -f ./Dockerfile -t jailsondias/signal:latest .. --progress=plain
diff --git a/docker-compose.yml b/docker-compose.yml
index 194f112..1b7f495 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,11 +1,14 @@
 version: "3"
 services:
-  signal-cli-rest-api:
-    image: bbernhard/signal-cli-rest-api:latest
+  signal:
+    # image: bbernhard/signal-cli-rest-api:latest
+    build:
+      context: ../
+      dockerfile: signal-cli-rest-api/Dockerfile
     environment:
-      - MODE=normal #supported modes: json-rpc, native, normal
+      - MODE=native #supported modes: json-rpc, native, normal
       #- AUTO_RECEIVE_SCHEDULE=0 22 * * * #enable this parameter on demand (see description below)
     ports:
       - "8080:8080" #map docker port 8080 to host port 8080.
     volumes:
-      - "./signal-cli-config:/home/.local/share/signal-cli" #map "signal-cli-config" folder on host system into docker container. the folder contains the password and cryptographic keys when a new number is registered
+      - "../tip-crawlers-v2/cf/services/signal/signal:/home/.local/share/signal-cli" #map "signal-cli-config" folder on host system into docker container. the folder contains the password and cryptographic keys when a new number is registered
diff --git a/src/api/api.go b/src/api/api.go
index 4b3bdbb..3aa8ac0 100644
--- a/src/api/api.go
+++ b/src/api/api.go
@@ -1563,6 +1563,60 @@ func (a *Api) JoinGroup(c *gin.Context) {
 	c.Status(http.StatusNoContent)
 }
 
+// @Summary Join a Signal Group by invite link.
+// @Tags Groups
+// @Description Join the specified Signal Group by invite link.
+// @Accept  json
+// @Produce  json
+// @Success 204 {string} OK
+// @Failure 400 {object} Error
+// @Param number path string true "Registered Phone Number"
+// @Query invite_link query string true "Invite Link"
+// @Router /v1/groups/{number}/join_by_invite_link [post]
+func (a *Api) JoinGroupByInviteLink(c *gin.Context) {
+	number := c.Param("number")
+	if number == "" {
+		c.JSON(400, Error{Msg: "Couldn't process request - number missing"})
+		return
+	}
+
+	inviteLink := c.Query("invite_link")
+	err := a.signalClient.JoinGroupByInviteLink(number, inviteLink)
+	if err != nil {
+		c.JSON(400, Error{Msg: err.Error()})
+		return
+	}
+
+	c.Status(http.StatusNoContent)
+}
+
+// @Summary Get a Signal Group info by invite link.
+// @Tags Groups
+// @Description Get the specified Signal Group info by invite link.
+// @Accept  json
+// @Produce  json
+// @Success 200 {string} OK
+// @Failure 400 {object} Error
+// @Param number path string true "Registered Phone Number"
+// @Query invite_link query string true "Invite Link"
+// @Router /v1/groups/{number}/join_info_by_invite_link [get]
+func (a *Api) GetJoinGroupInfoByInviteLink(c *gin.Context) {
+	number := c.Param("number")
+	if number == "" {
+		c.JSON(400, Error{Msg: "Couldn't process request - number missing"})
+		return
+	}
+
+	inviteLink := c.Query("invite_link")
+	jsonStr, err := a.signalClient.GetJoinGroupInfoByInviteLink(number, inviteLink)
+	if err != nil {
+		c.JSON(400, Error{Msg: err.Error()})
+		return
+	}
+
+	c.String(200, jsonStr)
+}
+
 // @Summary Quit a Signal Group.
 // @Tags Groups
 // @Description Quit the specified Signal Group.
diff --git a/src/client/client.go b/src/client/client.go
index 4de0812..fa78cf3 100644
--- a/src/client/client.go
+++ b/src/client/client.go
@@ -1337,7 +1337,10 @@ func (s *SignalClient) GetGroups(number string) ([]GroupEntry, error) {
 			if identifier == "" {
 				identifier = val.Uuid
 			}
-			members = append(members, identifier)
+
+			if identifier == number {
+				members = append(members, identifier)
+			}
 		}
 		groupEntry.Members = members
 
@@ -1891,6 +1894,32 @@ func (s *SignalClient) JoinGroup(number string, groupId string) error {
 	return err
 }
 
+func (s *SignalClient) JoinGroupByInviteLink(number string, inviteLink string) error {
+	var err error
+	if s.signalCliMode == JsonRpc {
+		type Request struct {
+			InviteLink string `json:"uri"`
+		}
+		request := Request{InviteLink: inviteLink}
+		jsonRpc2Client, err := s.getJsonRpc2Client()
+		if err != nil {
+			return err
+		}
+		_, err = jsonRpc2Client.getRaw("joinGroup", &number, request)
+	} else {
+		_, err = s.cliClient.Execute(true, []string{"--config", s.signalCliConfig, "-a", number, "joinGroup", "--uri", inviteLink}, "")
+	}
+	return err
+}
+
+func (s *SignalClient) GetJoinGroupInfoByInviteLink(number string, inviteLink string) (string, error) {
+	if s.signalCliMode == JsonRpc {
+		return "", errors.New("Not implemented")
+	}
+
+	return s.cliClient.Execute(true, []string{"--config", s.signalCliConfig, "--output", "json", "-a", number, "getJoinGroupInfo", "--uri", inviteLink}, "")
+}
+
 func (s *SignalClient) QuitGroup(number string, groupId string) error {
 	var err error
 	if s.signalCliMode == JsonRpc {
diff --git a/src/main.go b/src/main.go
index 68ac19c..831f867 100644
--- a/src/main.go
+++ b/src/main.go
@@ -214,6 +214,8 @@ func main() {
 		{
 			groups.POST(":number", api.CreateGroup)
 			groups.GET(":number", api.GetGroups)
+			groups.POST(":number/join_by_invite_link", api.JoinGroupByInviteLink)
+			groups.GET(":number/join_info_by_invite_link", api.GetJoinGroupInfoByInviteLink)
 			groups.GET(":number/:groupid", api.GetGroup)
 			groups.GET(":number/:groupid/avatar", api.GetGroupAvatar)
 			groups.DELETE(":number/:groupid", api.DeleteGroup)