diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 16f18f29..5c94a262 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -26,31 +26,31 @@ jobs:
       matrix:
         architecture:
           - name: x86_64
-            ubuntu_version: 18.04
-            gcc_package_name: "gcc g++"
-            gcc_exec_name: "x86_64-linux-gnu"
+            centos_version: "6-gcc7"
+            gcc_package_name: "gcc gcc-c++"
+            gcc_exec_name: "x86_64-redhat-linux-gnu"
           - name: x86
-            ubuntu_version: 18.04
+            ubuntu_version: "18.04"
             gcc_package_name: "gcc-i686-linux-gnu g++-i686-linux-gnu"
             gcc_exec_name: "i686-linux-gnu"
           - name: aarch64
-            ubuntu_version: 18.04
+            ubuntu_version: "18.04"
             gcc_package_name: "gcc-aarch64-linux-gnu g++-aarch64-linux-gnu"
             gcc_exec_name: "aarch64-linux-gnu"
           - name: armv7
-            ubuntu_version: 18.04
+            ubuntu_version: "18.04"
             gcc_package_name: "gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf"
             gcc_exec_name: "arm-linux-gnueabihf"
           - name: ppc64le
-            ubuntu_version: 18.04
+            ubuntu_version: "18.04"
             gcc_package_name: "gcc-powerpc64le-linux-gnu g++-powerpc64le-linux-gnu"
             gcc_exec_name: "powerpc64le-linux-gnu"
           - name: riscv64
-            ubuntu_version: 18.04
+            ubuntu_version: "18.04"
             gcc_package_name: "gcc-riscv64-linux-gnu g++-riscv64-linux-gnu"
             gcc_exec_name: "riscv64-linux-gnu"
           - name: s390x
-            ubuntu_version: 18.04
+            ubuntu_version: "18.04"
             gcc_package_name: "gcc-s390x-linux-gnu g++-s390x-linux-gnu"
             gcc_exec_name: "s390x-linux-gnu"
         java_version: [ 8, 11, 17, 21 ]
@@ -69,32 +69,40 @@ jobs:
       - name: Setup JDK
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
+          distribution: 'corretto'
           java-version: ${{ matrix.java_version }}
           architecture: 'x64'
           check-latest: true
 
-      - name: Setup Build
+      - name: Setup Ubuntu Build
+        if: ${{ matrix.architecture.ubuntu_version }}
         run: |
           docker build \
               --platform linux/amd64 \
               --build-arg "DOCKER_IMAGE=amd64/ubuntu:${{ matrix.architecture.ubuntu_version }}" \
-              --build-arg "JAVA_VERSION=${{ matrix.java_version }}" \
               --build-arg "TARGET_GCC_PACKAGE=${{ matrix.architecture.gcc_package_name }}" \
               --build-arg "TARGET_GCC_EXEC=${{ matrix.architecture.gcc_exec_name }}" \
               --tag linux-buildimage:${{ matrix.architecture.name }} \
               docker/build/
 
-      - name: Build
+      - name: Setup CentOS Build
+        if: ${{ matrix.architecture.centos_version }}
         run: |
-          export MAVEN_HOME=$(dirname $(dirname $(which mvn)))
+          docker build \
+              --platform linux/amd64 \
+              --build-arg "DOCKER_IMAGE=gatlingcorp/centos:${{ matrix.architecture.centos_version }}" \
+              --build-arg "TARGET_GCC_PACKAGE=${{ matrix.architecture.gcc_package_name }}" \
+              --build-arg "TARGET_GCC_EXEC=${{ matrix.architecture.gcc_exec_name }}" \
+              --tag linux-buildimage:${{ matrix.architecture.name }} \
+              docker/centosbuild/
 
+      - name: Build
+        run: |
           chmod +x ./mvnw ./mvnw.cmd
           docker run \
               --platform linux/amd64 \
               --volume "$PWD:/data" \
               --volume "$JAVA_HOME:/opt/java" \
-              --volume "$MAVEN_HOME:/opt/maven" \
               linux-buildimage:${{ matrix.architecture.name }} \
                   ./mvnw -B -V -ntp -P "linux-${{ matrix.architecture.name }}" "-Dmaven.test.skip=true" clean package
 
@@ -245,14 +253,11 @@ jobs:
 
       - name: Build
         run: |
-          export MAVEN_HOME=$(dirname $(dirname $(which mvn)))
-
           chmod +x ./mvnw ./mvnw.cmd
           docker run \
               --platform linux/amd64 \
               --volume "$PWD:/data" \
               --volume "$JAVA_HOME:/opt/java" \
-              --volume "$MAVEN_HOME:/opt/maven" \
               linux-buildimage:complete \
                   ./mvnw -B -V -ntp -P "release" "-Dmaven.test.skip=true" package
 
@@ -285,7 +290,7 @@ jobs:
             java_distro: 'temurin'
             java_name: aarch64
             docker_name: linux/aarch64
-        ubuntu_version: [ 16.04, 18.04, 20.04, 22.04, 24.04 ]
+        ubuntu_version: [ "16.04", "18.04", "20.04", "22.04", "24.04" ]
         java_version: [ 8, 11, 17, 21 ]
 
     needs: [ Linux-Build ]
@@ -328,14 +333,11 @@ jobs:
 
       - name: Test
         run: |
-          export MAVEN_HOME=$(dirname $(dirname $(which mvn)))
-
           chmod +x ./mvnw ./mvnw.cmd
           docker run \
               --platform ${{ matrix.architecture.docker_name }} \
               --volume "$PWD:/data" \
               --volume "$JAVA_HOME:/opt/java" \
-              --volume "$MAVEN_HOME:/opt/maven" \
               linux-testimage:${{ matrix.architecture.name }} \
                   ./mvnw -B -V -ntp -P "release" test
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48cdb0cd..d9b25647 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,8 +21,8 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     SET (CMAKE_BUILD_TYPE Release)
 endif()
 message(STATUS "Build type is '${CMAKE_BUILD_TYPE}'")
-SET (CMAKE_C_FLAGS "-flto")
-SET (CMAKE_CXX_FLAGS "-Wall -flto")
+SET (CMAKE_C_FLAGS "")
+SET (CMAKE_CXX_FLAGS "-Wall")
 
 SET (CMAKE_CXX_STANDARD 11)
 SET (CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -73,4 +73,4 @@ add_library (brotli ${LIB_TYPE}
                 		"natives/src/main/cpp/encoder_jni.cc"
                 )
 
-SET_TARGET_PROPERTIES (brotli PROPERTIES LINKER_LANGUAGE CXX)
+SET_TARGET_PROPERTIES (brotli PROPERTIES LINKER_LANGUAGE CXX)
\ No newline at end of file
diff --git a/docker/build/Dockerfile b/docker/build/Dockerfile
index 74a06050..7405f557 100644
--- a/docker/build/Dockerfile
+++ b/docker/build/Dockerfile
@@ -14,13 +14,9 @@ RUN apt-get update -y && \
 RUN update-alternatives --install /usr/bin/cc cc /usr/bin/${TARGET_GCC_EXEC}-gcc 999 && \
     update-alternatives --install /usr/bin/c++ c++ /usr/bin/${TARGET_GCC_EXEC}-g++ 999
 
-VOLUME "/opt/java"
-ENV JAVA_HOME="/opt/java"
-ENV PATH="$JAVA_HOME:$PATH"
-
-VOLUME "/opt/maven"
-ENV MAVEN_HOME="/opt/maven"
-ENV PATH="$MAVEN_HOME:$PATH"
+VOLUME "/opt/java/"
+ENV JAVA_HOME "/opt/java/"
+ENV PATH "$PATH:$JAVA_HOME/bin/"
 
 VOLUME "/data"
 WORKDIR "/data"
diff --git a/docker/centosbuild/Dockerfile b/docker/centosbuild/Dockerfile
new file mode 100644
index 00000000..4232bb75
--- /dev/null
+++ b/docker/centosbuild/Dockerfile
@@ -0,0 +1,36 @@
+ARG DOCKER_IMAGE
+FROM ${DOCKER_IMAGE}
+USER root
+
+ARG TARGET_GCC_PACKAGE
+ARG TARGET_GCC_EXEC
+
+ARG CMAKE_VERSION="3.20.5"
+
+COPY setup-repo.sh /setup-repo.sh
+RUN /setup-repo.sh
+
+RUN yum update -y && \
+    yum install -y \
+        "make" ${TARGET_GCC_PACKAGE} \
+        "glibc" "libstdc++"
+
+RUN update-alternatives --install /usr/bin/cc cc /usr/bin/${TARGET_GCC_EXEC}-gcc 999 && \
+    update-alternatives --install /usr/bin/c++ c++ /usr/bin/${TARGET_GCC_EXEC}-g++ 999
+
+VOLUME "/opt/java/"
+ENV JAVA_HOME "/opt/java/"
+ENV PATH "$PATH:$JAVA_HOME/bin/"
+
+RUN curl -L "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.tar.gz" -o cmake.tar.gz && \
+    mkdir /opt/cmake && \
+    tar -xzf cmake.tar.gz -C /opt/cmake --strip-components 1 && \
+    rm cmake.tar.gz
+
+ENV PATH "$PATH:/opt/cmake/bin/"
+
+VOLUME "/data/"
+WORKDIR "/data/"
+
+ENTRYPOINT [ ]
+CMD [ "/bin/bash" ]
\ No newline at end of file
diff --git a/docker/centosbuild/setup-repo.sh b/docker/centosbuild/setup-repo.sh
new file mode 100755
index 00000000..5361fc01
--- /dev/null
+++ b/docker/centosbuild/setup-repo.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+(cat <<EOF
+[base]
+name=CentOS-\$releasever - Base
+baseurl=http://archive.kernel.org/centos-vault/6.10/os/\$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
+
+[updates]
+name=CentOS-\$releasever - Updates
+baseurl=http://archive.kernel.org/centos-vault/6.10/os/\$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
+
+[extras]
+name=CentOS-\$releasever - Extras
+baseurl=http://archive.kernel.org/centos-vault/6.10/os/\$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
+EOF
+) | tee /etc/yum.repos.d/CentOS-Base.repo
\ No newline at end of file
diff --git a/docker/completebuild/Dockerfile b/docker/completebuild/Dockerfile
index a936d7e5..b1402e1f 100644
--- a/docker/completebuild/Dockerfile
+++ b/docker/completebuild/Dockerfile
@@ -7,13 +7,9 @@ RUN apt-get update -y && \
         "libc6" "libstdc++6" "libatomic1" "zlib1g" && \
     apt-get clean
 
-VOLUME "/opt/java"
-ENV JAVA_HOME="/opt/java"
-ENV PATH="$JAVA_HOME:$PATH"
-
-VOLUME "/opt/maven"
-ENV MAVEN_HOME="/opt/maven"
-ENV PATH="$MAVEN_HOME:$PATH"
+VOLUME "/opt/java/"
+ENV JAVA_HOME "/opt/java/"
+ENV PATH "$PATH:$JAVA_HOME/bin/"
 
 VOLUME "/data"
 WORKDIR "/data"
diff --git a/docker/install-qemu.sh b/docker/install-qemu.sh
index 6132c527..6be90a27 100755
--- a/docker/install-qemu.sh
+++ b/docker/install-qemu.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 sudo dpkg --add-architecture "$1"
 sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/ubuntu.sources
 if [[ $2 != true ]]; then
diff --git a/docker/merge-builds.sh b/docker/merge-builds.sh
index 84e6df39..165a00d5 100755
--- a/docker/merge-builds.sh
+++ b/docker/merge-builds.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 OUT="$PWD"
 rootPaths=($(find ./builds/*/natives/ -type d -name "target" | grep -oiP '(.*)\/([^-]*-[^-]*)-Build-JDK([0-9]*)(?=\/natives\/\2\/target)'))
 paths=($(find ./builds/*/natives/ -type d -name "target" | grep -oiP '(?:(.*)\/([^-]*-[^-]*)-Build-JDK([0-9]*)\/)natives\/\2\/target'))
diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile
index a936d7e5..b1402e1f 100644
--- a/docker/test/Dockerfile
+++ b/docker/test/Dockerfile
@@ -7,13 +7,9 @@ RUN apt-get update -y && \
         "libc6" "libstdc++6" "libatomic1" "zlib1g" && \
     apt-get clean
 
-VOLUME "/opt/java"
-ENV JAVA_HOME="/opt/java"
-ENV PATH="$JAVA_HOME:$PATH"
-
-VOLUME "/opt/maven"
-ENV MAVEN_HOME="/opt/maven"
-ENV PATH="$MAVEN_HOME:$PATH"
+VOLUME "/opt/java/"
+ENV JAVA_HOME "/opt/java/"
+ENV PATH "$PATH:$JAVA_HOME/bin/"
 
 VOLUME "/data"
 WORKDIR "/data"