diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01c1bc57d..6ed1c7911 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -139,6 +139,18 @@ build:ubuntu-latest:
     - make -j$(nproc)
     - make install
 
+build:ubuntu-hirsute:
+  image: ubuntu:hirsute
+  before_script:
+    - >
+       apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential g++ automake autoconf libtool libbz2-dev libmysqlclient-dev unixodbc-dev libpq-dev postgresql-server-dev-13 libsqlite0-dev libsqlite3-dev libglib2.0-dev libgtk2.0-dev libcurl4-gnutls-dev libgtkglext1-dev libpcre3-dev libsdl-sound1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libxml2-dev libxslt1-dev librsvg2-dev libpoppler-dev libpoppler-private-dev libpoppler-glib-dev libpoppler-cpp-dev libasound2-dev libdirectfb-dev libxtst-dev libffi-dev libglew-dev libimlib2-dev libv4l-dev libsdl-ttf2.0-dev libgdk-pixbuf2.0-dev linux-libc-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcairo2-dev libgsl-dev libncurses5-dev libgmime-3.0-dev llvm-dev llvm libalure-dev libgmp-dev libgtk-3-dev libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsdl2-image-dev sane-utils libdumb1-dev libssl-dev libqt5opengl5-dev libqt5svg5-dev libqt5webkit5-dev libqt5x11extras5-dev qtbase5-dev qtwebengine5-dev libwebkit2gtk-4.0-dev git
+
+  script:
+    - ./reconf-all
+    - GAMBAS_CONFIG_FAILURE=1 ./configure -C --disable-keyring --disable-qt4
+    - make -j$(nproc)
+    - make install
+
 build:ubuntu-focal:
   image: ubuntu:focal
   before_script:
@@ -209,7 +221,7 @@ build:fedora-latest:
   image: fedora:latest
   before_script:
     - >
-       dnf groupinstall -y "Development Tools" "Development Libraries" && dnf install -y libtool libtool-ltdl-devel dumb-devel gmime-devel gmime30-devel libffi-devel mariadb-devel postgresql-devel unixODBC-devel sqlite2-devel libsqlite3x-devel SDL-devel SDL_*-devel libxslt-devel libv4l-devel glew-devel poppler-devel poppler-glib-devel poppler-cpp-devel qt-devel SDL2-devel SDL2_*-devel cairo-devel gtk2-devel imlib2-devel librsvg2-devel qt-webkit-devel openal-soft-devel libjpeg-turbo-devel gtkglext-devel gtk3-devel libxml2-devel libXtst-devel gsl-devel pcre-devel mesa-libGL*-devel dbus-devel libcurl-devel alure-devel gstreamer1-devel gstreamer1-plugins-base-devel libgnome-keyring-devel bzip2-devel mariadb-*-devel postgresql-libs libglvnd-devel efl-devel compiz-devel gtk+-devel gtk+extra-devel gtk2-engines-devel qt-devel-private qt5-*-devel postgresql-server-devel webkit2gtk3-devel
+       dnf install -y libtool libtool-ltdl-devel gcc make autoconf dumb-devel gmime-devel gmime30-devel libffi-devel mariadb-devel postgresql-devel unixODBC-devel sqlite2-devel libsqlite3x-devel libxslt-devel libv4l-devel glew-devel poppler-devel poppler-glib-devel poppler-cpp-devel qt-devel qt5-qtbase-devel qt5-qtbase-private-devel qt5-qtwebengine-devel qt5-qtx11extras-devel qt5-qtsvg-devel SDL_ttf-devel SDL_mixer-devel SDL-devel SDL2_ttf-devel SDL2_mixer-devel SDL2_image-devel SDL2-devel cairo-devel gtk2-devel gtk3-devel imlib2-devel librsvg2-devel qt-webkit-devel qt5-qtwebkit qt5-qtwebkit-devel openal-soft-devel libjpeg-turbo-devel gtkglext-devel gmp-devel libxml2-devel libXtst-devel gsl-devel pcre-devel dbus-devel libcurl-devel alure-devel gstreamermm-devel libgnome-keyring-devel bzip2-devel postgresql-server-devel webkit2gtk3-devel
   script:
     - ./reconf-all
     - GAMBAS_CONFIG_FAILURE=1 ./configure -C