diff --git a/Dockerfile b/Dockerfile
index 236139a..b58f2d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,9 +16,9 @@ ARG GRAALVM_VERSION
 ARG BUILD_VERSION_ARG
 ARG SIGNAL_CLI_NATIVE_PACKAGE_VERSION
 
-COPY ext/libraries/libsignal-client/v${LIBSIGNAL_CLIENT_VERSION} /tmp/libsignal-client-libraries
-COPY ext/libraries/libsignal-client/signal-cli-native.patch /tmp/signal-cli-native.patch
-COPY ext/patches/signal-cli-native-arch.patch /tmp/signal-cli-native-arch.patch
+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
+COPY signal-cli-rest-api/ext/patches/signal-cli-native-arch.patch /tmp/signal-cli-native-arch.patch
 
 # use architecture specific libsignal_jni.so
 RUN arch="$(uname -m)"; \
@@ -52,9 +52,9 @@ RUN cd /tmp/ \
 	&& cp /tmp/swag-${SWAG_VERSION}/swag /usr/bin/swag \
 	&& rm -r /tmp/swag-${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
 
@@ -66,76 +66,130 @@ 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 \
 		&& 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;
+		&& ./gradlew -q nativeCompile;
 
 # 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
-COPY src/datastructs /tmp/signal-cli-rest-api-src/datastructs
-COPY src/utils /tmp/signal-cli-rest-api-src/utils
-COPY src/scripts /tmp/signal-cli-rest-api-src/scripts
-COPY src/main.go /tmp/signal-cli-rest-api-src/
-COPY src/go.mod /tmp/signal-cli-rest-api-src/
-COPY src/go.sum /tmp/signal-cli-rest-api-src/
+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/
 
 # build signal-cli-rest-api
 RUN cd /tmp/signal-cli-rest-api-src && swag init && go test ./client -v && go build
@@ -166,10 +220,10 @@ 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 entrypoint.sh /entrypoint.sh
+COPY signal-cli-rest-api/entrypoint.sh /entrypoint.sh
 
 
 RUN groupadd -g 1000 signal-api \
diff --git a/README.md b/README.md
index c567c08..334e3b5 100644
--- a/README.md
+++ b/README.md
@@ -139,3 +139,17 @@ There are a bunch of environmental variables that can be set inside the docker c
 * `SWAGGER_IP`: The IP that's used in the Swagger UI for the interactive examples. Defaults to the container ip.
 
 * `PORT`: Defaults to port `8080` unless this env var is set to tell it otherwise.
+
+
+
+
+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