diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index 9a69225d8..b480a8ff4 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$TARGETPLATFORM falkordb/falkordb-build:latest
+FROM --platform=$TARGETPLATFORM falkordb/falkordb-build:latest as builder
 
 ARG TARGETPLATFORM
 
@@ -8,13 +8,25 @@ ADD . /FalkorDB
 
 RUN make
 
+
+FROM redis:7.2.4
+
+RUN apt-get update && apt-get install -y libgomp1 && rm -rf /var/lib/apt/lists/*
+
+ARG TARGETPLATFORM
+
+WORKDIR /FalkorDB
+
+COPY --from=builder /FalkorDB/build/docker/run.sh /FalkorDB/build/docker/run.sh
+COPY --from=builder /FalkorDB/build/docker/gen-certs.sh /FalkorDB/build/docker/gen-certs.sh
+
+COPY --from=builder /FalkorDB/bin/linux*/src/falkordb.so /FalkorDB/bin/src/falkordb.so
+
 ENV ARCH=${TARGETPLATFORM}
 
 EXPOSE 6379/tcp
 
 ENV FALKORDB_ARGS="MAX_QUEUED_QUERIES 25 TIMEOUT 1000 RESULTSET_SIZE 10000"
 
-RUN echo ${MODULE_DIR}
-
 CMD /FalkorDB/build/docker/run.sh
                  
diff --git a/build/docker/run.sh b/build/docker/run.sh
index 22f63af1d..0594a4aef 100755
--- a/build/docker/run.sh
+++ b/build/docker/run.sh
@@ -1,12 +1,4 @@
-if [ "$ARCH" = "linux/amd64" ]
-then
-    export MODULE_DIR=/FalkorDB/bin/linux-x64-release/src
-elif [ "$ARCH" = "linux/arm64" ]
-then
-    export MODULE_DIR=/FalkorDB/bin/linux-arm64v8-release/src
-else
-    echo "Platform not supported"
-fi
+export MODULE_DIR=/FalkorDB/bin/src
 
 if [ ${TLS} -eq 1 ]
 then