diff --git a/utils/tests/gitlab-ci-fedora.yml b/utils/tests/gitlab-ci-fedora.yml
index 81a499458..c175486a6 100644
--- a/utils/tests/gitlab-ci-fedora.yml
+++ b/utils/tests/gitlab-ci-fedora.yml
@@ -74,3 +74,22 @@ weekly-build-fedora-33-optimized:
   image: fedora:33
   variables:
     MODE: optimized
+
+# Fedora 34
+weekly-build-fedora-34-debug:
+  extends: .weekly-build-fedora
+  image: fedora:34
+  variables:
+    MODE: debug
+
+weekly-build-fedora-34-release:
+  extends: .weekly-build-fedora
+  image: fedora:34
+  variables:
+    MODE: release
+
+weekly-build-fedora-34-optimized:
+  extends: .weekly-build-fedora
+  image: fedora:34
+  variables:
+    MODE: optimized
diff --git a/utils/tests/gitlab-ci-gcc.yml b/utils/tests/gitlab-ci-gcc.yml
index 1f825bc62..d883d56ff 100644
--- a/utils/tests/gitlab-ci-gcc.yml
+++ b/utils/tests/gitlab-ci-gcc.yml
@@ -20,43 +20,43 @@
   variables:
     COMPILER: g++
 
-# GCC 5
-weekly-build-gcc-5-debug:
-  extends: .weekly-build-gcc
-  image: gcc:5
-  variables:
-    MODE: debug
-
-weekly-build-gcc-5-release:
-  extends: .weekly-build-gcc
-  image: gcc:5
-  variables:
-    MODE: release
-
-weekly-build-gcc-5-optimized:
-  extends: .weekly-build-gcc
-  image: gcc:5
-  variables:
-    MODE: optimized
-
-# GCC 6
-weekly-build-gcc-6-debug:
-  extends: .weekly-build-gcc
-  image: gcc:6
-  variables:
-    MODE: debug
-
-weekly-build-gcc-6-release:
-  extends: .weekly-build-gcc
-  image: gcc:6
-  variables:
-    MODE: release
-
-weekly-build-gcc-6-optimized:
-  extends: .weekly-build-gcc
-  image: gcc:6
-  variables:
-    MODE: optimized
+# # GCC 5
+# weekly-build-gcc-5-debug:
+#   extends: .weekly-build-gcc
+#   image: gcc:5
+#   variables:
+#     MODE: debug
+# 
+# weekly-build-gcc-5-release:
+#   extends: .weekly-build-gcc
+#   image: gcc:5
+#   variables:
+#     MODE: release
+# 
+# weekly-build-gcc-5-optimized:
+#   extends: .weekly-build-gcc
+#   image: gcc:5
+#   variables:
+#     MODE: optimized
+# 
+# # GCC 6
+# weekly-build-gcc-6-debug:
+#   extends: .weekly-build-gcc
+#   image: gcc:6
+#   variables:
+#     MODE: debug
+# 
+# weekly-build-gcc-6-release:
+#   extends: .weekly-build-gcc
+#   image: gcc:6
+#   variables:
+#     MODE: release
+# 
+# weekly-build-gcc-6-optimized:
+#   extends: .weekly-build-gcc
+#   image: gcc:6
+#   variables:
+#     MODE: optimized
 
 # GCC 7
 weekly-build-gcc-7-debug:
@@ -133,4 +133,4 @@ weekly-build-gcc-10-optimized:
   image: gcc:10
   variables:
     MODE: optimized
-    
\ No newline at end of file
+    
diff --git a/utils/tests/gitlab-ci-ubuntu.yml b/utils/tests/gitlab-ci-ubuntu.yml
index 375ecc14f..b7c9481f7 100644
--- a/utils/tests/gitlab-ci-ubuntu.yml
+++ b/utils/tests/gitlab-ci-ubuntu.yml
@@ -16,31 +16,32 @@
   before_script:
     - apt-get --quiet update --yes
     - DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
-    - apt-get --quiet install gcc g++ python python3 python-dev qt5-default openmpi-bin openmpi-common openmpi-doc libopenmpi-dev gsl-bin libgsl-dev ccache flex bison libfl-dev sqlite sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev $LIBGSL --yes
+#    - apt-get --quiet install gcc g++ python python3 python-dev qt5-default openmpi-bin openmpi-common openmpi-doc libopenmpi-dev gsl-bin libgsl-dev ccache flex bison libfl-dev sqlite sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev $LIBGSL --yes
+    - apt-get --quiet install gcc g++ 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 sqlite sqlite3 libsqlite3-dev libxml2 libxml2-dev libgtk-3-dev libboost-all-dev $LIBGSL --yes
   variables:
     COMPILER: g++
 
-# Ubuntu 16.04 (Until April 2021)
-weekly-build-ubuntu-16.04-debug:
-  extends: .weekly-build-ubuntu
-  image: ubuntu:16.04
-  variables:
-    MODE: debug
-    LIBGSL: libgsl2
-
-weekly-build-ubuntu-16.04-release:
-  extends: .weekly-build-ubuntu
-  image: ubuntu:16.04
-  variables:
-    MODE: release
-    LIBGSL: libgsl2
-
-weekly-build-ubuntu-16.04-optimized:
-  extends: .weekly-build-ubuntu
-  image: ubuntu:16.04
-  variables:
-    MODE: optimized
-    LIBGSL: libgsl2
+# # Ubuntu 16.04 (Until April 2021)
+# weekly-build-ubuntu-16.04-debug:
+#   extends: .weekly-build-ubuntu
+#   image: ubuntu:16.04
+#   variables:
+#     MODE: debug
+#     LIBGSL: libgsl2
+# 
+# weekly-build-ubuntu-16.04-release:
+#   extends: .weekly-build-ubuntu
+#   image: ubuntu:16.04
+#   variables:
+#     MODE: release
+#     LIBGSL: libgsl2
+# 
+# weekly-build-ubuntu-16.04-optimized:
+#   extends: .weekly-build-ubuntu
+#   image: ubuntu:16.04
+#   variables:
+#     MODE: optimized
+#     LIBGSL: libgsl2
 
 # Ubuntu 18.04 (Until April 2023)
 weekly-build-ubuntu-18.04-debug:
@@ -86,6 +87,28 @@ weekly-build-ubuntu-20.04-optimized:
     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
+
+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
+
 # Ubuntu Rolling
 weekly-build-ubuntu-rolling-debug:
   extends: .weekly-build-ubuntu