diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml
index e8be0053..934c4a01 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build-linux.yml
@@ -6,7 +6,7 @@ jobs:
     build-matrix:
       strategy:
         matrix:
-          os: [ ubuntu-20.04 ]
+          os: [ ubuntu-latest ]
           option: [ minimal, default, maximal ]
       runs-on: ${{ matrix.os }}
       steps:
@@ -17,9 +17,11 @@ jobs:
           run: |
             if [[ 'minimal,default,maximal' =~ ${{ matrix.option }} ]]
             then
+              sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
               sudo apt-get update -y
               sudo apt-get upgrade -y
               sudo apt-get install -y libcurl4-openssl-dev apache2-dev
+              sudo apt-get install -y libpng-dev libjpeg-dev
             fi
             if [[ 'default,maximal' =~ ${{ matrix.option }} ]]
             then
@@ -69,7 +71,7 @@ jobs:
 
         - name: Run tests
           run: |
-            if [[ 'ubuntu-20.04' == ${{ matrix.os }} ]] \
+            if [[ 'ubuntu-latest' == ${{ matrix.os }} ]] \
                && [[ 'default' == ${{ matrix.option }} ]]
             then
               cd ${{ github.workspace }}/tests
diff --git a/lib/source_mapserver.c b/lib/source_mapserver.c
index faff7792..ca6141fc 100644
--- a/lib/source_mapserver.c
+++ b/lib/source_mapserver.c
@@ -60,7 +60,7 @@ struct mc_mapobj {
 void mapcache_mapserver_connection_constructor(mapcache_context *ctx, void **conn_, void *params) {
   mapcache_source_mapserver *src = (mapcache_source_mapserver*) params;
   struct mc_mapobj *mcmap = calloc(1,sizeof(struct mc_mapobj));
-  mcmap->map = msLoadMap(src->mapfile,NULL);
+  mcmap->map = msLoadMap(src->mapfile,NULL, NULL);
   if(!mcmap->map) {
     errorObj *errors = NULL;
     ctx->set_error(ctx, 500, "Failed to load mapfile '%s'",src->mapfile);
@@ -229,7 +229,7 @@ void _mapcache_source_mapserver_configuration_check(mapcache_context *ctx, mapca
   msSetup();
 
   /* do a test load to check the mapfile is correct */
-  map = msLoadMap(src->mapfile, NULL);
+  map = msLoadMap(src->mapfile, NULL, NULL);
   if(!map) {
     msWriteError(stderr);
     ctx->set_error(ctx,400,"failed to load mapfile \"%s\"",src->mapfile);