diff --git a/Dockerfile b/Dockerfile
index 89f3e92f..4158fdfd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,42 +1,20 @@
-ARG SIGNAL_CLI_VERSION=0.10.0
-ARG LIBSIGNAL_CLIENT_VERSION=0.11.0
-
 ARG SWAG_VERSION=1.6.7
-ARG GRAALVM_JAVA_VERSION=17
-ARG GRAALVM_VERSION=21.3.0
 
 ARG BUILD_VERSION_ARG=unset
 
 FROM golang:1.17-bullseye AS buildcontainer
 
-ARG SIGNAL_CLI_VERSION
-ARG LIBSIGNAL_CLIENT_VERSION
 ARG SWAG_VERSION
-ARG GRAALVM_JAVA_VERSION
-ARG GRAALVM_VERSION
 ARG BUILD_VERSION_ARG
 
-COPY ext/libraries/libsignal-client/v${LIBSIGNAL_CLIENT_VERSION} /tmp/libsignal-client-libraries
-
-# 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 apt-get update \
-	&& apt-get install -y --no-install-recommends wget openjdk-17-jre software-properties-common git locales zip file build-essential libz-dev zlib1g-dev \
+	&& apt-get install -y --no-install-recommends wget software-properties-common git locales zip 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 cd /tmp/ \
@@ -47,56 +25,6 @@ RUN cd /tmp/ \
 	&& cp /tmp/swag-${SWAG_VERSION}/swag /usr/bin/swag \
 	&& rm -r /tmp/swag-${SWAG_VERSION}
 
-RUN cd /tmp/ \
-	&& wget 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 xvf signal-cli.tar.gz
-
-# build native image with graalvm
-
-RUN arch="$(uname -m)"; \
-        case "$arch" in \
-            aarch64) wget https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${GRAALVM_VERSION}/graalvm-ce-java${GRAALVM_JAVA_VERSION}-linux-aarch64-${GRAALVM_VERSION}.tar.gz -O /tmp/gvm.tar.gz ;; \
-            armv7l) echo "GRAALVM doesn't support 32bit" ;; \
-            x86_64) wget https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${GRAALVM_VERSION}/graalvm-ce-java${GRAALVM_JAVA_VERSION}-linux-amd64-${GRAALVM_VERSION}.tar.gz -O /tmp/gvm.tar.gz ;; \ 
-			*) 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 v${SIGNAL_CLI_VERSION} \
-		&& cd /tmp && tar xvf gvm.tar.gz \
-		&& export GRAALVM_HOME=/tmp/graalvm-ce-java${GRAALVM_JAVA_VERSION}-${GRAALVM_VERSION} \
-		&& export PATH=/tmp/graalvm-ce-java${GRAALVM_JAVA_VERSION}-${GRAALVM_VERSION}/bin:$PATH \
-		&& cd /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source \
-		&& chmod +x /tmp/graalvm-ce-java${GRAALVM_JAVA_VERSION}-${GRAALVM_VERSION}/bin/gu \ 
-		&& /tmp/graalvm-ce-java${GRAALVM_JAVA_VERSION}-${GRAALVM_VERSION}/bin/gu install native-image \
-		&& ./gradlew nativeCompile; \
-	elif [ "$(uname -m)" = "aarch64" ] ; then \
-		echo "GRAALVM for aarch64 temporarily disabled" \
-		&& echo "Creating temporary file, otherwise the below copy doesn't work for aarch64" \
-		&& 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; \
-    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;
-
-# replace libsignal-client
-
-RUN ls /tmp/signal-cli-${SIGNAL_CLI_VERSION}/lib/signal-client-java-${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/signal-client-java-* && echo "\n\n" && exit 1)
-
-RUN cd /tmp/ \
-	&& zip -u /tmp/signal-cli-${SIGNAL_CLI_VERSION}/lib/signal-client-java-${LIBSIGNAL_CLIENT_VERSION}.jar libsignal_jni.so
-
-RUN cd /tmp \
-	&& zip -r signal-cli-${SIGNAL_CLI_VERSION}.zip signal-cli-${SIGNAL_CLI_VERSION}/*
-
 COPY src/api /tmp/signal-cli-rest-api-src/api
 COPY src/client /tmp/signal-cli-rest-api-src/client
 COPY src/utils /tmp/signal-cli-rest-api-src/utils
@@ -111,9 +39,8 @@ RUN cd /tmp/signal-cli-rest-api-src && swag init && go build
 # build supervisorctl_config_creator
 RUN cd /tmp/signal-cli-rest-api-src/scripts && go build -o jsonrpc2-helper 
 
-
 # Start a fresh container for release container
-FROM eclipse-temurin:17-focal
+FROM ubuntu:focal
 
 ENV GIN_MODE=release
 
@@ -125,34 +52,42 @@ ARG BUILD_VERSION_ARG
 ENV BUILD_VERSION=$BUILD_VERSION_ARG
 
 RUN apt-get update \
-	&& apt-get install -y --no-install-recommends util-linux supervisor netcat unzip \
+	&& apt-get install -y --no-install-recommends \
+		util-linux \
+		supervisor \
+		netcat \
+		unzip \
+		apt-transport-https \
+		ca-certificates \
 	&& rm -rf /var/lib/apt/lists/* 
 
+ADD	--chown=_apt:root https://packaging.gitlab.io/signal-cli/gpg.key /etc/apt/trusted.gpg.d/morph027-signal-cli.asc
+
+RUN	echo "deb https://packaging.gitlab.io/signal-cli focal main" > /etc/apt/sources.list.d/morph027-signal-cli.list
+
+RUN	apt-get update \
+	&& apt-get install --no-install-recommends -y \
+		signal-cli-jre=${SIGNAL_CLI_VERSION}* \
+	&& apt-get autoremove -y \
+	&& apt-get clean \
+	&& rm -rf /var/lib/apt/lists/*
+
+# do not install 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" ;; \
+			*) apt-get install -y --no-install-recommends signal-cli-native=${SIGNAL_CLI_VERSION}*; apt-get autoremove -y; apt-get clean; rm -rf /var/lib/apt/lists/* ;; \
+        esac;
+
 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-${SIGNAL_CLI_VERSION}.zip /tmp/signal-cli-${SIGNAL_CLI_VERSION}.zip
-COPY --from=buildcontainer /tmp/signal-cli-${SIGNAL_CLI_VERSION}-source/build/native/nativeCompile/signal-cli /tmp/signal-cli-native
 COPY --from=buildcontainer /tmp/signal-cli-rest-api-src/scripts/jsonrpc2-helper /usr/bin/jsonrpc2-helper
 COPY entrypoint.sh /entrypoint.sh
 
-RUN unzip /tmp/signal-cli-${SIGNAL_CLI_VERSION}.zip -d /opt
-RUN rm -rf /tmp/signal-cli-${SIGNAL_CLI_VERSION}.zip
-
 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 \
-	&& cp /tmp/signal-cli-native /opt/signal-cli-${SIGNAL_CLI_VERSION}/bin/signal-cli-native \
-	&& ln -s /opt/signal-cli-${SIGNAL_CLI_VERSION}/bin/signal-cli-native /usr/bin/signal-cli-native \
-	&& rm /tmp/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  ;; \
-			aarch64) echo "GRAALVM temporarily disabled for aarch64" && rm /opt/signal-cli-${SIGNAL_CLI_VERSION}/bin/signal-cli-native /usr/bin/signal-cli-native  ;; \
-        esac;
-
 EXPOSE ${PORT}
 
 ENV SIGNAL_CLI_CONFIG_DIR=/home/.local/share/signal-cli