diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49fce8543..3776750b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,6 @@ build:debian-8:
    - echo "" > /etc/apt/apt.conf.d/50venenuxcustom
    - echo "APT::Get::AllowUnauthenticated \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
    - echo "Acquire::AllowInsecureRepositories \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
-   - rm -rf /etc/apt/sources.list
    - apt-get update -y || true
    - apt-get -y --force-yes install build-essential cmake pkg-config debhelper lsb-release gettext libbz2-dev libcurl4-gnutls-dev libnl-genl-3-dev libnl-3-dev librtmp-dev libidn11-dev libncurses-dev libfreetype6-dev libglu1-mesa-dev libgmp-dev libirrlicht-dev libjpeg-dev libjsoncpp-dev libleveldb-dev libluajit-5.1-dev liblua5.1-dev libogg-dev libopenal-dev libpng-dev libpq-dev libhiredis-dev libspatialindex-dev libsqlite3-dev libvorbis-dev libx11-dev libxxf86vm-dev libpq-dev libhiredis-dev zlib1g-dev doxygen libxrandr-dev x11proto-xf86vidmode-dev
 
@@ -71,7 +70,7 @@ build:ubuntu-20.04:
  <<: *build_definition
  image: ubuntu:focal
  before_script:
-   - DEBIAN_FRONTEND=noninteractive apt-get update -y || true
+   - DEBIAN_FRONTEND=noninteractive apt-get update -y
    - DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential cmake pkg-config debhelper lsb-release gettext libbz2-dev libcurl4-gnutls-dev libnl-genl-3-dev librtmp-dev libidn11-dev libncurses-dev libfreetype6-dev libglu1-mesa-dev libgmp-dev libirrlicht-dev libjpeg-dev libjsoncpp-dev libleveldb-dev libluajit-5.1-dev liblua5.1-dev libogg-dev libopenal-dev libpng-dev libpq-dev libhiredis-dev libspatialindex-dev libsqlite3-dev libvorbis-dev libx11-dev libxxf86vm-dev postgresql-server-dev-all zlib1g-dev doxygen libxrandr-dev mesa-common-dev x11proto-xf86vidmode-dev libzstd-dev
 
 # Utopic most close to jessie
@@ -80,7 +79,9 @@ build:ubuntu-14.10:
  <<: *build_definition
  image: ubuntu:utopic
  before_script:
-   - cat > /etc/apt/apt.conf.d/50venenuxcustom << EOF\nAPT::Get::AllowUnauthenticated "true";\nAcquire::AllowInsecureRepositories "true";\nEOF
+   - echo "" > /etc/apt/apt.conf.d/50venenuxcustom
+   - echo "APT::Get::AllowUnauthenticated \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
+   - echo "Acquire::AllowInsecureRepositories \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
    - rm -rf /etc/apt/sources.list
    - echo "deb http://old-releases.ubuntu.com/ubuntu/ utopic main restricted universe multiverse" >  /etc/apt/sources.list.d/50debianoficial.list
    - echo "deb http://old-releases.ubuntu.com/ubuntu/ utopic-updates main restricted universe multiverse" >>  /etc/apt/sources.list.d/50debianoficial.list
@@ -94,7 +95,9 @@ build:ubuntu-17.04:
  <<: *build_definition
  image: ubuntu:zesty
  before_script:
-   - cat > /etc/apt/apt.conf.d/50venenuxcustom << EOF\nAPT::Get::AllowUnauthenticated "true";\nAcquire::AllowInsecureRepositories "true";\nEOF
+   - echo "" > /etc/apt/apt.conf.d/50venenuxcustom
+   - echo "APT::Get::AllowUnauthenticated \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
+   - echo "Acquire::AllowInsecureRepositories \"true\";" >> /etc/apt/apt.conf.d/50venenuxcustom
    - rm -rf /etc/apt/sources.list
    - echo "deb http://old-releases.ubuntu.com/ubuntu/ zesty main restricted universe multiverse" >  /etc/apt/sources.list.d/50debianoficial.list
    - echo "deb http://old-releases.ubuntu.com/ubuntu/ zesty-updates main restricted universe multiverse" >>  /etc/apt/sources.list.d/50debianoficial.list
@@ -110,10 +113,10 @@ build:fedora-36:
   <<: *build_definition
   image: fedora:36
   before_script:
-    - dnf -y install make automake gcc gcc-c++ kernel-devel cmake pkgconfig bzip2-devel gettext-devel sqlite-devel zlib-devel libpng-devel libjpeg-turbo-devel libXxf86vm-devel mesa-libGL-devel desktop-file-utils systemd openal* libvorbis* jsoncpp-devel libcurl* luajit-devel leveldb-devel gmp-devel libappstream-glib freetype-devel spatialindex-devel openssl-devel libogg-devel libpq-devel hiredis-devel libzstd-devel libXi-devel ncurses-devel doxygen
+    - dnf -y install make automake gcc gcc-c++ kernel-devel cmake pkgconfig bzip2-devel gettext-devel sqlite-devel zlib-devel libpng-devel libjpeg-turbo-devel libXxf86vm-devel mesa-libGL-devel irrlicht-devel desktop-file-utils systemd openal* libvorbis* jsoncpp-devel libcurl-devel libcurl luajit-devel leveldb-devel gmp-devel libappstream-glib freetype-devel spatialindex-devel openssl-devel libogg-devel libpq-devel hiredis-devel libzstd-devel libXi-devel ncurses-devel doxygen
 
 build:fedora-37:
   <<: *build_definition
   image: fedora:37
   before_script:
-    - dnf -y install make automake gcc gcc-c++ kernel-devel cmake pkgconfig bzip2-devel gettext-devel sqlite-devel zlib-devel libpng-devel libjpeg-turbo-devel libXxf86vm-devel mesa-libGL-devel desktop-file-utils systemd openal* libvorbis* jsoncpp-devel libcurl* luajit-devel leveldb-devel gmp-devel libappstream-glib freetype-devel spatialindex-devel openssl-devel libogg-devel libpq-devel hiredis-devel libzstd-devel libXi-devel ncurses-devel doxygen
+    - dnf -y install make automake gcc gcc-c++ kernel-devel cmake pkgconfig bzip2-devel gettext-devel sqlite-devel zlib-devel libpng-devel libjpeg-turbo-devel libXxf86vm-devel mesa-libGL-devel irrlicht-devel desktop-file-utils systemd openal* libvorbis* jsoncpp-devel libcurl-devel libcurl luajit-devel leveldb-devel gmp-devel libappstream-glib freetype-devel spatialindex-devel openssl-devel libogg-devel libpq-devel hiredis-devel libzstd-devel libXi-devel ncurses-devel doxygen