diff --git a/Dockerfile b/Dockerfile
index 1ebe594..c5ebeb4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 ARG LANGUAGETOOL_VERSION=6.0
 
-FROM debian:buster as build
+FROM debian:bullseye as build
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -14,6 +14,14 @@ RUN apt-get update -y \
     maven \
     unzip \
     xmlstarlet \
+
+    # packages required for arm64-workaround
+    build-essential \
+    cmake \
+    mercurial \
+    texlive \
+    wget \
+    zip \
     && apt-get clean
 
 RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
@@ -31,10 +39,14 @@ RUN LANGUAGETOOL_DIST_FOLDER=$(find /dist/ -name 'LanguageTool-*') && mv $LANGUA
 # Execute workarounds for ARM64 architectures.
 # https://github.com/languagetool-org/languagetool/issues/4543
 WORKDIR /
-COPY arm64-workaround/. .
-RUN chmod +x ./bridj.sh ./hunspell.sh
-RUN bash -c "./bridj.sh"
-RUN bash -c "./hunspell.sh"
+COPY arm64-workaround/bridj.sh arm64-workaround/bridj.sh
+RUN chmod +x arm64-workaround/bridj.sh
+RUN bash -c "arm64-workaround/bridj.sh"
+
+COPY arm64-workaround/hunspell.sh arm64-workaround/hunspell.sh
+RUN chmod +x arm64-workaround/hunspell.sh
+RUN bash -c "arm64-workaround/hunspell.sh"
+
 WORKDIR /languagetool
 
 # Note: When changing the base image, verify that the hunspell.sh workaround is
@@ -46,7 +58,7 @@ RUN apk add --no-cache \
     curl \
     libc6-compat \
     libstdc++ \
-    openjdk11-jre-headless
+    openjdk11-jdk
 
 # https://github.com/Erikvl87/docker-languagetool/issues/60
 RUN ln -s /lib64/ld-linux-x86-64.so.2 /lib/ld-linux-x86-64.so.2
diff --git a/arm64-workaround/bridj.patch b/arm64-workaround/bridj.patch
deleted file mode 100644
index 92446cd..0000000
--- a/arm64-workaround/bridj.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/BuildNative b/BuildNative
-index d6de087..a63227e 100755
---- a/BuildNative
-+++ b/BuildNative
-@@ -29,35 +29,7 @@ UNAME_ARCH=`uname -m`
- UNAME_OS=`uname -s | sed s/_NT-.*/_NT/`
- 
- function get_arch() {
--    if [[ -n "$ARCH" ]]; then
--        echo "$ARCH"
--    elif [[ "$UNAME_OS" == "SunOS" ]]; then
--        if [ "`isainfo -n`" = "amd64" ]; then
--		    echo "x64"
--	    else
--		    echo "x86"
--	    fi
--    elif [[ "$UNAME_OS" == "Darwin" ]]; then
--	    echo "universal"
--    else
--        case $UNAME_ARCH in
--        i86pc|i386|i486|i586|i686|x86)
--	        echo x86
--	        ;;
--        x86_64|amd64)
--	        echo x64
--	        ;;
--        arm*)
--			    if [[ -d /lib/arm-linux-gnueabihf ]] ; then
--	        	echo "armhf"
--	        elif [[ -d /lib/arm-linux-gnueabi ]] ; then
--	        	echo "armel"
--    	    else
--    		    failed "Unknown Linux arm flavour: please edit $0 and Platform.java"
--	        fi
--	        ;;
--        esac
--    fi
-+    echo "aarch64"
- }
- 
- function get_os() {
-diff --git a/pom.xml b/pom.xml
-index ec9a1b4..f97fe68 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -87,6 +87,15 @@
- 			</extension>
- 		</extensions>
- 		<plugins>
-+      <plugin>
-+        <groupId>org.apache.maven.plugins</groupId>
-+        <artifactId>maven-compiler-plugin</artifactId>
-+        <version>3.8.1</version>
-+        <configuration>
-+          <source>1.8</source>
-+          <target>1.8</target>
-+        </configuration>
-+      </plugin>
- 			<!--plugin>
- 			<groupId>org.codehaus.mojo</groupId>
- 			<artifactId>native-maven-plugin</artifactId>
-@@ -314,6 +323,8 @@
- 							<goal>jar</goal>
- 						</goals>
- 						<configuration>
-+							<source>1.8</source>
-+							<target>1.8</target>
- 							<groups>
- 								<group>
- 									<title>Core Packages</title>
diff --git a/arm64-workaround/bridj.sh b/arm64-workaround/bridj.sh
index 345904a..69d9899 100644
--- a/arm64-workaround/bridj.sh
+++ b/arm64-workaround/bridj.sh
@@ -11,56 +11,39 @@ if [[ $(dpkg --print-architecture) != "arm64" ]]; then
     exit;
 fi
 
-echo "Applying arm64 workaround."
+echo "Applying arm64 workaround for BridJ."
 
 # Make `wget` more robust by passing retry flags.
 alias wget="wget --retry-connrefused --waitretry=30 --read-timeout=30 --timeout=30 --tries=20"
-# Set java environment.
-export JAVA_HOME="/usr/lib/jvm/java-11-openjdk-arm64"
-
-# Install dependencies.
-apt-get install --yes build-essential \
-                      mercurial \
-                      wget \
-                      zip
-apt-get clean
 
 ####################
 ##  BridJ setup   ##
 ####################
-mkdir /BridJ
-cd /BridJ
-git init
-git remote add origin https://github.com/nativelibs4java/BridJ
-git fetch --depth 1 origin 373c03447df44b5a5508e94fa897369b41b18f48
-git checkout FETCH_HEAD
-git apply ../bridj.patch
-wget https://dyncall.org/r1.1/dyncall-1.1.tar.gz
-tar xf dyncall-1.1.tar.gz
-rm dyncall-1.1.tar.gz
-mv dyncall-1.1 dyncall
+git clone http://github.com/nativelibs4java/BridJ.git
+wget https://dyncall.org/r1.4/dyncall-1.4.tar.gz
+tar xf dyncall-1.4.tar.gz
+rm dyncall-1.4.tar.gz
+mv dyncall-1.4 /BridJ/dyncall
 cd /BridJ/dyncall
 hg init
+cd /BridJ
+
+apt-get install -y default-jdk
+mvn clean install -DskipTests -Dmaven.javadoc.skip=true -e
 
 ####################
 ##  BridJ build   ##
 ####################
 cd /BridJ
-./BuildNative
-mvn clean install -DskipTests -Dmaven.install.skip=true -Dmaven.javadoc.skip=true -e
+./BuildNative -DFORCE_JAVA_HOME=/usr/lib/jvm/java-11-openjdk-arm64
 
 ####################
 ## Postprocessing ##
 ####################
 cd /BridJ/target
-mv bridj-0.7.1-SNAPSHOT.jar bridj.jar
-# Extract desired `libbridj.so`. Will create the directory tree, too.
-unzip bridj.jar org/bridj/lib/linux_aarch64/libbridj.so
-# We do not need the `linux_aarch64` folder
-zip -d bridj.jar org/bridj/lib/linux_aarch64
-# Rename the extracted folder to `linux_x64`.
-mv org/bridj/lib/linux_aarch64 org/bridj/lib/linux_x64
-# Replace the `libbridj.so` inside the jar with the arm64 one.
+mv bridj-0.8.0-SNAPSHOT.jar bridj.jar
+unzip bridj.jar org/bridj/lib/linux_arm64/libbridj.so
+cp -R org/bridj/lib/linux_arm64 org/bridj/lib/linux_x64
+zip -d bridj.jar org/bridj/lib/linux_arm64
 zip bridj.jar org/bridj/lib/linux_x64/libbridj.so
-
 mv bridj.jar /dist/LanguageTool/libs/bridj.jar
\ No newline at end of file
diff --git a/arm64-workaround/hunspell.sh b/arm64-workaround/hunspell.sh
index 33538a0..4a0ba20 100644
--- a/arm64-workaround/hunspell.sh
+++ b/arm64-workaround/hunspell.sh
@@ -11,7 +11,7 @@ if [[ $(dpkg --print-architecture) != "arm64" ]]; then
     exit;
 fi
 
-echo "Applying arm64 workaround."
+echo "Applying arm64 workaround for Hunspell."
 
 # Make `wget` more robust by passing retry flags.
 alias wget="wget --retry-connrefused --waitretry=30 --read-timeout=30 --timeout=30 --tries=20"
@@ -22,8 +22,9 @@ alias wget="wget --retry-connrefused --waitretry=30 --read-timeout=30 --timeout=
 ##############################
 mkdir /hunspell
 cd /hunspell
-wget http://dl-cdn.alpinelinux.org/alpine/v3.17/main/aarch64/libhunspell-1.7.1-r0.apk
-tar --warning=no-unknown-keyword -xzf libhunspell-1.7.1-r0.apk
-mkdir -p /hunspell/org/bridj/lib/linux_x64/
-mv /hunspell/usr/lib/libhunspell-1.7.so.0.0.1 /hunspell/org/bridj/lib/linux_x64/libhunspell.so
-zip /dist/LanguageTool/libs/hunspell.jar org/bridj/lib/linux_x64/libhunspell.so
\ No newline at end of file
+wget https://dl-cdn.alpinelinux.org/alpine/v3.16/main/aarch64/libhunspell-1.7.0-r1.apk
+tar --warning=no-unknown-keyword -xzf libhunspell-1.7.0-r1.apk
+mkdir -p /hunspell/org/bridj/lib/linux-aarch64/
+mv /hunspell/usr/lib/libhunspell-1.7.so.0.0.1 /hunspell/org/bridj/lib/linux-aarch64/libhunspell.so
+cd /hunspell/org/bridj/lib/
+zip /dist/LanguageTool/libs/hunspell.jar linux-aarch64/libhunspell.so
\ No newline at end of file