diff --git a/Dockerfile b/Dockerfile
index f73ad7ac..89bb6a0c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,12 @@
-FROM debian:buster-slim
+FROM debian:stable-slim
 
 # For i386
-#FROM i386/debian:buster-slim
+#FROM i386/debian:stable-slim
 #ENTRYPOINT ["linux32", "--"]
 
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199
 RUN mkdir -p /usr/share/man/man1
 
-RUN apt-get update && apt-get install openjdk-10-jdk-headless git-core bash libtool automake autoconf make g++
+RUN apt-get update && apt-get install -y default-jdk-headless git-core bash libtool automake autoconf make g++
 RUN git clone --depth=3 $(: --shallow-submodules) --recurse-submodules https://gitlab.com/MasterPassword/MasterPassword.git /mpw
 RUN cd /mpw/gradle && ./gradlew -i clean build
diff --git a/platform-independent/c/core/lib/linux/x86/libmpw.so b/platform-independent/c/core/lib/linux/x86/libmpw.so
index d4a724c3..13b37cc5 100755
Binary files a/platform-independent/c/core/lib/linux/x86/libmpw.so and b/platform-independent/c/core/lib/linux/x86/libmpw.so differ
diff --git a/platform-independent/c/core/lib/linux/x86_64/libmpw.so b/platform-independent/c/core/lib/linux/x86_64/libmpw.so
index f7566bb9..43a07d04 100755
Binary files a/platform-independent/c/core/lib/linux/x86_64/libmpw.so and b/platform-independent/c/core/lib/linux/x86_64/libmpw.so differ