diff --git a/Programming/gcc/build b/Programming/gcc/build
index 6cd3a30..6e021f3 100755
--- a/Programming/gcc/build
+++ b/Programming/gcc/build
@@ -1,14 +1,2 @@
 #!/usr/bin/env modbuild
 
-#pbuild::pre_prep() {
-#	if (( V_MAJOR == 10 && V_MINOR == 2 )); then
-#		pbuild::add_patch "files/gcc-10.2.0-cpp-__has_include.patch"
-#	fi
-#}
-
-
-#pbuild::pre_configure_Linux() {
-#	if (( V_MAJOR >= 8 )); then
-#		pbuild::add_configure_args "--enable-languages=c,c++,objc,obj-c++,lto,fortran,go"
-#	fi
-#}
diff --git a/Programming/gcc/files/config.yaml b/Programming/gcc/files/config.yaml
index b6db02f..360df85 100644
--- a/Programming/gcc/files/config.yaml
+++ b/Programming/gcc/files/config.yaml
@@ -20,6 +20,7 @@ gcc:
       - --disable-multilib
       - --with-pkgversion=PSI Environment Module
       - --with-build-config=bootstrap-debug
+      - --enable-languages=c,c++,objc,obj-c++,lto,fortran,go'
     urls:
       - url: https://ftp.gnu.org/gnu/gcc/$P-$V/$P-$V.tar.gz
 
@@ -75,17 +76,269 @@ gcc:
     gcc-4.6.4.tar.gz: 53de33db01815914b3905a7d2cefac1ecf24ad081b82d93e4f526d8e62ff736f
 
   versions:
-    12.4.0;12.3.0;13.2.0;13.3.0;14.2.0:
+    12.3.0;12.4.0;13.2.0;13.3.0;14.2.0:
       config:
         relstage: stable
-        build_requires: [gmp/6.3.0, mpfr/4.2.0, mpc/1.3.1]
-        configure_args+: ['--enable-languages=c,c++,objc,obj-c++,lto,fortran,go']
+        build_requires: [gcc/10.4.0, gmp/6.3.0, mpfr/4.2.0, mpc/1.3.1]
       variants:
         - overlay: base
           systems: [rhel.*]
         - overlay: PSI
           systems: [login.*.merlin7.psi.ch, cn.*.merlin7.psi.ch, gpu.*.merlin7.psi.ch]
-          use_overlays: [PSI]
-          runtime_deps: [cray/23.12, PrgEnv-gnu/8.5.0]
+        - overlay: base
+          systems: [rhel.*]
 
+    gcc/12.1.0:
+      config:
+        relstage: deprecated
+        build_requires: [gcc/11.3.0, gmp/6.2.1, mpfr/4.1.0, mpc/1.2.1]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
 
+    11.4.0:
+      config:
+        restage: stable
+        build_requires: [gcc/10.3.0, gmp/6.2.1, mpfr/4.2.0, mpc/1.3.1]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    11.3.0:
+      config:
+        restage: stable
+        build_requires: [gcc/10.3.0, gmp/6.2.1, mpfr/4.1.0, mpc/1.2.1]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    11.2.0:
+      config:
+        restage: deprecated
+        build_requires: [gcc/10.3.0, gmp/6.2.1, mpfr/4.1.0, mpc/1.2.1]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    10.4.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.2.1, mpfr/4.1.0, mpc/1.2.1]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    10.3.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.2.1, mpfr/4.1.0, mpc/1.2.1]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    10.1.0;10.2.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.2.0, mpfr/4.0.2-1, mpc/1.1.0-4]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    9.3.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.2.0, mpfr/4.0.2-1, mpc/1.1.0-4]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    9.2.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.1.2-1, mpfr/4.0.2, mpc/1.1.0-3, isl/0.21]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    9.1.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.1.2-1, mpfr/4.0.2, mpc/1.1.0-3]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    8.4.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.2.0, mpfr/4.0.2-1, mpc/1.1.0-4]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    8.3.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.1.2-1, mpfr/4.0.2, mpc/1.1.0-3]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    8.1.0;8.2.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.1.2, mpfr/4.0.1, mpc/1.1.0]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    7.5.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.2.0, mpfr/4.0.2-1, mpc/1.1.0-4]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    7.4.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.1.2-1, mpfr/4.0.1-1, mpc/1.1.0-2]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    7.3.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.1.2, mpfr/4.0.0, mpc/1.1.0]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    7.2.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.1.2, mpfr/3.1.5, mpc/1.0.3-2]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    7.1.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.1.2, mpfr/3.1.5, mpc/1.0.3]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    6.5.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.1.2-1, mpfr/4.0.1-1, mpc/1.1.0-2]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    6.4.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.1.2, mpfr/3.1.5, mpc/1.0.3]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    6.3.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.1.2, mpfr/3.1.5, mpc/1.0.3-2]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    6.2.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.1.1, mpfr/3.1.4, mpc/1.0.3]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    6.1.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.1.0, mpfr/3.1.4, mpc/1.0.3]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    5.5.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.1.2-1, mpfr/4.0.1, mpc/1.1.0-1]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    5.4.0:
+      config:
+        restage: stable
+        build_requires: [gmp/6.1.2, mpfr/3.1.5, mpc/1.0.3-2]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    5.2.0;5.3.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/6.0.0, mpfr/3.1.3, mpc/1.0.3]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    5.1.0:
+      config:
+        restage: deprecated
+        build_requires: [gmp/5.1.1, mpfr/3.1.2, mpc/1.0.2]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    4.9.4:
+      config:
+        restage: stable
+        build_requires: [gmp/6.1.1, mpfr/3.1.4, mpc/1.0.3]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    4.9.3:
+      config:
+        restage: stable
+        build_requires: [gmp/6.1.0, mpfr/3.1.4, mpc/1.0.3]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    4.9.0;4.9.2:
+      config:
+        restage: stable
+        build_requires: [gmp/5.1.1, mpfr/3.1.2, mpc/1.0.2]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+    4.8.5:
+      config:
+        restage: stable
+        build_requires: [gmp/6.0.0, mpfr/3.1.3, mpc/1.0.3]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
+
+    4.7.4;4.8.2;4.8.3;4.8.4:
+      config:
+        restage: stable
+        build_requires: [gmp/5.1.1, mpfr/3.1.2, mpc/1.0.2]
+      variants:
+        - overlay: base
+          systems: [rhel.*]
diff --git a/Programming/gcc/files/gcc-10.2.0-cpp-__has_include.patch b/Programming/gcc/files/gcc-10.2.0-cpp-__has_include.patch
deleted file mode 100644
index fa1fb8a..0000000
--- a/Programming/gcc/files/gcc-10.2.0-cpp-__has_include.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b7bb13d4a5fcb593dc745ca3b6180f8babb54893 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tiziano.mueller@chem.uzh.ch>
-Date: Mon, 27 Jul 2020 15:40:38 +0200
-Subject: [PATCH] libcpp: fix __has_include handling with traditional-cpp
-
-fixes #95889
----
- libcpp/init.c        | 3 +++
- libcpp/traditional.c | 4 +++-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/libcpp/init.c b/libcpp/init.c
-index 0aac5acd0a35..b0cf71192589 100644
---- a/libcpp/init.c
-+++ b/libcpp/init.c
-@@ -400,6 +400,9 @@ static const struct builtin_macro builtin_array[] =
-   B("__LINE__",		 BT_SPECLINE,      true),
-   B("__INCLUDE_LEVEL__", BT_INCLUDE_LEVEL, true),
-   B("__COUNTER__",	 BT_COUNTER,       true),
-+  /* Make sure to update the list of built-in
-+     function-like macros in traditional.c:
-+     fun_like_macro() when adding more following */
-   B("__has_attribute",	 BT_HAS_ATTRIBUTE, true),
-   B("__has_cpp_attribute", BT_HAS_ATTRIBUTE, true),
-   B("__has_builtin",	 BT_HAS_BUILTIN,   true),
-diff --git a/libcpp/traditional.c b/libcpp/traditional.c
-index 77adb3bf595f..b087072c9b4c 100644
---- a/libcpp/traditional.c
-+++ b/libcpp/traditional.c
-@@ -330,7 +330,9 @@ fun_like_macro (cpp_hashnode *node)
- {
-   if (cpp_builtin_macro_p (node))
-     return (node->value.builtin == BT_HAS_ATTRIBUTE
--	    || node->value.builtin == BT_HAS_BUILTIN);
-+	    || node->value.builtin == BT_HAS_BUILTIN
-+	    || node->value.builtin == BT_HAS_INCLUDE
-+	    || node->value.builtin == BT_HAS_INCLUDE_NEXT);
-   return node->value.macro->fun_like;
- }
- 
diff --git a/Programming/gcc/files/variants.macos10.14 b/Programming/gcc/files/variants.macos10.14
deleted file mode 100644
index 93046f5..0000000
--- a/Programming/gcc/files/variants.macos10.14
+++ /dev/null
@@ -1,22 +0,0 @@
-gcc/4.7.4	stable		b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.8.3	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.8.4	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.8.5	stable		b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
-gcc/4.9.0	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.9.2	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.9.3	stable		b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3
-gcc/4.9.4	stable		b:gmp/6.1.1 b:mpfr/3.1.4 b:mpc/1.0.3
-
-gcc/5.1.0	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/5.2.0	deprecated	b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
-gcc/5.3.0	stable		b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
-gcc/5.4.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3-2
-
-gcc/6.1.0	stable		b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3
-gcc/6.2.0	stable		b:gmp/6.1.1 b:mpfr/3.1.4 b:mpc/1.0.3
-gcc/6.3.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3-2
-
-gcc/7.3.0	stable		b:gmp/6.1.2 b:mpfr/4.0.0 b:mpc/1.1.0
-
-gcc/8.3.0	stable		b:gmp/6.1.2-1 b:mpfr/4.0.2 b:mpc/1.1.0-3
-
diff --git a/Programming/gcc/files/variants.rhel6 b/Programming/gcc/files/variants.rhel6
deleted file mode 100644
index 71f29c9..0000000
--- a/Programming/gcc/files/variants.rhel6
+++ /dev/null
@@ -1,50 +0,0 @@
-gcc/4.7.4	stable		b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.8.2	stable		b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.8.3	stable		b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.8.4	stable		b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.8.5	stable		b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
-gcc/4.9.0	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.9.2	stable		b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/4.9.3	stable		b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3
-gcc/4.9.4	stable		b:gmp/6.1.1 b:mpfr/3.1.4 b:mpc/1.0.3
-
-gcc/5.1.0	deprecated	b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-gcc/5.2.0	deprecated	b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
-gcc/5.3.0	stable		b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
-gcc/5.4.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3-2
-gcc/5.5.0	stable		b:gmp/6.1.2-1 b:mpfr/4.0.1 b:mpc/1.1.0-1
-
-gcc/6.1.0	stable		b:gmp/6.1.0 b:mpfr/3.1.4 b:mpc/1.0.3
-gcc/6.2.0	stable		b:gmp/6.1.1 b:mpfr/3.1.4 b:mpc/1.0.3
-gcc/6.3.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3-2
-gcc/6.4.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3
-gcc/6.5.0	stable		b:gmp/6.1.2-1 b:mpfr/4.0.1-1 b:mpc/1.1.0-2
-
-gcc/7.1.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3
-gcc/7.2.0	stable		b:gmp/6.1.2 b:mpfr/3.1.5 b:mpc/1.0.3-2
-gcc/7.3.0	stable		b:gmp/6.1.2 b:mpfr/4.0.0 b:mpc/1.1.0
-gcc/7.4.0	stable		b:gmp/6.1.2-1 b:mpfr/4.0.1-1 b:mpc/1.1.0-2
-gcc/7.5.0	stable		b:gmp/6.2.0 b:mpfr/4.0.2-1 b:mpc/1.1.0-4
-
-gcc/8.1.0	stable		b:gmp/6.1.2 b:mpfr/4.0.1 b:mpc/1.1.0
-gcc/8.2.0	stable		b:gmp/6.1.2 b:mpfr/4.0.1 b:mpc/1.1.0
-gcc/8.3.0	stable		b:gmp/6.1.2-1 b:mpfr/4.0.2 b:mpc/1.1.0-3
-gcc/8.4.0	stable		b:gmp/6.2.0 b:mpfr/4.0.2-1 b:mpc/1.1.0-4
-
-gcc/9.1.0	stable		b:gmp/6.1.2-1 b:mpfr/4.0.2 b:mpc/1.1.0-3
-gcc/9.2.0	stable		b:gmp/6.1.2-1 b:mpfr/4.0.2 b:mpc/1.1.0-3 b:isl/0.21
-gcc/9.3.0	stable		b:gmp/6.2.0 b:mpfr/4.0.2-1 b:mpc/1.1.0-4
-
-gcc/10.1.0	stable		b:gmp/6.2.0 b:mpfr/4.0.2-1 b:mpc/1.1.0-4
-gcc/10.2.0	stable		b:gmp/6.2.0 b:mpfr/4.0.2-1 b:mpc/1.1.0-4
-gcc/10.3.0	stable		b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1
-gcc/10.4.0	stable		b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1
-
-gcc/11.2.0      stable          b:gcc/10.3.0 b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1
-gcc/11.3.0	stable		b:gcc/10.3.0 b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1
-gcc/11.4.0	stable		b:gcc/10.3.0 b:gmp/6.2.1 b:mpfr/4.2.0 b:mpc/1.3.1
-
-gcc/12.1.0	stable		b:gcc/11.3.0 b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1
-gcc/12.3.0	stable		b:gcc/10.3.0 b:gmp/6.2.1 b:mpfr/4.2.0 b:mpc/1.3.1
-
-gcc/13.1.0	stable		b:gcc/10.4.0 b:gmp/6.2.1 b:mpfr/4.2.0 b:mpc/1.3.1
diff --git a/Programming/gcc/files/variants.yaml b/Programming/gcc/files/variants.yaml
deleted file mode 100644
index 60b14e2..0000000
--- a/Programming/gcc/files/variants.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-overlay: base
-relstage: stable
-gcc/4.7.4:
-  - dependencies: b:gmp/5.1.1 b:mpfr/3.1.2 b:mpc/1.0.2
-
-gcc/4.8.5:
-  - dependencies: b:gmp/6.0.0 b:mpfr/3.1.3 b:mpc/1.0.3
-
-gcc/4.9.4:
-  - dependencies: b:gmp/6.1.1 b:mpfr/3.1.4 b:mpc/1.0.3
-
-gcc/5.5.0:
-  - dependencies: b:gmp/6.1.2-1 b:mpfr/4.0.1 b:mpc/1.1.0-1
-
-gcc/6.5.0:
-  - dependencies: b:gmp/6.1.2-1 b:mpfr/4.0.1-1 b:mpc/1.1.0-2
-
-gcc/7.5.0:
-  - dependencies: b:gmp/6.2.0 b:mpfr/4.0.2-1 b:mpc/1.1.0-4
-
-gcc/8.4.0:
-  - dependencies: b:gmp/6.2.0 b:mpfr/4.0.2-1 b:mpc/1.1.0-4
-gcc/8.5.0:
-  - dependencies: b:gcc/7.5.0 b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1
-
-gcc/9.3.0:
-  - dependencies: b:gmp/6.2.0 b:mpfr/4.0.2-1 b:mpc/1.1.0-4
-gcc/9.5.0:
-  - dependencies: b:gcc/8.5.0 b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1 
-gcc/10.3.0:
-  - dependencies: b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1
-
-gcc/11.2.0:
-  - dependencies: b:gcc/10.3.0 b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1
-gcc/11.3.0:
-  - dependencies: b:gcc/10.3.0 b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1
-
-gcc/12.1.0:
-  - dependencies: b:gcc/11.3.0 b:gmp/6.2.1 b:mpfr/4.1.0 b:mpc/1.2.1