diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 876040f..e998b80 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     strategy:
       matrix:
@@ -33,13 +33,13 @@ jobs:
           sudo apt update
           sudo DEBIAN_FRONTEND=noninteractive NEEDRESTART_SUSPEND=non-empty-value apt install -y \
             automake autotools-dev lcov libcurl4-gnutls-dev \
-            libedit-dev libeditline-dev libjemalloc-dev libncurses-dev \
+            libedit-dev libjemalloc-dev libncurses-dev \
             liblua5.1-0-dev libluajit-5.1-dev libpcre3-dev libtool lua5.1 \
-            luajit python-docutils python3-sphinx vim-common
+            luajit python3-docutils python3-sphinx vim-common
 
       - name: Install Varnish Cache
         run: |
-          wget --no-check-certificate https://varnish-cache.org/_downloads/varnish-6.0.9.tgz
+          wget --no-check-certificate https://varnish-cache.org/_downloads/varnish-6.0.13.tgz
           tar zxvf varnish-*.tgz
           pushd varnish-*/
           ./autogen.sh
diff --git a/Dockerfile b/Dockerfile
index c5af948..45f020c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20211006
+FROM ubuntu:noble-20240423
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -21,7 +21,6 @@ RUN apt update \
         less \
         libcurl4-gnutls-dev \
         libedit-dev \
-        libeditline-dev \
         libjemalloc-dev \
         liblua5.1-0-dev \
         libluajit-5.1-dev \
@@ -32,7 +31,7 @@ RUN apt update \
         luajit \
         make \
         nano \
-        netcat \
+        netcat-traditional \
         pkg-config \
         python3 \
         python3-docutils \
@@ -47,7 +46,7 @@ RUN apt update \
     && rm -rf /var/lib/apt/lists/*
 
 RUN cd /tmp \
-    && wget --no-check-certificate https://varnish-cache.org/_downloads/varnish-6.0.9.tgz \
+    && wget --no-check-certificate https://varnish-cache.org/_downloads/varnish-6.0.13.tgz \
     && tar zxvf varnish-*.tgz \
     && rm -f varnish-*.tgz \
     && cd varnish-* \
diff --git a/Makefile.am b/Makefile.am
index e84a7ec..67808b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,7 @@ dist_doc_DATA = README.rst LICENSE
 
 CODE_COVERAGE_OUTPUT_DIRECTORY = lcov
 CODE_COVERAGE_IGNORE_PATTERN = "/usr/*" cJSON.c ini.c duktape.c
+CODE_COVERAGE_LCOV_RMOPTS = --ignore-errors unused
 CODE_COVERAGE_GENHTML_OPTIONS = --prefix $(abs_top_srcdir)
 
 @CODE_COVERAGE_RULES@