diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 701bd83d4a..ce26c053bf 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -50,38 +50,45 @@ jobs:
       - run: make acceptance-tests-run
 
       # Extract artifacts
-      - run: docker run --rm --detach --name=builder mapfish_print_builder
+      - run: docker run --rm --detach --name=builder mapfish_print_builder || true
         if: always()
-      - run: docker cp builder:/src/core/build/ core/build/
+      - run: docker cp builder:/src/core/build/ core/build/ || true
         if: always()
 
-      - run: docker cp mapfish-print_tests_1:/src/examples/build/ examples/build/
+      - run: docker cp mapfish-print_tests_1:/src/examples/build/ examples/build/ || true
         if: always()
 
-      - run: docker-compose logs
+      - run: docker-compose logs || true
         if: failure()
 
       - run: make acceptance-tests-down
 
+      - run: mkdir -p core/build/resources/actual examples/build/reports core/build/reports
+          examples/build/resources/test/examples
+        if: always()
       - uses: actions/upload-artifact@v1
         with:
           name: Test results
           path: core/build/resources/actual
+          if-no-files-found: ignore
         if: failure()
       - uses: actions/upload-artifact@v1
         with:
           name: Reports examples
           path: examples/build/reports
+          if-no-files-found: ignore
         if: failure()
       - uses: actions/upload-artifact@v1
         with:
           name: Reports core
           path: core/build/reports
+          if-no-files-found: ignore
         if: failure()
       - uses: actions/upload-artifact@v1
         with:
           name: Examples
           path: examples/build/resources/test/examples
+          if-no-files-found: ignore
         if: failure()
 
       - name: Collect test results
diff --git a/core/build.gradle b/core/build.gradle
index 982d00bd91..0ad967efcb 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -112,7 +112,7 @@ ext {
 dependencies {
     def slf4jVersion = '1.7.30'
     def metricsVersion = '4.1.17'
-    def geotoolsVersion = '22.3'
+    def geotoolsVersion = '24.2'
     def logbackVersion = '1.2.3'
 
     compile(
diff --git a/core/src/main/java/org/mapfish/print/cli/CliServletContext.java b/core/src/main/java/org/mapfish/print/cli/CliServletContext.java
index c1a01c8a2f..c0d0eeea34 100644
--- a/core/src/main/java/org/mapfish/print/cli/CliServletContext.java
+++ b/core/src/main/java/org/mapfish/print/cli/CliServletContext.java
@@ -283,4 +283,33 @@ public void declareRoles(final String... roleNames) {
     public String getVirtualServerName() {
         return null;
     }
+
+    @Override
+    public void setResponseCharacterEncoding(final String enc) {}
+
+    @Override
+    public String getResponseCharacterEncoding() {
+        return null;
+    }
+
+    @Override
+    public void setRequestCharacterEncoding(final String enc) {}
+
+    @Override
+    public String getRequestCharacterEncoding() {
+        return null;
+    }
+
+    @Override
+    public void setSessionTimeout(final int timeout) {}
+
+    @Override
+    public int getSessionTimeout() {
+        return 0;
+    }
+
+    @Override
+    public javax.servlet.ServletRegistration.Dynamic addJspFile(String p1, String p2) {
+        return null;
+    }
 }
diff --git a/core/src/test/resources/org/mapfish/print/processor/map/bbox_geojson_label_style/expectedSimpleImage.png b/core/src/test/resources/org/mapfish/print/processor/map/bbox_geojson_label_style/expectedSimpleImage.png
index 002359ca7d..988c17fcca 100644
Binary files a/core/src/test/resources/org/mapfish/print/processor/map/bbox_geojson_label_style/expectedSimpleImage.png and b/core/src/test/resources/org/mapfish/print/processor/map/bbox_geojson_label_style/expectedSimpleImage.png differ
diff --git a/examples/src/test/resources/examples/simple/expected_output/requestData-fontawesome.png b/examples/src/test/resources/examples/simple/expected_output/requestData-fontawesome.png
index d52e9cbc40..f78cbbe975 100644
Binary files a/examples/src/test/resources/examples/simple/expected_output/requestData-fontawesome.png and b/examples/src/test/resources/examples/simple/expected_output/requestData-fontawesome.png differ