diff --git a/utils/tests/gitlab-ci-fedora.yml b/utils/tests/gitlab-ci-fedora.yml
index 6dba0de67..cbab34f72 100644
--- a/utils/tests/gitlab-ci-fedora.yml
+++ b/utils/tests/gitlab-ci-fedora.yml
@@ -18,24 +18,24 @@
   variables:
     COMPILER: g++
 
-# Fedora 33
-weekly-build-fedora-33-debug:
-  extends: .weekly-build-fedora
-  image: fedora:33
-  variables:
-    MODE: debug
+# # Fedora 33
+# weekly-build-fedora-33-debug:
+#   extends: .weekly-build-fedora
+#   image: fedora:33
+#   variables:
+#     MODE: debug
 
-weekly-build-fedora-33-release:
-  extends: .weekly-build-fedora
-  image: fedora:33
-  variables:
-    MODE: release
+# weekly-build-fedora-33-release:
+#   extends: .weekly-build-fedora
+#   image: fedora:33
+#   variables:
+#     MODE: release
 
-weekly-build-fedora-33-optimized:
-  extends: .weekly-build-fedora
-  image: fedora:33
-  variables:
-    MODE: optimized
+# weekly-build-fedora-33-optimized:
+#   extends: .weekly-build-fedora
+#   image: fedora:33
+#   variables:
+#     MODE: optimized
 
 # Fedora 34
 weekly-build-fedora-34-debug:
@@ -55,3 +55,22 @@ weekly-build-fedora-34-optimized:
   image: fedora:34
   variables:
     MODE: optimized
+
+# Fedora 35
+weekly-build-fedora-35-debug:
+  extends: .weekly-build-fedora
+  image: fedora:35
+  variables:
+    MODE: debug
+
+weekly-build-fedora-35-release:
+  extends: .weekly-build-fedora
+  image: fedora:35
+  variables:
+    MODE: release
+
+weekly-build-fedora-35-optimized:
+  extends: .weekly-build-fedora
+  image: fedora:35
+  variables:
+    MODE: optimized
diff --git a/utils/tests/gitlab-ci-ubuntu.yml b/utils/tests/gitlab-ci-ubuntu.yml
index 8f02de409..42c1ae04d 100644
--- a/utils/tests/gitlab-ci-ubuntu.yml
+++ b/utils/tests/gitlab-ci-ubuntu.yml
@@ -25,11 +25,14 @@ weekly-build-ubuntu-18.04-debug:
   extends: .weekly-build-ubuntu
   image: ubuntu:18.04
   before_script:
+    - apt-get --quiet update --yes
+    - apt-get --quiet install software-properties-common --yes
+    - add-apt-repository ppa:ubuntu-toolchain-r/test --yes
     - apt-get --quiet update --yes
     - DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
-    - apt-get --quiet install gcc-8 g++-8 cmake ninja-build python python3 python-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools openmpi-bin openmpi-common openmpi-doc libopenmpi-dev gsl-bin libgsl-dev ccache flex bison libfl-dev sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev $LIBGSL --yes
+    - apt-get --quiet install gcc-9 g++-9 cmake ninja-build python python3 python-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools openmpi-bin openmpi-common openmpi-doc libopenmpi-dev gsl-bin libgsl-dev ccache flex bison libfl-dev sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev $LIBGSL --yes
     - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 700 --slave /usr/bin/g++ g++ /usr/bin/g++-7
-    - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8
+    - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 800 --slave /usr/bin/g++ g++ /usr/bin/g++-9
   variables:
     MODE: debug
     LIBGSL: libgsl23
@@ -38,11 +41,14 @@ weekly-build-ubuntu-18.04-release:
   extends: .weekly-build-ubuntu
   image: ubuntu:18.04
   before_script:
+    - apt-get --quiet update --yes
+    - apt-get --quiet install software-properties-common --yes
+    - add-apt-repository ppa:ubuntu-toolchain-r/test --yes
     - apt-get --quiet update --yes
     - DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
-    - apt-get --quiet install gcc-8 g++-8 cmake ninja-build python python3 python-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools openmpi-bin openmpi-common openmpi-doc libopenmpi-dev gsl-bin libgsl-dev ccache flex bison libfl-dev sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev $LIBGSL --yes
+    - apt-get --quiet install gcc-9 g++-9 cmake ninja-build python python3 python-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools openmpi-bin openmpi-common openmpi-doc libopenmpi-dev gsl-bin libgsl-dev ccache flex bison libfl-dev sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev $LIBGSL --yes
     - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 700 --slave /usr/bin/g++ g++ /usr/bin/g++-7
-    - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8
+    - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 800 --slave /usr/bin/g++ g++ /usr/bin/g++-9
   variables:
     MODE: release
     LIBGSL: libgsl23
@@ -51,58 +57,61 @@ weekly-build-ubuntu-18.04-optimized:
   extends: .weekly-build-ubuntu
   image: ubuntu:18.04
   before_script:
+    - apt-get --quiet update --yes
+    - apt-get --quiet install software-properties-common --yes
+    - add-apt-repository ppa:ubuntu-toolchain-r/test --yes
     - apt-get --quiet update --yes
     - DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
-    - apt-get --quiet install gcc-8 g++-8 cmake ninja-build python python3 python-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools openmpi-bin openmpi-common openmpi-doc libopenmpi-dev gsl-bin libgsl-dev ccache flex bison libfl-dev sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev $LIBGSL --yes
+    - apt-get --quiet install gcc-9 g++-9 cmake ninja-build python python3 python-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools openmpi-bin openmpi-common openmpi-doc libopenmpi-dev gsl-bin libgsl-dev ccache flex bison libfl-dev sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev $LIBGSL --yes
     - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 700 --slave /usr/bin/g++ g++ /usr/bin/g++-7
-    - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8
+    - update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 800 --slave /usr/bin/g++ g++ /usr/bin/g++-9
   variables:
     MODE: optimized
     LIBGSL: libgsl23
 
-# Ubuntu 20.04 (Until April 2025)
-weekly-build-ubuntu-20.04-debug:
-  extends: .weekly-build-ubuntu
-  image: ubuntu:20.04
-  variables:
-    MODE: debug
-    LIBGSL: libgsl23
+# # Ubuntu 20.04 (Until April 2025)
+# weekly-build-ubuntu-20.04-debug:
+#   extends: .weekly-build-ubuntu
+#   image: ubuntu:20.04
+#   variables:
+#     MODE: debug
+#     LIBGSL: libgsl23
 
-weekly-build-ubuntu-20.04-release:
-  extends: .weekly-build-ubuntu
-  image: ubuntu:20.04
-  variables:
-    MODE: release
-    LIBGSL: libgsl23
+# weekly-build-ubuntu-20.04-release:
+#   extends: .weekly-build-ubuntu
+#   image: ubuntu:20.04
+#   variables:
+#     MODE: release
+#     LIBGSL: libgsl23
 
-weekly-build-ubuntu-20.04-optimized:
-  extends: .weekly-build-ubuntu
-  image: ubuntu:20.04
-  variables:
-    MODE: optimized
-    LIBGSL: libgsl23
+# weekly-build-ubuntu-20.04-optimized:
+#   extends: .weekly-build-ubuntu
+#   image: ubuntu:20.04
+#   variables:
+#     MODE: optimized
+#     LIBGSL: libgsl23
 
-# Ubuntu 21.04 (Until January 2022)
-weekly-build-ubuntu-21.04-debug:
-  extends: .weekly-build-ubuntu
-  image: ubuntu:21.04
-  variables:
-    MODE: debug
-    LIBGSL: libgsl25
+# # Ubuntu 21.04 (Until January 2022)
+# weekly-build-ubuntu-21.04-debug:
+#   extends: .weekly-build-ubuntu
+#   image: ubuntu:21.04
+#   variables:
+#     MODE: debug
+#     LIBGSL: libgsl25
 
-weekly-build-ubuntu-21.04-release:
-  extends: .weekly-build-ubuntu
-  image: ubuntu:21.04
-  variables:
-    MODE: release
-    LIBGSL: libgsl25
+# weekly-build-ubuntu-21.04-release:
+#   extends: .weekly-build-ubuntu
+#   image: ubuntu:21.04
+#   variables:
+#     MODE: release
+#     LIBGSL: libgsl25
 
-weekly-build-ubuntu-21.04-optimized:
-  extends: .weekly-build-ubuntu
-  image: ubuntu:21.04
-  variables:
-    MODE: optimized
-    LIBGSL: libgsl25
+# weekly-build-ubuntu-21.04-optimized:
+#   extends: .weekly-build-ubuntu
+#   image: ubuntu:21.04
+#   variables:
+#     MODE: optimized
+#     LIBGSL: libgsl25
 
 # Ubuntu Rolling
 weekly-build-ubuntu-rolling-debug: