diff --git a/portage-converter/base-php.yaml b/portage-converter/base-php.yaml
index d02669f588..5c756df856 100644
--- a/portage-converter/base-php.yaml
+++ b/portage-converter/base-php.yaml
@@ -180,7 +180,6 @@ artefacts:
       - xpm
       - odbc
   packages:
-    - dev-lang/php:7.4
     - dev-lang/php:8.1
     - dev-lang/php:8.2
 
@@ -189,36 +188,38 @@ include_layers:
 
 # Define the list of the files generated by Funtoo reposcan tool.
 reposcan_sources:
-  - ./kit_cache/browser-kit-next
-  - ./kit_cache/core-gl-kit-next
-  - ./kit_cache/core-hw-kit-next
-  - ./kit_cache/core-kit-next
-  - ./kit_cache/core-server-kit-next
-  - ./kit_cache/desktop-kit-next
-  - ./kit_cache/dev-kit-next
-  - ./kit_cache/editors-kit-next
-  - ./kit_cache/games-kit-next
+  - ./kit_cache/browser-kit-mark-testing
+  - ./kit_cache/core-gl-kit-mark-testing
+  - ./kit_cache/core-hw-kit-mark-testing
+  - ./kit_cache/core-kit-mark-testing
+  - ./kit_cache/core-server-kit-mark-testing
+  - ./kit_cache/desktop-kit-mark-testing
+  - ./kit_cache/dev-kit-mark-testing
+  - ./kit_cache/editors-kit-mark-testing
+  - ./kit_cache/games-kit-mark-testing
+  - ./kit_cache/gnome-kit-mark-testing
+  - ./kit_cache/haskell-kit-mark-testing
+  - ./kit_cache/java-kit-mark-testing
+  - ./kit_cache/kde-kit-mark-testing
+  - ./kit_cache/lang-kit-mark-testing
+  - ./kit_cache/lisp-scheme-kit-mark-testing
+  - ./kit_cache/llvm-kit-mark-testing
+  - ./kit_cache/mate-kit-mark-testing
+  - ./kit_cache/media-kit-mark-testing
+  - ./kit_cache/ml-lang-kit-mark-testing
+  - ./kit_cache/net-kit-mark-testing
+  - ./kit_cache/perl-kit-mark-testing
+  - ./kit_cache/python-kit-mark-testing
+  - ./kit_cache/python-modules-kit-mark-testing
+  - ./kit_cache/qt-kit-mark-testing
+  - ./kit_cache/ruby-kit-mark-testing
+  - ./kit_cache/science-kit-mark-testing
+  - ./kit_cache/security-kit-mark-testing
+  - ./kit_cache/text-kit-mark-testing
+  - ./kit_cache/xfce-kit-mark-testing
+
   - ./kit_cache/geaaru-kit-funtoo
-  - ./kit_cache/gnome-kit-next-3.36-prime
-  - ./kit_cache/haskell-kit-next
-  - ./kit_cache/java-kit-next
-  - ./kit_cache/kde-kit-next-5.27-release
-  - ./kit_cache/lang-kit-next
-  - ./kit_cache/lisp-scheme-kit-next
-  - ./kit_cache/llvm-kit-next
-  - ./kit_cache/mate-kit-next-1.24-prime
-  - ./kit_cache/media-kit-next
-  - ./kit_cache/ml-lang-kit-next
-  - ./kit_cache/net-kit-next
-  - ./kit_cache/perl-kit-next
-  - ./kit_cache/python-kit-next
-  - ./kit_cache/python-modules-kit-next
-  - ./kit_cache/qt-kit-next-5.15.2-release
-  - ./kit_cache/ruby-kit-next
-  - ./kit_cache/science-kit-next
-  - ./kit_cache/security-kit-next
-  - ./kit_cache/text-kit-next
-  - ./kit_cache/xfce-kit-next-4.16-release
+
 
 # Disable use of category with slot as requires. Default is without slot.
 reposcan_requires_slot: true
@@ -228,10 +229,10 @@ reposcan_contraints:
     - dev-lang/python:3.9
     - dev-lang/ruby:3.1
     - sys-devel/llvm:13
-    - sys-devel/gcc:11.3.0
+    - sys-devel/gcc:12.3.0
 
     # Waiting for the next upgrade for the upgrade of Nodejs.
-    - <net-libs/nodejs-15.0
+    - <net-libs/nodejs-20.0
 
     - sys-devel/llvm:13
     - sys-devel/clang:13
@@ -245,7 +246,6 @@ reposcan_contraints:
     - dev-db/postgresql:14
     - dev-db/postgresql:13
 
-    - dev-lang/php:7.4
     - dev-lang/php:8.1
     - dev-lang/php:8.2
 
diff --git a/portage-converter/base-python.yaml b/portage-converter/base-python.yaml
index 05b590ad51..fe55cb9e49 100644
--- a/portage-converter/base-python.yaml
+++ b/portage-converter/base-python.yaml
@@ -586,36 +586,38 @@ include_layers:
 
 # Define the list of the files generated by Funtoo reposcan tool.
 reposcan_sources:
-  - ./kit_cache/browser-kit-next
-  - ./kit_cache/core-gl-kit-next
-  - ./kit_cache/core-hw-kit-next
-  - ./kit_cache/core-kit-next
-  - ./kit_cache/core-server-kit-next
-  - ./kit_cache/desktop-kit-next
-  - ./kit_cache/dev-kit-next
-  - ./kit_cache/editors-kit-next
-  - ./kit_cache/games-kit-next
+
+  - ./kit_cache/browser-kit-mark-testing
+  - ./kit_cache/core-gl-kit-mark-testing
+  - ./kit_cache/core-hw-kit-mark-testing
+  - ./kit_cache/core-kit-mark-testing
+  - ./kit_cache/core-server-kit-mark-testing
+  - ./kit_cache/desktop-kit-mark-testing
+  - ./kit_cache/dev-kit-mark-testing
+  - ./kit_cache/editors-kit-mark-testing
+  - ./kit_cache/games-kit-mark-testing
+  - ./kit_cache/gnome-kit-mark-testing
+  - ./kit_cache/haskell-kit-mark-testing
+  - ./kit_cache/java-kit-mark-testing
+  - ./kit_cache/kde-kit-mark-testing
+  - ./kit_cache/lang-kit-mark-testing
+  - ./kit_cache/lisp-scheme-kit-mark-testing
+  - ./kit_cache/llvm-kit-mark-testing
+  - ./kit_cache/mate-kit-mark-testing
+  - ./kit_cache/media-kit-mark-testing
+  - ./kit_cache/ml-lang-kit-mark-testing
+  - ./kit_cache/net-kit-mark-testing
+  - ./kit_cache/perl-kit-mark-testing
+  - ./kit_cache/python-kit-mark-testing
+  - ./kit_cache/python-modules-kit-mark-testing
+  - ./kit_cache/qt-kit-mark-testing
+  - ./kit_cache/ruby-kit-mark-testing
+  - ./kit_cache/science-kit-mark-testing
+  - ./kit_cache/security-kit-mark-testing
+  - ./kit_cache/text-kit-mark-testing
+  - ./kit_cache/xfce-kit-mark-testing
+
   - ./kit_cache/geaaru-kit-funtoo
-  - ./kit_cache/gnome-kit-next-3.36-prime
-  - ./kit_cache/haskell-kit-next
-  - ./kit_cache/java-kit-next
-  - ./kit_cache/kde-kit-next-5.27-release
-  - ./kit_cache/lang-kit-next
-  - ./kit_cache/lisp-scheme-kit-next
-  - ./kit_cache/llvm-kit-next
-  - ./kit_cache/mate-kit-next-1.24-prime
-  - ./kit_cache/media-kit-next
-  - ./kit_cache/ml-lang-kit-next
-  - ./kit_cache/net-kit-next
-  - ./kit_cache/perl-kit-next
-  - ./kit_cache/python-kit-next
-  - ./kit_cache/python-modules-kit-next
-  - ./kit_cache/qt-kit-next-5.15.2-release
-  - ./kit_cache/ruby-kit-next
-  - ./kit_cache/science-kit-next
-  - ./kit_cache/security-kit-next
-  - ./kit_cache/text-kit-next
-  - ./kit_cache/xfce-kit-next-4.16-release
 
 # Disable use of category with slot as requires. Default is without slot.
 reposcan_requires_slot: true
@@ -623,7 +625,7 @@ reposcan_requires_slot: true
 reposcan_contraints:
   packages:
     - dev-lang/python:3.9
-    - sys-devel/gcc:11.3.0
+    - sys-devel/gcc:12.3.0
 
 reposcan_disabled_use_flags:
   # !!internal use only!! used for creating build images and the first half of bootstrapping [make stage1]
diff --git a/portage-converter/base-tools.yaml b/portage-converter/base-tools.yaml
index 7f9ef220dd..356fbb9476 100644
--- a/portage-converter/base-tools.yaml
+++ b/portage-converter/base-tools.yaml
@@ -885,36 +885,37 @@ include_layers:
 
 # Define the list of the files generated by Funtoo reposcan tool.
 reposcan_sources:
-  - ./kit_cache/browser-kit-next
-  - ./kit_cache/core-gl-kit-next
-  - ./kit_cache/core-hw-kit-next
-  - ./kit_cache/core-kit-next
-  - ./kit_cache/core-server-kit-next
-  - ./kit_cache/desktop-kit-next
-  - ./kit_cache/dev-kit-next
-  - ./kit_cache/editors-kit-next
-  - ./kit_cache/games-kit-next
+  - ./kit_cache/browser-kit-mark-testing
+  - ./kit_cache/core-gl-kit-mark-testing
+  - ./kit_cache/core-hw-kit-mark-testing
+  - ./kit_cache/core-kit-mark-testing
+  - ./kit_cache/core-server-kit-mark-testing
+  - ./kit_cache/desktop-kit-mark-testing
+  - ./kit_cache/dev-kit-mark-testing
+  - ./kit_cache/editors-kit-mark-testing
+  - ./kit_cache/games-kit-mark-testing
+  - ./kit_cache/gnome-kit-mark-testing
+  - ./kit_cache/haskell-kit-mark-testing
+  - ./kit_cache/java-kit-mark-testing
+  - ./kit_cache/kde-kit-mark-testing
+  - ./kit_cache/lang-kit-mark-testing
+  - ./kit_cache/lisp-scheme-kit-mark-testing
+  - ./kit_cache/llvm-kit-mark-testing
+  - ./kit_cache/mate-kit-mark-testing
+  - ./kit_cache/media-kit-mark-testing
+  - ./kit_cache/ml-lang-kit-mark-testing
+  - ./kit_cache/net-kit-mark-testing
+  - ./kit_cache/perl-kit-mark-testing
+  - ./kit_cache/python-kit-mark-testing
+  - ./kit_cache/python-modules-kit-mark-testing
+  - ./kit_cache/qt-kit-mark-testing
+  - ./kit_cache/ruby-kit-mark-testing
+  - ./kit_cache/science-kit-mark-testing
+  - ./kit_cache/security-kit-mark-testing
+  - ./kit_cache/text-kit-mark-testing
+  - ./kit_cache/xfce-kit-mark-testing
+
   - ./kit_cache/geaaru-kit-funtoo
-  - ./kit_cache/gnome-kit-next-3.36-prime
-  - ./kit_cache/haskell-kit-next
-  - ./kit_cache/java-kit-next
-  - ./kit_cache/kde-kit-next-5.27-release
-  - ./kit_cache/lang-kit-next
-  - ./kit_cache/lisp-scheme-kit-next
-  - ./kit_cache/llvm-kit-next
-  - ./kit_cache/mate-kit-next-1.24-prime
-  - ./kit_cache/media-kit-next
-  - ./kit_cache/ml-lang-kit-next
-  - ./kit_cache/net-kit-next
-  - ./kit_cache/perl-kit-next
-  - ./kit_cache/python-kit-next
-  - ./kit_cache/python-modules-kit-next
-  - ./kit_cache/qt-kit-next-5.15.2-release
-  - ./kit_cache/ruby-kit-next
-  - ./kit_cache/science-kit-next
-  - ./kit_cache/security-kit-next
-  - ./kit_cache/text-kit-next
-  - ./kit_cache/xfce-kit-next-4.16-release
 
 # Disable use of category with slot as requires. Default is without slot.
 reposcan_requires_slot: true
@@ -922,7 +923,7 @@ reposcan_requires_slot: true
 reposcan_contraints:
   packages:
     - dev-lang/python:3.9
-    - sys-devel/gcc:11.3.0
+    - sys-devel/gcc:12.3.0
 
 reposcan_disabled_use_flags:
   # !!internal use only!! used for creating build images and the first half of bootstrapping [make stage1]
diff --git a/portage-converter/base-tools2.yaml b/portage-converter/base-tools2.yaml
index 4ccb9eec31..89d2cf5afc 100644
--- a/portage-converter/base-tools2.yaml
+++ b/portage-converter/base-tools2.yaml
@@ -250,36 +250,37 @@ include_layers:
 
 # Define the list of the files generated by Funtoo reposcan tool.
 reposcan_sources:
-  - ./kit_cache/browser-kit-next
-  - ./kit_cache/core-gl-kit-next
-  - ./kit_cache/core-hw-kit-next
-  - ./kit_cache/core-kit-next
-  - ./kit_cache/core-server-kit-next
-  - ./kit_cache/desktop-kit-next
-  - ./kit_cache/dev-kit-next
-  - ./kit_cache/editors-kit-next
-  - ./kit_cache/games-kit-next
+  - ./kit_cache/browser-kit-mark-testing
+  - ./kit_cache/core-gl-kit-mark-testing
+  - ./kit_cache/core-hw-kit-mark-testing
+  - ./kit_cache/core-kit-mark-testing
+  - ./kit_cache/core-server-kit-mark-testing
+  - ./kit_cache/desktop-kit-mark-testing
+  - ./kit_cache/dev-kit-mark-testing
+  - ./kit_cache/editors-kit-mark-testing
+  - ./kit_cache/games-kit-mark-testing
+  - ./kit_cache/gnome-kit-mark-testing
+  - ./kit_cache/haskell-kit-mark-testing
+  - ./kit_cache/java-kit-mark-testing
+  - ./kit_cache/kde-kit-mark-testing
+  - ./kit_cache/lang-kit-mark-testing
+  - ./kit_cache/lisp-scheme-kit-mark-testing
+  - ./kit_cache/llvm-kit-mark-testing
+  - ./kit_cache/mate-kit-mark-testing
+  - ./kit_cache/media-kit-mark-testing
+  - ./kit_cache/ml-lang-kit-mark-testing
+  - ./kit_cache/net-kit-mark-testing
+  - ./kit_cache/perl-kit-mark-testing
+  - ./kit_cache/python-kit-mark-testing
+  - ./kit_cache/python-modules-kit-mark-testing
+  - ./kit_cache/qt-kit-mark-testing
+  - ./kit_cache/ruby-kit-mark-testing
+  - ./kit_cache/science-kit-mark-testing
+  - ./kit_cache/security-kit-mark-testing
+  - ./kit_cache/text-kit-mark-testing
+  - ./kit_cache/xfce-kit-mark-testing
+
   - ./kit_cache/geaaru-kit-funtoo
-  - ./kit_cache/gnome-kit-next-3.36-prime
-  - ./kit_cache/haskell-kit-next
-  - ./kit_cache/java-kit-next
-  - ./kit_cache/kde-kit-next-5.27-release
-  - ./kit_cache/lang-kit-next
-  - ./kit_cache/lisp-scheme-kit-next
-  - ./kit_cache/llvm-kit-next
-  - ./kit_cache/mate-kit-next-1.24-prime
-  - ./kit_cache/media-kit-next
-  - ./kit_cache/ml-lang-kit-next
-  - ./kit_cache/net-kit-next
-  - ./kit_cache/perl-kit-next
-  - ./kit_cache/python-kit-next
-  - ./kit_cache/python-modules-kit-next
-  - ./kit_cache/qt-kit-next-5.15.2-release
-  - ./kit_cache/ruby-kit-next
-  - ./kit_cache/science-kit-next
-  - ./kit_cache/security-kit-next
-  - ./kit_cache/text-kit-next
-  - ./kit_cache/xfce-kit-next-4.16-release
 
 # Disable use of category with slot as requires. Default is without slot.
 reposcan_requires_slot: true
@@ -287,7 +288,7 @@ reposcan_requires_slot: true
 reposcan_contraints:
   packages:
     - dev-lang/python:3.9
-    - sys-devel/gcc:11.3.0
+    - sys-devel/gcc:12.3.0
 
 reposcan_disabled_use_flags:
   # !!internal use only!! used for creating build images and the first half of bootstrapping [make stage1]
diff --git a/portage-converter/db.yaml b/portage-converter/db.yaml
index 111abea9a5..eec0e61009 100644
--- a/portage-converter/db.yaml
+++ b/portage-converter/db.yaml
@@ -360,36 +360,37 @@ include_layers:
 
 # Define the list of the files generated by Funtoo reposcan tool.
 reposcan_sources:
-  - ./kit_cache/browser-kit-next
-  - ./kit_cache/core-gl-kit-next
-  - ./kit_cache/core-hw-kit-next
-  - ./kit_cache/core-kit-next
-  - ./kit_cache/core-server-kit-next
-  - ./kit_cache/desktop-kit-next
-  - ./kit_cache/dev-kit-next
-  - ./kit_cache/editors-kit-next
-  - ./kit_cache/games-kit-next
+  - ./kit_cache/browser-kit-mark-testing
+  - ./kit_cache/core-gl-kit-mark-testing
+  - ./kit_cache/core-hw-kit-mark-testing
+  - ./kit_cache/core-kit-mark-testing
+  - ./kit_cache/core-server-kit-mark-testing
+  - ./kit_cache/desktop-kit-mark-testing
+  - ./kit_cache/dev-kit-mark-testing
+  - ./kit_cache/editors-kit-mark-testing
+  - ./kit_cache/games-kit-mark-testing
+  - ./kit_cache/gnome-kit-mark-testing
+  - ./kit_cache/haskell-kit-mark-testing
+  - ./kit_cache/java-kit-mark-testing
+  - ./kit_cache/kde-kit-mark-testing
+  - ./kit_cache/lang-kit-mark-testing
+  - ./kit_cache/lisp-scheme-kit-mark-testing
+  - ./kit_cache/llvm-kit-mark-testing
+  - ./kit_cache/mate-kit-mark-testing
+  - ./kit_cache/media-kit-mark-testing
+  - ./kit_cache/ml-lang-kit-mark-testing
+  - ./kit_cache/net-kit-mark-testing
+  - ./kit_cache/perl-kit-mark-testing
+  - ./kit_cache/python-kit-mark-testing
+  - ./kit_cache/python-modules-kit-mark-testing
+  - ./kit_cache/qt-kit-mark-testing
+  - ./kit_cache/ruby-kit-mark-testing
+  - ./kit_cache/science-kit-mark-testing
+  - ./kit_cache/security-kit-mark-testing
+  - ./kit_cache/text-kit-mark-testing
+  - ./kit_cache/xfce-kit-mark-testing
+
   - ./kit_cache/geaaru-kit-funtoo
-  - ./kit_cache/gnome-kit-next-3.36-prime
-  - ./kit_cache/haskell-kit-next
-  - ./kit_cache/java-kit-next
-  - ./kit_cache/kde-kit-next-5.27-release
-  - ./kit_cache/lang-kit-next
-  - ./kit_cache/lisp-scheme-kit-next
-  - ./kit_cache/llvm-kit-next
-  - ./kit_cache/mate-kit-next-1.24-prime
-  - ./kit_cache/media-kit-next
-  - ./kit_cache/ml-lang-kit-next
-  - ./kit_cache/net-kit-next
-  - ./kit_cache/perl-kit-next
-  - ./kit_cache/python-kit-next
-  - ./kit_cache/python-modules-kit-next
-  - ./kit_cache/qt-kit-next-5.15.2-release
-  - ./kit_cache/ruby-kit-next
-  - ./kit_cache/science-kit-next
-  - ./kit_cache/security-kit-next
-  - ./kit_cache/text-kit-next
-  - ./kit_cache/xfce-kit-next-4.16-release
 
 # Disable use of category with slot as requires. Default is without slot.
 reposcan_requires_slot: true
@@ -399,10 +400,10 @@ reposcan_contraints:
     - dev-lang/python:3.9
     - dev-lang/ruby:3.1
     - sys-devel/llvm:13
-    - sys-devel/gcc:11.3.0
+    - sys-devel/gcc:12.3.0
 
     # Waiting for the next upgrade for the upgrade of Nodejs.
-    - <net-libs/nodejs-15.0
+    - <net-libs/nodejs-20.0
 
     - sys-devel/llvm:13
     - sys-devel/clang:13
diff --git a/portage-converter/dev-tools.yaml b/portage-converter/dev-tools.yaml
index 2bd892b1a0..55a437cf52 100644
--- a/portage-converter/dev-tools.yaml
+++ b/portage-converter/dev-tools.yaml
@@ -458,36 +458,38 @@ include_layers:
 
 # Define the list of the files generated by Funtoo reposcan tool.
 reposcan_sources:
-  - ./kit_cache/browser-kit-next
-  - ./kit_cache/core-gl-kit-next
-  - ./kit_cache/core-hw-kit-next
-  - ./kit_cache/core-kit-next
-  - ./kit_cache/core-server-kit-next
-  - ./kit_cache/desktop-kit-next
-  - ./kit_cache/dev-kit-next
-  - ./kit_cache/editors-kit-next
-  - ./kit_cache/games-kit-next
+  - ./kit_cache/browser-kit-mark-testing
+  - ./kit_cache/core-gl-kit-mark-testing
+  - ./kit_cache/core-hw-kit-mark-testing
+  - ./kit_cache/core-kit-mark-testing
+  - ./kit_cache/core-server-kit-mark-testing
+  - ./kit_cache/desktop-kit-mark-testing
+  - ./kit_cache/dev-kit-mark-testing
+  - ./kit_cache/editors-kit-mark-testing
+  - ./kit_cache/games-kit-mark-testing
+  - ./kit_cache/gnome-kit-mark-testing
+  - ./kit_cache/haskell-kit-mark-testing
+  - ./kit_cache/java-kit-mark-testing
+  - ./kit_cache/kde-kit-mark-testing
+  - ./kit_cache/lang-kit-mark-testing
+  - ./kit_cache/lisp-scheme-kit-mark-testing
+  - ./kit_cache/llvm-kit-mark-testing
+  - ./kit_cache/mate-kit-mark-testing
+  - ./kit_cache/media-kit-mark-testing
+  - ./kit_cache/ml-lang-kit-mark-testing
+  - ./kit_cache/net-kit-mark-testing
+  - ./kit_cache/perl-kit-mark-testing
+  - ./kit_cache/python-kit-mark-testing
+  - ./kit_cache/python-modules-kit-mark-testing
+  - ./kit_cache/qt-kit-mark-testing
+  - ./kit_cache/ruby-kit-mark-testing
+  - ./kit_cache/science-kit-mark-testing
+  - ./kit_cache/security-kit-mark-testing
+  - ./kit_cache/text-kit-mark-testing
+  - ./kit_cache/xfce-kit-mark-testing
+
   - ./kit_cache/geaaru-kit-funtoo
-  - ./kit_cache/gnome-kit-next-3.36-prime
-  - ./kit_cache/haskell-kit-next
-  - ./kit_cache/java-kit-next
-  - ./kit_cache/kde-kit-next-5.27-release
-  - ./kit_cache/lang-kit-next
-  - ./kit_cache/lisp-scheme-kit-next
-  - ./kit_cache/llvm-kit-next
-  - ./kit_cache/mate-kit-next-1.24-prime
-  - ./kit_cache/media-kit-next
-  - ./kit_cache/ml-lang-kit-next
-  - ./kit_cache/net-kit-next
-  - ./kit_cache/perl-kit-next
-  - ./kit_cache/python-kit-next
-  - ./kit_cache/python-modules-kit-next
-  - ./kit_cache/qt-kit-next-5.15.2-release
-  - ./kit_cache/ruby-kit-next
-  - ./kit_cache/science-kit-next
-  - ./kit_cache/security-kit-next
-  - ./kit_cache/text-kit-next
-  - ./kit_cache/xfce-kit-next-4.16-release
+
 
 # Disable use of category with slot as requires. Default is without slot.
 reposcan_requires_slot: true
@@ -497,7 +499,7 @@ reposcan_contraints:
     - dev-lang/python:3.9
     - dev-lang/ruby:3.1
     - sys-devel/llvm:13
-    - sys-devel/gcc:11.3.0
+    - sys-devel/gcc:12.3.0
 
     # Waiting for the next upgrade for the upgrade of Nodejs.
     - <net-libs/nodejs-15.0
diff --git a/portage-converter/java.yaml b/portage-converter/java.yaml
index 8d4013013c..46cadb150a 100644
--- a/portage-converter/java.yaml
+++ b/portage-converter/java.yaml
@@ -209,36 +209,37 @@ include_layers:
 
 # Define the list of the files generated by Funtoo reposcan tool.
 reposcan_sources:
-  - ./kit_cache/browser-kit-next
-  - ./kit_cache/core-gl-kit-next
-  - ./kit_cache/core-hw-kit-next
-  - ./kit_cache/core-kit-next
-  - ./kit_cache/core-server-kit-next
-  - ./kit_cache/desktop-kit-next
-  - ./kit_cache/dev-kit-next
-  - ./kit_cache/editors-kit-next
-  - ./kit_cache/games-kit-next
+  - ./kit_cache/browser-kit-mark-testing
+  - ./kit_cache/core-gl-kit-mark-testing
+  - ./kit_cache/core-hw-kit-mark-testing
+  - ./kit_cache/core-kit-mark-testing
+  - ./kit_cache/core-server-kit-mark-testing
+  - ./kit_cache/desktop-kit-mark-testing
+  - ./kit_cache/dev-kit-mark-testing
+  - ./kit_cache/editors-kit-mark-testing
+  - ./kit_cache/games-kit-mark-testing
+  - ./kit_cache/gnome-kit-mark-testing
+  - ./kit_cache/haskell-kit-mark-testing
+  - ./kit_cache/java-kit-mark-testing
+  - ./kit_cache/kde-kit-mark-testing
+  - ./kit_cache/lang-kit-mark-testing
+  - ./kit_cache/lisp-scheme-kit-mark-testing
+  - ./kit_cache/llvm-kit-mark-testing
+  - ./kit_cache/mate-kit-mark-testing
+  - ./kit_cache/media-kit-mark-testing
+  - ./kit_cache/ml-lang-kit-mark-testing
+  - ./kit_cache/net-kit-mark-testing
+  - ./kit_cache/perl-kit-mark-testing
+  - ./kit_cache/python-kit-mark-testing
+  - ./kit_cache/python-modules-kit-mark-testing
+  - ./kit_cache/qt-kit-mark-testing
+  - ./kit_cache/ruby-kit-mark-testing
+  - ./kit_cache/science-kit-mark-testing
+  - ./kit_cache/security-kit-mark-testing
+  - ./kit_cache/text-kit-mark-testing
+  - ./kit_cache/xfce-kit-mark-testing
+
   - ./kit_cache/geaaru-kit-funtoo
-  - ./kit_cache/gnome-kit-next-3.36-prime
-  - ./kit_cache/haskell-kit-next
-  - ./kit_cache/java-kit-next
-  - ./kit_cache/kde-kit-next-5.27-release
-  - ./kit_cache/lang-kit-next
-  - ./kit_cache/lisp-scheme-kit-next
-  - ./kit_cache/llvm-kit-next
-  - ./kit_cache/mate-kit-next-1.24-prime
-  - ./kit_cache/media-kit-next
-  - ./kit_cache/ml-lang-kit-next
-  - ./kit_cache/net-kit-next
-  - ./kit_cache/perl-kit-next
-  - ./kit_cache/python-kit-next
-  - ./kit_cache/python-modules-kit-next
-  - ./kit_cache/qt-kit-next-5.15.2-release
-  - ./kit_cache/ruby-kit-next
-  - ./kit_cache/science-kit-next
-  - ./kit_cache/security-kit-next
-  - ./kit_cache/text-kit-next
-  - ./kit_cache/xfce-kit-next-4.16-release
 
 # Disable use of category with slot as requires. Default is without slot.
 reposcan_requires_slot: true
@@ -248,10 +249,10 @@ reposcan_contraints:
     - dev-lang/python:3.9
     - dev-lang/ruby:3.1
     - sys-devel/llvm:13
-    - sys-devel/gcc:11.3.0
+    - sys-devel/gcc:12.3.0
 
     # Waiting for the next upgrade for the upgrade of Nodejs.
-    - <net-libs/nodejs-15.0
+    - <net-libs/nodejs-20.0
 
     - sys-devel/llvm:13
     - sys-devel/clang:13
diff --git a/portage-converter/lang.yaml b/portage-converter/lang.yaml
index c8cc5a867c..a2015211a8 100644
--- a/portage-converter/lang.yaml
+++ b/portage-converter/lang.yaml
@@ -441,36 +441,37 @@ include_layers:
 
 # Define the list of the files generated by Funtoo reposcan tool.
 reposcan_sources:
-  - ./kit_cache/browser-kit-next
-  - ./kit_cache/core-gl-kit-next
-  - ./kit_cache/core-hw-kit-next
-  - ./kit_cache/core-kit-next
-  - ./kit_cache/core-server-kit-next
-  - ./kit_cache/desktop-kit-next
-  - ./kit_cache/dev-kit-next
-  - ./kit_cache/editors-kit-next
-  - ./kit_cache/games-kit-next
+  - ./kit_cache/browser-kit-mark-testing
+  - ./kit_cache/core-gl-kit-mark-testing
+  - ./kit_cache/core-hw-kit-mark-testing
+  - ./kit_cache/core-kit-mark-testing
+  - ./kit_cache/core-server-kit-mark-testing
+  - ./kit_cache/desktop-kit-mark-testing
+  - ./kit_cache/dev-kit-mark-testing
+  - ./kit_cache/editors-kit-mark-testing
+  - ./kit_cache/games-kit-mark-testing
+  - ./kit_cache/gnome-kit-mark-testing
+  - ./kit_cache/haskell-kit-mark-testing
+  - ./kit_cache/java-kit-mark-testing
+  - ./kit_cache/kde-kit-mark-testing
+  - ./kit_cache/lang-kit-mark-testing
+  - ./kit_cache/lisp-scheme-kit-mark-testing
+  - ./kit_cache/llvm-kit-mark-testing
+  - ./kit_cache/mate-kit-mark-testing
+  - ./kit_cache/media-kit-mark-testing
+  - ./kit_cache/ml-lang-kit-mark-testing
+  - ./kit_cache/net-kit-mark-testing
+  - ./kit_cache/perl-kit-mark-testing
+  - ./kit_cache/python-kit-mark-testing
+  - ./kit_cache/python-modules-kit-mark-testing
+  - ./kit_cache/qt-kit-mark-testing
+  - ./kit_cache/ruby-kit-mark-testing
+  - ./kit_cache/science-kit-mark-testing
+  - ./kit_cache/security-kit-mark-testing
+  - ./kit_cache/text-kit-mark-testing
+  - ./kit_cache/xfce-kit-mark-testing
+
   - ./kit_cache/geaaru-kit-funtoo
-  - ./kit_cache/gnome-kit-next-3.36-prime
-  - ./kit_cache/haskell-kit-next
-  - ./kit_cache/java-kit-next
-  - ./kit_cache/kde-kit-next-5.27-release
-  - ./kit_cache/lang-kit-next
-  - ./kit_cache/lisp-scheme-kit-next
-  - ./kit_cache/llvm-kit-next
-  - ./kit_cache/mate-kit-next-1.24-prime
-  - ./kit_cache/media-kit-next
-  - ./kit_cache/ml-lang-kit-next
-  - ./kit_cache/net-kit-next
-  - ./kit_cache/perl-kit-next
-  - ./kit_cache/python-kit-next
-  - ./kit_cache/python-modules-kit-next
-  - ./kit_cache/qt-kit-next-5.15.2-release
-  - ./kit_cache/ruby-kit-next
-  - ./kit_cache/science-kit-next
-  - ./kit_cache/security-kit-next
-  - ./kit_cache/text-kit-next
-  - ./kit_cache/xfce-kit-next-4.16-release
 
 # Disable use of category with slot as requires. Default is without slot.
 reposcan_requires_slot: true
@@ -480,7 +481,7 @@ reposcan_contraints:
     - dev-lang/python:3.9
     - dev-lang/ruby:3.1
     - sys-devel/llvm:13
-    - sys-devel/gcc:11.3.0
+    - sys-devel/gcc:12.3.0
 
     # Waiting for the next upgrade for the upgrade of Nodejs.
     - <net-libs/nodejs-21.0
diff --git a/portage-converter/latex-extra.yaml b/portage-converter/latex-extra.yaml
index b7281ddf6a..063e93a71b 100644
--- a/portage-converter/latex-extra.yaml
+++ b/portage-converter/latex-extra.yaml
@@ -92,36 +92,38 @@ include_layers:
 
 # Define the list of the files generated by Funtoo reposcan tool.
 reposcan_sources:
-  - ./kit_cache/browser-kit-next
-  - ./kit_cache/core-gl-kit-next
-  - ./kit_cache/core-hw-kit-next
-  - ./kit_cache/core-kit-next
-  - ./kit_cache/core-server-kit-next
-  - ./kit_cache/desktop-kit-next
-  - ./kit_cache/dev-kit-next
-  - ./kit_cache/editors-kit-next
-  - ./kit_cache/games-kit-next
+  - ./kit_cache/browser-kit-mark-testing
+  - ./kit_cache/core-gl-kit-mark-testing
+  - ./kit_cache/core-hw-kit-mark-testing
+  - ./kit_cache/core-kit-mark-testing
+  - ./kit_cache/core-server-kit-mark-testing
+  - ./kit_cache/desktop-kit-mark-testing
+  - ./kit_cache/dev-kit-mark-testing
+  - ./kit_cache/editors-kit-mark-testing
+  - ./kit_cache/games-kit-mark-testing
+  - ./kit_cache/gnome-kit-mark-testing
+  - ./kit_cache/haskell-kit-mark-testing
+  - ./kit_cache/java-kit-mark-testing
+  - ./kit_cache/kde-kit-mark-testing
+  - ./kit_cache/lang-kit-mark-testing
+  - ./kit_cache/lisp-scheme-kit-mark-testing
+  - ./kit_cache/llvm-kit-mark-testing
+  - ./kit_cache/mate-kit-mark-testing
+  - ./kit_cache/media-kit-mark-testing
+  - ./kit_cache/ml-lang-kit-mark-testing
+  - ./kit_cache/net-kit-mark-testing
+  - ./kit_cache/perl-kit-mark-testing
+  - ./kit_cache/python-kit-mark-testing
+  - ./kit_cache/python-modules-kit-mark-testing
+  - ./kit_cache/qt-kit-mark-testing
+  - ./kit_cache/ruby-kit-mark-testing
+  - ./kit_cache/science-kit-mark-testing
+  - ./kit_cache/security-kit-mark-testing
+  - ./kit_cache/text-kit-mark-testing
+  - ./kit_cache/xfce-kit-mark-testing
+
   - ./kit_cache/geaaru-kit-funtoo
-  - ./kit_cache/gnome-kit-next-3.36-prime
-  - ./kit_cache/haskell-kit-next
-  - ./kit_cache/java-kit-next
-  - ./kit_cache/kde-kit-next-5.27-release
-  - ./kit_cache/lang-kit-next
-  - ./kit_cache/lisp-scheme-kit-next
-  - ./kit_cache/llvm-kit-next
-  - ./kit_cache/mate-kit-next-1.24-prime
-  - ./kit_cache/media-kit-next
-  - ./kit_cache/ml-lang-kit-next
-  - ./kit_cache/net-kit-next
-  - ./kit_cache/perl-kit-next
-  - ./kit_cache/python-kit-next
-  - ./kit_cache/python-modules-kit-next
-  - ./kit_cache/qt-kit-next-5.15.2-release
-  - ./kit_cache/ruby-kit-next
-  - ./kit_cache/science-kit-next
-  - ./kit_cache/security-kit-next
-  - ./kit_cache/text-kit-next
-  - ./kit_cache/xfce-kit-next-4.16-release
+
 
 # Disable use of category with slot as requires. Default is without slot.
 reposcan_requires_slot: true
@@ -131,10 +133,10 @@ reposcan_contraints:
     - dev-lang/python:3.9
     - dev-lang/ruby:3.1
     - sys-devel/llvm:13
-    - sys-devel/gcc:11.3.0
+    - sys-devel/gcc:12.3.0
 
     # Waiting for the next upgrade for the upgrade of Nodejs.
-    - <net-libs/nodejs-15.0
+    - <net-libs/nodejs-20.0
 
     - sys-devel/llvm:13
     - sys-devel/clang:13
diff --git a/portage-converter/latex.yaml b/portage-converter/latex.yaml
index 83d95afe2c..8a7714f664 100644
--- a/portage-converter/latex.yaml
+++ b/portage-converter/latex.yaml
@@ -217,36 +217,37 @@ include_layers:
 
 # Define the list of the files generated by Funtoo reposcan tool.
 reposcan_sources:
-  - ./kit_cache/browser-kit-next
-  - ./kit_cache/core-gl-kit-next
-  - ./kit_cache/core-hw-kit-next
-  - ./kit_cache/core-kit-next
-  - ./kit_cache/core-server-kit-next
-  - ./kit_cache/desktop-kit-next
-  - ./kit_cache/dev-kit-next
-  - ./kit_cache/editors-kit-next
-  - ./kit_cache/games-kit-next
+  - ./kit_cache/browser-kit-mark-testing
+  - ./kit_cache/core-gl-kit-mark-testing
+  - ./kit_cache/core-hw-kit-mark-testing
+  - ./kit_cache/core-kit-mark-testing
+  - ./kit_cache/core-server-kit-mark-testing
+  - ./kit_cache/desktop-kit-mark-testing
+  - ./kit_cache/dev-kit-mark-testing
+  - ./kit_cache/editors-kit-mark-testing
+  - ./kit_cache/games-kit-mark-testing
+  - ./kit_cache/gnome-kit-mark-testing
+  - ./kit_cache/haskell-kit-mark-testing
+  - ./kit_cache/java-kit-mark-testing
+  - ./kit_cache/kde-kit-mark-testing
+  - ./kit_cache/lang-kit-mark-testing
+  - ./kit_cache/lisp-scheme-kit-mark-testing
+  - ./kit_cache/llvm-kit-mark-testing
+  - ./kit_cache/mate-kit-mark-testing
+  - ./kit_cache/media-kit-mark-testing
+  - ./kit_cache/ml-lang-kit-mark-testing
+  - ./kit_cache/net-kit-mark-testing
+  - ./kit_cache/perl-kit-mark-testing
+  - ./kit_cache/python-kit-mark-testing
+  - ./kit_cache/python-modules-kit-mark-testing
+  - ./kit_cache/qt-kit-mark-testing
+  - ./kit_cache/ruby-kit-mark-testing
+  - ./kit_cache/science-kit-mark-testing
+  - ./kit_cache/security-kit-mark-testing
+  - ./kit_cache/text-kit-mark-testing
+  - ./kit_cache/xfce-kit-mark-testing
+
   - ./kit_cache/geaaru-kit-funtoo
-  - ./kit_cache/gnome-kit-next-3.36-prime
-  - ./kit_cache/haskell-kit-next
-  - ./kit_cache/java-kit-next
-  - ./kit_cache/kde-kit-next-5.27-release
-  - ./kit_cache/lang-kit-next
-  - ./kit_cache/lisp-scheme-kit-next
-  - ./kit_cache/llvm-kit-next
-  - ./kit_cache/mate-kit-next-1.24-prime
-  - ./kit_cache/media-kit-next
-  - ./kit_cache/ml-lang-kit-next
-  - ./kit_cache/net-kit-next
-  - ./kit_cache/perl-kit-next
-  - ./kit_cache/python-kit-next
-  - ./kit_cache/python-modules-kit-next
-  - ./kit_cache/qt-kit-next-5.15.2-release
-  - ./kit_cache/ruby-kit-next
-  - ./kit_cache/science-kit-next
-  - ./kit_cache/security-kit-next
-  - ./kit_cache/text-kit-next
-  - ./kit_cache/xfce-kit-next-4.16-release
 
 # Disable use of category with slot as requires. Default is without slot.
 reposcan_requires_slot: true
@@ -256,10 +257,10 @@ reposcan_contraints:
     - dev-lang/python:3.9
     - dev-lang/ruby:3.1
     - sys-devel/llvm:13
-    - sys-devel/gcc:11.3.0
+    - sys-devel/gcc:12.3.0
 
     # Waiting for the next upgrade for the upgrade of Nodejs.
-    - <net-libs/nodejs-15.0
+    - <net-libs/nodejs-20.0
 
     - sys-devel/llvm:13
     - sys-devel/clang:13
diff --git a/portage-converter/net.yaml b/portage-converter/net.yaml
index 3e60437100..b7a8e496a6 100644
--- a/portage-converter/net.yaml
+++ b/portage-converter/net.yaml
@@ -1284,36 +1284,37 @@ include_layers:
 
 # Define the list of the files generated by Funtoo reposcan tool.
 reposcan_sources:
-  - ./kit_cache/browser-kit-next
-  - ./kit_cache/core-gl-kit-next
-  - ./kit_cache/core-hw-kit-next
-  - ./kit_cache/core-kit-next
-  - ./kit_cache/core-server-kit-next
-  - ./kit_cache/desktop-kit-next
-  - ./kit_cache/dev-kit-next
-  - ./kit_cache/editors-kit-next
-  - ./kit_cache/games-kit-next
+  - ./kit_cache/browser-kit-mark-testing
+  - ./kit_cache/core-gl-kit-mark-testing
+  - ./kit_cache/core-hw-kit-mark-testing
+  - ./kit_cache/core-kit-mark-testing
+  - ./kit_cache/core-server-kit-mark-testing
+  - ./kit_cache/desktop-kit-mark-testing
+  - ./kit_cache/dev-kit-mark-testing
+  - ./kit_cache/editors-kit-mark-testing
+  - ./kit_cache/games-kit-mark-testing
+  - ./kit_cache/gnome-kit-mark-testing
+  - ./kit_cache/haskell-kit-mark-testing
+  - ./kit_cache/java-kit-mark-testing
+  - ./kit_cache/kde-kit-mark-testing
+  - ./kit_cache/lang-kit-mark-testing
+  - ./kit_cache/lisp-scheme-kit-mark-testing
+  - ./kit_cache/llvm-kit-mark-testing
+  - ./kit_cache/mate-kit-mark-testing
+  - ./kit_cache/media-kit-mark-testing
+  - ./kit_cache/ml-lang-kit-mark-testing
+  - ./kit_cache/net-kit-mark-testing
+  - ./kit_cache/perl-kit-mark-testing
+  - ./kit_cache/python-kit-mark-testing
+  - ./kit_cache/python-modules-kit-mark-testing
+  - ./kit_cache/qt-kit-mark-testing
+  - ./kit_cache/ruby-kit-mark-testing
+  - ./kit_cache/science-kit-mark-testing
+  - ./kit_cache/security-kit-mark-testing
+  - ./kit_cache/text-kit-mark-testing
+  - ./kit_cache/xfce-kit-mark-testing
+
   - ./kit_cache/geaaru-kit-funtoo
-  - ./kit_cache/gnome-kit-next-3.36-prime
-  - ./kit_cache/haskell-kit-next
-  - ./kit_cache/java-kit-next
-  - ./kit_cache/kde-kit-next-5.27-release
-  - ./kit_cache/lang-kit-next
-  - ./kit_cache/lisp-scheme-kit-next
-  - ./kit_cache/llvm-kit-next
-  - ./kit_cache/mate-kit-next-1.24-prime
-  - ./kit_cache/media-kit-next
-  - ./kit_cache/ml-lang-kit-next
-  - ./kit_cache/net-kit-next
-  - ./kit_cache/perl-kit-next
-  - ./kit_cache/python-kit-next
-  - ./kit_cache/python-modules-kit-next
-  - ./kit_cache/qt-kit-next-5.15.2-release
-  - ./kit_cache/ruby-kit-next
-  - ./kit_cache/science-kit-next
-  - ./kit_cache/security-kit-next
-  - ./kit_cache/text-kit-next
-  - ./kit_cache/xfce-kit-next-4.16-release
 
 # Disable use of category with slot as requires. Default is without slot.
 reposcan_requires_slot: true
@@ -1321,7 +1322,7 @@ reposcan_requires_slot: true
 reposcan_contraints:
   packages:
     - dev-lang/python:3.9
-    - sys-devel/gcc:11.3.0
+    - sys-devel/gcc:12.3.0
 
 reposcan_disabled_use_flags:
   # !!internal use only!! used for creating build images and the first half of bootstrapping [make stage1]
diff --git a/portage-converter/php-extra.yaml b/portage-converter/php-extra.yaml
index 75ef9907a2..f329d579f8 100644
--- a/portage-converter/php-extra.yaml
+++ b/portage-converter/php-extra.yaml
@@ -67,7 +67,6 @@ artefacts:
     enabled:
       - json
       - session
-      - php_targets_php7-4
       - php_targets_php8-1
       - php_targets_php8-2
     disabled:
@@ -85,36 +84,37 @@ include_layers:
 
 # Define the list of the files generated by Funtoo reposcan tool.
 reposcan_sources:
-  - ./kit_cache/browser-kit-next
-  - ./kit_cache/core-gl-kit-next
-  - ./kit_cache/core-hw-kit-next
-  - ./kit_cache/core-kit-next
-  - ./kit_cache/core-server-kit-next
-  - ./kit_cache/desktop-kit-next
-  - ./kit_cache/dev-kit-next
-  - ./kit_cache/editors-kit-next
-  - ./kit_cache/games-kit-next
+  - ./kit_cache/browser-kit-mark-testing
+  - ./kit_cache/core-gl-kit-mark-testing
+  - ./kit_cache/core-hw-kit-mark-testing
+  - ./kit_cache/core-kit-mark-testing
+  - ./kit_cache/core-server-kit-mark-testing
+  - ./kit_cache/desktop-kit-mark-testing
+  - ./kit_cache/dev-kit-mark-testing
+  - ./kit_cache/editors-kit-mark-testing
+  - ./kit_cache/games-kit-mark-testing
+  - ./kit_cache/gnome-kit-mark-testing
+  - ./kit_cache/haskell-kit-mark-testing
+  - ./kit_cache/java-kit-mark-testing
+  - ./kit_cache/kde-kit-mark-testing
+  - ./kit_cache/lang-kit-mark-testing
+  - ./kit_cache/lisp-scheme-kit-mark-testing
+  - ./kit_cache/llvm-kit-mark-testing
+  - ./kit_cache/mate-kit-mark-testing
+  - ./kit_cache/media-kit-mark-testing
+  - ./kit_cache/ml-lang-kit-mark-testing
+  - ./kit_cache/net-kit-mark-testing
+  - ./kit_cache/perl-kit-mark-testing
+  - ./kit_cache/python-kit-mark-testing
+  - ./kit_cache/python-modules-kit-mark-testing
+  - ./kit_cache/qt-kit-mark-testing
+  - ./kit_cache/ruby-kit-mark-testing
+  - ./kit_cache/science-kit-mark-testing
+  - ./kit_cache/security-kit-mark-testing
+  - ./kit_cache/text-kit-mark-testing
+  - ./kit_cache/xfce-kit-mark-testing
+
   - ./kit_cache/geaaru-kit-funtoo
-  - ./kit_cache/gnome-kit-next-3.36-prime
-  - ./kit_cache/haskell-kit-next
-  - ./kit_cache/java-kit-next
-  - ./kit_cache/kde-kit-next-5.27-release
-  - ./kit_cache/lang-kit-next
-  - ./kit_cache/lisp-scheme-kit-next
-  - ./kit_cache/llvm-kit-next
-  - ./kit_cache/mate-kit-next-1.24-prime
-  - ./kit_cache/media-kit-next
-  - ./kit_cache/ml-lang-kit-next
-  - ./kit_cache/net-kit-next
-  - ./kit_cache/perl-kit-next
-  - ./kit_cache/python-kit-next
-  - ./kit_cache/python-modules-kit-next
-  - ./kit_cache/qt-kit-next-5.15.2-release
-  - ./kit_cache/ruby-kit-next
-  - ./kit_cache/science-kit-next
-  - ./kit_cache/security-kit-next
-  - ./kit_cache/text-kit-next
-  - ./kit_cache/xfce-kit-next-4.16-release
 
 # Disable use of category with slot as requires. Default is without slot.
 reposcan_requires_slot: true
@@ -124,10 +124,10 @@ reposcan_contraints:
     - dev-lang/python:3.9
     - dev-lang/ruby:3.1
     - sys-devel/llvm:13
-    - sys-devel/gcc:11.3.0
+    - sys-devel/gcc:12.3.0
 
     # Waiting for the next upgrade for the upgrade of Nodejs.
-    - <net-libs/nodejs-15.0
+    - <net-libs/nodejs-20.0
 
     - sys-devel/llvm:13
     - sys-devel/clang:13
@@ -180,6 +180,7 @@ reposcan_disabled_use_flags:
   - python_targets_python3_8
   - python_targets_python3_10
   - python_targets_pypy3
+  - php_targets_php7-4
   - ruby_targets_ruby25
   - ruby_targets_ruby24
   - ruby_targets_ruby25
diff --git a/portage-converter/python-extra.yaml b/portage-converter/python-extra.yaml
index 0f2f7395c3..f40a46c213 100644
--- a/portage-converter/python-extra.yaml
+++ b/portage-converter/python-extra.yaml
@@ -199,36 +199,37 @@ include_layers:
 
 # Define the list of the files generated by Funtoo reposcan tool.
 reposcan_sources:
-  - ./kit_cache/browser-kit-next
-  - ./kit_cache/core-gl-kit-next
-  - ./kit_cache/core-hw-kit-next
-  - ./kit_cache/core-kit-next
-  - ./kit_cache/core-server-kit-next
-  - ./kit_cache/desktop-kit-next
-  - ./kit_cache/dev-kit-next
-  - ./kit_cache/editors-kit-next
-  - ./kit_cache/games-kit-next
+  - ./kit_cache/browser-kit-mark-testing
+  - ./kit_cache/core-gl-kit-mark-testing
+  - ./kit_cache/core-hw-kit-mark-testing
+  - ./kit_cache/core-kit-mark-testing
+  - ./kit_cache/core-server-kit-mark-testing
+  - ./kit_cache/desktop-kit-mark-testing
+  - ./kit_cache/dev-kit-mark-testing
+  - ./kit_cache/editors-kit-mark-testing
+  - ./kit_cache/games-kit-mark-testing
+  - ./kit_cache/gnome-kit-mark-testing
+  - ./kit_cache/haskell-kit-mark-testing
+  - ./kit_cache/java-kit-mark-testing
+  - ./kit_cache/kde-kit-mark-testing
+  - ./kit_cache/lang-kit-mark-testing
+  - ./kit_cache/lisp-scheme-kit-mark-testing
+  - ./kit_cache/llvm-kit-mark-testing
+  - ./kit_cache/mate-kit-mark-testing
+  - ./kit_cache/media-kit-mark-testing
+  - ./kit_cache/ml-lang-kit-mark-testing
+  - ./kit_cache/net-kit-mark-testing
+  - ./kit_cache/perl-kit-mark-testing
+  - ./kit_cache/python-kit-mark-testing
+  - ./kit_cache/python-modules-kit-mark-testing
+  - ./kit_cache/qt-kit-mark-testing
+  - ./kit_cache/ruby-kit-mark-testing
+  - ./kit_cache/science-kit-mark-testing
+  - ./kit_cache/security-kit-mark-testing
+  - ./kit_cache/text-kit-mark-testing
+  - ./kit_cache/xfce-kit-mark-testing
+
   - ./kit_cache/geaaru-kit-funtoo
-  - ./kit_cache/gnome-kit-next-3.36-prime
-  - ./kit_cache/haskell-kit-next
-  - ./kit_cache/java-kit-next
-  - ./kit_cache/kde-kit-next-5.27-release
-  - ./kit_cache/lang-kit-next
-  - ./kit_cache/lisp-scheme-kit-next
-  - ./kit_cache/llvm-kit-next
-  - ./kit_cache/mate-kit-next-1.24-prime
-  - ./kit_cache/media-kit-next
-  - ./kit_cache/ml-lang-kit-next
-  - ./kit_cache/net-kit-next
-  - ./kit_cache/perl-kit-next
-  - ./kit_cache/python-kit-next
-  - ./kit_cache/python-modules-kit-next
-  - ./kit_cache/qt-kit-next-5.15.2-release
-  - ./kit_cache/ruby-kit-next
-  - ./kit_cache/science-kit-next
-  - ./kit_cache/security-kit-next
-  - ./kit_cache/text-kit-next
-  - ./kit_cache/xfce-kit-next-4.16-release
 
 # Disable use of category with slot as requires. Default is without slot.
 reposcan_requires_slot: true
@@ -238,10 +239,10 @@ reposcan_contraints:
     - dev-lang/python:3.9
     - dev-lang/ruby:3.1
     - sys-devel/llvm:13
-    - sys-devel/gcc:11.3.0
+    - sys-devel/gcc:12.3.0
 
     # Waiting for the next upgrade for the upgrade of Nodejs.
-    - <net-libs/nodejs-15.0
+    - <net-libs/nodejs-20.0
 
     - sys-devel/llvm:13
     - sys-devel/clang:13
diff --git a/portage-converter/server.yaml b/portage-converter/server.yaml
index 2ffb2dc2af..6f14dffc6f 100644
--- a/portage-converter/server.yaml
+++ b/portage-converter/server.yaml
@@ -869,36 +869,37 @@ include_layers:
 
 # Define the list of the files generated by Funtoo reposcan tool.
 reposcan_sources:
-  - ./kit_cache/browser-kit-next
-  - ./kit_cache/core-gl-kit-next
-  - ./kit_cache/core-hw-kit-next
-  - ./kit_cache/core-kit-next
-  - ./kit_cache/core-server-kit-next
-  - ./kit_cache/desktop-kit-next
-  - ./kit_cache/dev-kit-next
-  - ./kit_cache/editors-kit-next
-  - ./kit_cache/games-kit-next
+  - ./kit_cache/browser-kit-mark-testing
+  - ./kit_cache/core-gl-kit-mark-testing
+  - ./kit_cache/core-hw-kit-mark-testing
+  - ./kit_cache/core-kit-mark-testing
+  - ./kit_cache/core-server-kit-mark-testing
+  - ./kit_cache/desktop-kit-mark-testing
+  - ./kit_cache/dev-kit-mark-testing
+  - ./kit_cache/editors-kit-mark-testing
+  - ./kit_cache/games-kit-mark-testing
+  - ./kit_cache/gnome-kit-mark-testing
+  - ./kit_cache/haskell-kit-mark-testing
+  - ./kit_cache/java-kit-mark-testing
+  - ./kit_cache/kde-kit-mark-testing
+  - ./kit_cache/lang-kit-mark-testing
+  - ./kit_cache/lisp-scheme-kit-mark-testing
+  - ./kit_cache/llvm-kit-mark-testing
+  - ./kit_cache/mate-kit-mark-testing
+  - ./kit_cache/media-kit-mark-testing
+  - ./kit_cache/ml-lang-kit-mark-testing
+  - ./kit_cache/net-kit-mark-testing
+  - ./kit_cache/perl-kit-mark-testing
+  - ./kit_cache/python-kit-mark-testing
+  - ./kit_cache/python-modules-kit-mark-testing
+  - ./kit_cache/qt-kit-mark-testing
+  - ./kit_cache/ruby-kit-mark-testing
+  - ./kit_cache/science-kit-mark-testing
+  - ./kit_cache/security-kit-mark-testing
+  - ./kit_cache/text-kit-mark-testing
+  - ./kit_cache/xfce-kit-mark-testing
+
   - ./kit_cache/geaaru-kit-funtoo
-  - ./kit_cache/gnome-kit-next-3.36-prime
-  - ./kit_cache/haskell-kit-next
-  - ./kit_cache/java-kit-next
-  - ./kit_cache/kde-kit-next-5.27-release
-  - ./kit_cache/lang-kit-next
-  - ./kit_cache/lisp-scheme-kit-next
-  - ./kit_cache/llvm-kit-next
-  - ./kit_cache/mate-kit-next-1.24-prime
-  - ./kit_cache/media-kit-next
-  - ./kit_cache/ml-lang-kit-next
-  - ./kit_cache/net-kit-next
-  - ./kit_cache/perl-kit-next
-  - ./kit_cache/python-kit-next
-  - ./kit_cache/python-modules-kit-next
-  - ./kit_cache/qt-kit-next-5.15.2-release
-  - ./kit_cache/ruby-kit-next
-  - ./kit_cache/science-kit-next
-  - ./kit_cache/security-kit-next
-  - ./kit_cache/text-kit-next
-  - ./kit_cache/xfce-kit-next-4.16-release
 
 # Disable use of category with slot as requires. Default is without slot.
 reposcan_requires_slot: true
@@ -908,7 +909,7 @@ reposcan_contraints:
     - dev-lang/python:3.9
     - dev-lang/ruby:3.1
     - sys-devel/llvm:13
-    - sys-devel/gcc:11.3.0
+    - sys-devel/gcc:12.3.0
 
     # Waiting for the next upgrade for the upgrade of Nodejs.
     - <net-libs/nodejs-15.0
diff --git a/portage-converter/telemetry.yaml b/portage-converter/telemetry.yaml
index f2b302ae02..8908b84371 100644
--- a/portage-converter/telemetry.yaml
+++ b/portage-converter/telemetry.yaml
@@ -203,36 +203,37 @@ include_layers:
 
 # Define the list of the files generated by Funtoo reposcan tool.
 reposcan_sources:
-  - ./kit_cache/browser-kit-next
-  - ./kit_cache/core-gl-kit-next
-  - ./kit_cache/core-hw-kit-next
-  - ./kit_cache/core-kit-next
-  - ./kit_cache/core-server-kit-next
-  - ./kit_cache/desktop-kit-next
-  - ./kit_cache/dev-kit-next
-  - ./kit_cache/editors-kit-next
-  - ./kit_cache/games-kit-next
+  - ./kit_cache/browser-kit-mark-testing
+  - ./kit_cache/core-gl-kit-mark-testing
+  - ./kit_cache/core-hw-kit-mark-testing
+  - ./kit_cache/core-kit-mark-testing
+  - ./kit_cache/core-server-kit-mark-testing
+  - ./kit_cache/desktop-kit-mark-testing
+  - ./kit_cache/dev-kit-mark-testing
+  - ./kit_cache/editors-kit-mark-testing
+  - ./kit_cache/games-kit-mark-testing
+  - ./kit_cache/gnome-kit-mark-testing
+  - ./kit_cache/haskell-kit-mark-testing
+  - ./kit_cache/java-kit-mark-testing
+  - ./kit_cache/kde-kit-mark-testing
+  - ./kit_cache/lang-kit-mark-testing
+  - ./kit_cache/lisp-scheme-kit-mark-testing
+  - ./kit_cache/llvm-kit-mark-testing
+  - ./kit_cache/mate-kit-mark-testing
+  - ./kit_cache/media-kit-mark-testing
+  - ./kit_cache/ml-lang-kit-mark-testing
+  - ./kit_cache/net-kit-mark-testing
+  - ./kit_cache/perl-kit-mark-testing
+  - ./kit_cache/python-kit-mark-testing
+  - ./kit_cache/python-modules-kit-mark-testing
+  - ./kit_cache/qt-kit-mark-testing
+  - ./kit_cache/ruby-kit-mark-testing
+  - ./kit_cache/science-kit-mark-testing
+  - ./kit_cache/security-kit-mark-testing
+  - ./kit_cache/text-kit-mark-testing
+  - ./kit_cache/xfce-kit-mark-testing
+
   - ./kit_cache/geaaru-kit-funtoo
-  - ./kit_cache/gnome-kit-next-3.36-prime
-  - ./kit_cache/haskell-kit-next
-  - ./kit_cache/java-kit-next
-  - ./kit_cache/kde-kit-next-5.27-release
-  - ./kit_cache/lang-kit-next
-  - ./kit_cache/lisp-scheme-kit-next
-  - ./kit_cache/llvm-kit-next
-  - ./kit_cache/mate-kit-next-1.24-prime
-  - ./kit_cache/media-kit-next
-  - ./kit_cache/ml-lang-kit-next
-  - ./kit_cache/net-kit-next
-  - ./kit_cache/perl-kit-next
-  - ./kit_cache/python-kit-next
-  - ./kit_cache/python-modules-kit-next
-  - ./kit_cache/qt-kit-next-5.15.2-release
-  - ./kit_cache/ruby-kit-next
-  - ./kit_cache/science-kit-next
-  - ./kit_cache/security-kit-next
-  - ./kit_cache/text-kit-next
-  - ./kit_cache/xfce-kit-next-4.16-release
 
 # Disable use of category with slot as requires. Default is without slot.
 reposcan_requires_slot: true
@@ -242,10 +243,10 @@ reposcan_contraints:
     - dev-lang/python:3.9
     - dev-lang/ruby:3.1
     - sys-devel/llvm:13
-    - sys-devel/gcc:11.3.0
+    - sys-devel/gcc:12.3.0
 
     # Waiting for the next upgrade for the upgrade of Nodejs.
-    - <net-libs/nodejs-15.0
+    - <net-libs/nodejs-20.0
 
     - sys-devel/llvm:13
     - sys-devel/clang:13
diff --git a/portage-converter/text.yaml b/portage-converter/text.yaml
index e4c715e921..088cccca92 100644
--- a/portage-converter/text.yaml
+++ b/portage-converter/text.yaml
@@ -177,36 +177,37 @@ include_layers:
 
 # Define the list of the files generated by Funtoo reposcan tool.
 reposcan_sources:
-  - ./kit_cache/browser-kit-next
-  - ./kit_cache/core-gl-kit-next
-  - ./kit_cache/core-hw-kit-next
-  - ./kit_cache/core-kit-next
-  - ./kit_cache/core-server-kit-next
-  - ./kit_cache/desktop-kit-next
-  - ./kit_cache/dev-kit-next
-  - ./kit_cache/editors-kit-next
-  - ./kit_cache/games-kit-next
+  - ./kit_cache/browser-kit-mark-testing
+  - ./kit_cache/core-gl-kit-mark-testing
+  - ./kit_cache/core-hw-kit-mark-testing
+  - ./kit_cache/core-kit-mark-testing
+  - ./kit_cache/core-server-kit-mark-testing
+  - ./kit_cache/desktop-kit-mark-testing
+  - ./kit_cache/dev-kit-mark-testing
+  - ./kit_cache/editors-kit-mark-testing
+  - ./kit_cache/games-kit-mark-testing
+  - ./kit_cache/gnome-kit-mark-testing
+  - ./kit_cache/haskell-kit-mark-testing
+  - ./kit_cache/java-kit-mark-testing
+  - ./kit_cache/kde-kit-mark-testing
+  - ./kit_cache/lang-kit-mark-testing
+  - ./kit_cache/lisp-scheme-kit-mark-testing
+  - ./kit_cache/llvm-kit-mark-testing
+  - ./kit_cache/mate-kit-mark-testing
+  - ./kit_cache/media-kit-mark-testing
+  - ./kit_cache/ml-lang-kit-mark-testing
+  - ./kit_cache/net-kit-mark-testing
+  - ./kit_cache/perl-kit-mark-testing
+  - ./kit_cache/python-kit-mark-testing
+  - ./kit_cache/python-modules-kit-mark-testing
+  - ./kit_cache/qt-kit-mark-testing
+  - ./kit_cache/ruby-kit-mark-testing
+  - ./kit_cache/science-kit-mark-testing
+  - ./kit_cache/security-kit-mark-testing
+  - ./kit_cache/text-kit-mark-testing
+  - ./kit_cache/xfce-kit-mark-testing
+
   - ./kit_cache/geaaru-kit-funtoo
-  - ./kit_cache/gnome-kit-next-3.36-prime
-  - ./kit_cache/haskell-kit-next
-  - ./kit_cache/java-kit-next
-  - ./kit_cache/kde-kit-next-5.27-release
-  - ./kit_cache/lang-kit-next
-  - ./kit_cache/lisp-scheme-kit-next
-  - ./kit_cache/llvm-kit-next
-  - ./kit_cache/mate-kit-next-1.24-prime
-  - ./kit_cache/media-kit-next
-  - ./kit_cache/ml-lang-kit-next
-  - ./kit_cache/net-kit-next
-  - ./kit_cache/perl-kit-next
-  - ./kit_cache/python-kit-next
-  - ./kit_cache/python-modules-kit-next
-  - ./kit_cache/qt-kit-next-5.15.2-release
-  - ./kit_cache/ruby-kit-next
-  - ./kit_cache/science-kit-next
-  - ./kit_cache/security-kit-next
-  - ./kit_cache/text-kit-next
-  - ./kit_cache/xfce-kit-next-4.16-release
 
 # Disable use of category with slot as requires. Default is without slot.
 reposcan_requires_slot: true
@@ -216,7 +217,7 @@ reposcan_contraints:
     - dev-lang/python:3.9
     - dev-lang/ruby:3.1
     - sys-devel/llvm:13
-    - sys-devel/gcc:11.3.0
+    - sys-devel/gcc:12.3.0
 
     # Waiting for the next upgrade for the upgrade of Nodejs.
     - <net-libs/nodejs-15.0
diff --git a/portage-converter/tools.yaml b/portage-converter/tools.yaml
index 8610e91f65..2982db2bc7 100644
--- a/portage-converter/tools.yaml
+++ b/portage-converter/tools.yaml
@@ -670,36 +670,37 @@ include_layers:
 
 # Define the list of the files generated by Funtoo reposcan tool.
 reposcan_sources:
-  - ./kit_cache/browser-kit-next
-  - ./kit_cache/core-gl-kit-next
-  - ./kit_cache/core-hw-kit-next
-  - ./kit_cache/core-kit-next
-  - ./kit_cache/core-server-kit-next
-  - ./kit_cache/desktop-kit-next
-  - ./kit_cache/dev-kit-next
-  - ./kit_cache/editors-kit-next
-  - ./kit_cache/games-kit-next
+  - ./kit_cache/browser-kit-mark-testing
+  - ./kit_cache/core-gl-kit-mark-testing
+  - ./kit_cache/core-hw-kit-mark-testing
+  - ./kit_cache/core-kit-mark-testing
+  - ./kit_cache/core-server-kit-mark-testing
+  - ./kit_cache/desktop-kit-mark-testing
+  - ./kit_cache/dev-kit-mark-testing
+  - ./kit_cache/editors-kit-mark-testing
+  - ./kit_cache/games-kit-mark-testing
+  - ./kit_cache/gnome-kit-mark-testing
+  - ./kit_cache/haskell-kit-mark-testing
+  - ./kit_cache/java-kit-mark-testing
+  - ./kit_cache/kde-kit-mark-testing
+  - ./kit_cache/lang-kit-mark-testing
+  - ./kit_cache/lisp-scheme-kit-mark-testing
+  - ./kit_cache/llvm-kit-mark-testing
+  - ./kit_cache/mate-kit-mark-testing
+  - ./kit_cache/media-kit-mark-testing
+  - ./kit_cache/ml-lang-kit-mark-testing
+  - ./kit_cache/net-kit-mark-testing
+  - ./kit_cache/perl-kit-mark-testing
+  - ./kit_cache/python-kit-mark-testing
+  - ./kit_cache/python-modules-kit-mark-testing
+  - ./kit_cache/qt-kit-mark-testing
+  - ./kit_cache/ruby-kit-mark-testing
+  - ./kit_cache/science-kit-mark-testing
+  - ./kit_cache/security-kit-mark-testing
+  - ./kit_cache/text-kit-mark-testing
+  - ./kit_cache/xfce-kit-mark-testing
+
   - ./kit_cache/geaaru-kit-funtoo
-  - ./kit_cache/gnome-kit-next-3.36-prime
-  - ./kit_cache/haskell-kit-next
-  - ./kit_cache/java-kit-next
-  - ./kit_cache/kde-kit-next-5.27-release
-  - ./kit_cache/lang-kit-next
-  - ./kit_cache/lisp-scheme-kit-next
-  - ./kit_cache/llvm-kit-next
-  - ./kit_cache/mate-kit-next-1.24-prime
-  - ./kit_cache/media-kit-next
-  - ./kit_cache/ml-lang-kit-next
-  - ./kit_cache/net-kit-next
-  - ./kit_cache/perl-kit-next
-  - ./kit_cache/python-kit-next
-  - ./kit_cache/python-modules-kit-next
-  - ./kit_cache/qt-kit-next-5.15.2-release
-  - ./kit_cache/ruby-kit-next
-  - ./kit_cache/science-kit-next
-  - ./kit_cache/security-kit-next
-  - ./kit_cache/text-kit-next
-  - ./kit_cache/xfce-kit-next-4.16-release
 
 # Disable use of category with slot as requires. Default is without slot.
 reposcan_requires_slot: true
@@ -709,10 +710,10 @@ reposcan_contraints:
     - dev-lang/python:3.9
     - dev-lang/ruby:3.1
     - sys-devel/llvm:13
-    - sys-devel/gcc:11.3.0
+    - sys-devel/gcc:12.3.0
 
     # Waiting for the next upgrade for the upgrade of Nodejs.
-    - <net-libs/nodejs-15.0
+    - <net-libs/nodejs-20.0
 
     - sys-devel/llvm:13
     - sys-devel/clang:13
diff --git a/portage-converter/xorg-base.yaml b/portage-converter/xorg-base.yaml
index 9192ee9e7f..879e8e9c12 100644
--- a/portage-converter/xorg-base.yaml
+++ b/portage-converter/xorg-base.yaml
@@ -313,36 +313,37 @@ include_layers:
 
 # Define the list of the files generated by Funtoo reposcan tool.
 reposcan_sources:
-  - ./kit_cache/browser-kit-next
-  - ./kit_cache/core-gl-kit-next
-  - ./kit_cache/core-hw-kit-next
-  - ./kit_cache/core-kit-next
-  - ./kit_cache/core-server-kit-next
-  - ./kit_cache/desktop-kit-next
-  - ./kit_cache/dev-kit-next
-  - ./kit_cache/editors-kit-next
-  - ./kit_cache/games-kit-next
+  - ./kit_cache/browser-kit-mark-testing
+  - ./kit_cache/core-gl-kit-mark-testing
+  - ./kit_cache/core-hw-kit-mark-testing
+  - ./kit_cache/core-kit-mark-testing
+  - ./kit_cache/core-server-kit-mark-testing
+  - ./kit_cache/desktop-kit-mark-testing
+  - ./kit_cache/dev-kit-mark-testing
+  - ./kit_cache/editors-kit-mark-testing
+  - ./kit_cache/games-kit-mark-testing
+  - ./kit_cache/gnome-kit-mark-testing
+  - ./kit_cache/haskell-kit-mark-testing
+  - ./kit_cache/java-kit-mark-testing
+  - ./kit_cache/kde-kit-mark-testing
+  - ./kit_cache/lang-kit-mark-testing
+  - ./kit_cache/lisp-scheme-kit-mark-testing
+  - ./kit_cache/llvm-kit-mark-testing
+  - ./kit_cache/mate-kit-mark-testing
+  - ./kit_cache/media-kit-mark-testing
+  - ./kit_cache/ml-lang-kit-mark-testing
+  - ./kit_cache/net-kit-mark-testing
+  - ./kit_cache/perl-kit-mark-testing
+  - ./kit_cache/python-kit-mark-testing
+  - ./kit_cache/python-modules-kit-mark-testing
+  - ./kit_cache/qt-kit-mark-testing
+  - ./kit_cache/ruby-kit-mark-testing
+  - ./kit_cache/science-kit-mark-testing
+  - ./kit_cache/security-kit-mark-testing
+  - ./kit_cache/text-kit-mark-testing
+  - ./kit_cache/xfce-kit-mark-testing
+
   - ./kit_cache/geaaru-kit-funtoo
-  - ./kit_cache/gnome-kit-next-3.36-prime
-  - ./kit_cache/haskell-kit-next
-  - ./kit_cache/java-kit-next
-  - ./kit_cache/kde-kit-next-5.27-release
-  - ./kit_cache/lang-kit-next
-  - ./kit_cache/lisp-scheme-kit-next
-  - ./kit_cache/llvm-kit-next
-  - ./kit_cache/mate-kit-next-1.24-prime
-  - ./kit_cache/media-kit-next
-  - ./kit_cache/ml-lang-kit-next
-  - ./kit_cache/net-kit-next
-  - ./kit_cache/perl-kit-next
-  - ./kit_cache/python-kit-next
-  - ./kit_cache/python-modules-kit-next
-  - ./kit_cache/qt-kit-next-5.15.2-release
-  - ./kit_cache/ruby-kit-next
-  - ./kit_cache/science-kit-next
-  - ./kit_cache/security-kit-next
-  - ./kit_cache/text-kit-next
-  - ./kit_cache/xfce-kit-next-4.16-release
 
 # Disable use of category with slot as requires. Default is without slot.
 reposcan_requires_slot: true
@@ -352,10 +353,10 @@ reposcan_contraints:
     - dev-lang/python:3.9
     - dev-lang/ruby:3.1
     - sys-devel/llvm:13
-    - sys-devel/gcc:11.3.0
+    - sys-devel/gcc:12.3.0
 
     # Waiting for the next upgrade for the upgrade of Nodejs.
-    - <net-libs/nodejs-15.0
+    - <net-libs/nodejs-20.0
 
     - sys-devel/llvm:13
     - sys-devel/clang:13
diff --git a/portage-converter/xorg-base2.yaml b/portage-converter/xorg-base2.yaml
index f41e4eff20..c815990084 100644
--- a/portage-converter/xorg-base2.yaml
+++ b/portage-converter/xorg-base2.yaml
@@ -346,36 +346,37 @@ include_layers:
 
 # Define the list of the files generated by Funtoo reposcan tool.
 reposcan_sources:
-  - ./kit_cache/browser-kit-next
-  - ./kit_cache/core-gl-kit-next
-  - ./kit_cache/core-hw-kit-next
-  - ./kit_cache/core-kit-next
-  - ./kit_cache/core-server-kit-next
-  - ./kit_cache/desktop-kit-next
-  - ./kit_cache/dev-kit-next
-  - ./kit_cache/editors-kit-next
-  - ./kit_cache/games-kit-next
+  - ./kit_cache/browser-kit-mark-testing
+  - ./kit_cache/core-gl-kit-mark-testing
+  - ./kit_cache/core-hw-kit-mark-testing
+  - ./kit_cache/core-kit-mark-testing
+  - ./kit_cache/core-server-kit-mark-testing
+  - ./kit_cache/desktop-kit-mark-testing
+  - ./kit_cache/dev-kit-mark-testing
+  - ./kit_cache/editors-kit-mark-testing
+  - ./kit_cache/games-kit-mark-testing
+  - ./kit_cache/gnome-kit-mark-testing
+  - ./kit_cache/haskell-kit-mark-testing
+  - ./kit_cache/java-kit-mark-testing
+  - ./kit_cache/kde-kit-mark-testing
+  - ./kit_cache/lang-kit-mark-testing
+  - ./kit_cache/lisp-scheme-kit-mark-testing
+  - ./kit_cache/llvm-kit-mark-testing
+  - ./kit_cache/mate-kit-mark-testing
+  - ./kit_cache/media-kit-mark-testing
+  - ./kit_cache/ml-lang-kit-mark-testing
+  - ./kit_cache/net-kit-mark-testing
+  - ./kit_cache/perl-kit-mark-testing
+  - ./kit_cache/python-kit-mark-testing
+  - ./kit_cache/python-modules-kit-mark-testing
+  - ./kit_cache/qt-kit-mark-testing
+  - ./kit_cache/ruby-kit-mark-testing
+  - ./kit_cache/science-kit-mark-testing
+  - ./kit_cache/security-kit-mark-testing
+  - ./kit_cache/text-kit-mark-testing
+  - ./kit_cache/xfce-kit-mark-testing
+
   - ./kit_cache/geaaru-kit-funtoo
-  - ./kit_cache/gnome-kit-next-3.36-prime
-  - ./kit_cache/haskell-kit-next
-  - ./kit_cache/java-kit-next
-  - ./kit_cache/kde-kit-next-5.27-release
-  - ./kit_cache/lang-kit-next
-  - ./kit_cache/lisp-scheme-kit-next
-  - ./kit_cache/llvm-kit-next
-  - ./kit_cache/mate-kit-next-1.24-prime
-  - ./kit_cache/media-kit-next
-  - ./kit_cache/ml-lang-kit-next
-  - ./kit_cache/net-kit-next
-  - ./kit_cache/perl-kit-next
-  - ./kit_cache/python-kit-next
-  - ./kit_cache/python-modules-kit-next
-  - ./kit_cache/qt-kit-next-5.15.2-release
-  - ./kit_cache/ruby-kit-next
-  - ./kit_cache/science-kit-next
-  - ./kit_cache/security-kit-next
-  - ./kit_cache/text-kit-next
-  - ./kit_cache/xfce-kit-next-4.16-release
 
 # Disable use of category with slot as requires. Default is without slot.
 reposcan_requires_slot: true
@@ -385,10 +386,10 @@ reposcan_contraints:
     - dev-lang/python:3.9
     - dev-lang/ruby:3.1
     - sys-devel/llvm:13
-    - sys-devel/gcc:11.3.0
+    - sys-devel/gcc:12.3.0
 
     # Waiting for the next upgrade for the upgrade of Nodejs.
-    - <net-libs/nodejs-15.0
+    - <net-libs/nodejs-20.0
 
     - sys-devel/llvm:13
     - sys-devel/clang:13
diff --git a/portage-converter/xorg-base3.yaml b/portage-converter/xorg-base3.yaml
index bbd34ab446..65a869539a 100644
--- a/portage-converter/xorg-base3.yaml
+++ b/portage-converter/xorg-base3.yaml
@@ -208,36 +208,37 @@ include_layers:
 
 # Define the list of the files generated by Funtoo reposcan tool.
 reposcan_sources:
-  - ./kit_cache/browser-kit-next
-  - ./kit_cache/core-gl-kit-next
-  - ./kit_cache/core-hw-kit-next
-  - ./kit_cache/core-kit-next
-  - ./kit_cache/core-server-kit-next
-  - ./kit_cache/desktop-kit-next
-  - ./kit_cache/dev-kit-next
-  - ./kit_cache/editors-kit-next
-  - ./kit_cache/games-kit-next
+  - ./kit_cache/browser-kit-mark-testing
+  - ./kit_cache/core-gl-kit-mark-testing
+  - ./kit_cache/core-hw-kit-mark-testing
+  - ./kit_cache/core-kit-mark-testing
+  - ./kit_cache/core-server-kit-mark-testing
+  - ./kit_cache/desktop-kit-mark-testing
+  - ./kit_cache/dev-kit-mark-testing
+  - ./kit_cache/editors-kit-mark-testing
+  - ./kit_cache/games-kit-mark-testing
+  - ./kit_cache/gnome-kit-mark-testing
+  - ./kit_cache/haskell-kit-mark-testing
+  - ./kit_cache/java-kit-mark-testing
+  - ./kit_cache/kde-kit-mark-testing
+  - ./kit_cache/lang-kit-mark-testing
+  - ./kit_cache/lisp-scheme-kit-mark-testing
+  - ./kit_cache/llvm-kit-mark-testing
+  - ./kit_cache/mate-kit-mark-testing
+  - ./kit_cache/media-kit-mark-testing
+  - ./kit_cache/ml-lang-kit-mark-testing
+  - ./kit_cache/net-kit-mark-testing
+  - ./kit_cache/perl-kit-mark-testing
+  - ./kit_cache/python-kit-mark-testing
+  - ./kit_cache/python-modules-kit-mark-testing
+  - ./kit_cache/qt-kit-mark-testing
+  - ./kit_cache/ruby-kit-mark-testing
+  - ./kit_cache/science-kit-mark-testing
+  - ./kit_cache/security-kit-mark-testing
+  - ./kit_cache/text-kit-mark-testing
+  - ./kit_cache/xfce-kit-mark-testing
+
   - ./kit_cache/geaaru-kit-funtoo
-  - ./kit_cache/gnome-kit-next-3.36-prime
-  - ./kit_cache/haskell-kit-next
-  - ./kit_cache/java-kit-next
-  - ./kit_cache/kde-kit-next-5.27-release
-  - ./kit_cache/lang-kit-next
-  - ./kit_cache/lisp-scheme-kit-next
-  - ./kit_cache/llvm-kit-next
-  - ./kit_cache/mate-kit-next-1.24-prime
-  - ./kit_cache/media-kit-next
-  - ./kit_cache/ml-lang-kit-next
-  - ./kit_cache/net-kit-next
-  - ./kit_cache/perl-kit-next
-  - ./kit_cache/python-kit-next
-  - ./kit_cache/python-modules-kit-next
-  - ./kit_cache/qt-kit-next-5.15.2-release
-  - ./kit_cache/ruby-kit-next
-  - ./kit_cache/science-kit-next
-  - ./kit_cache/security-kit-next
-  - ./kit_cache/text-kit-next
-  - ./kit_cache/xfce-kit-next-4.16-release
 
 # Disable use of category with slot as requires. Default is without slot.
 reposcan_requires_slot: true
@@ -247,10 +248,10 @@ reposcan_contraints:
     - dev-lang/python:3.9
     - dev-lang/ruby:3.1
     - sys-devel/llvm:13
-    - sys-devel/gcc:11.3.0
+    - sys-devel/gcc:12.3.0
 
     # Waiting for the next upgrade for the upgrade of Nodejs.
-    - <net-libs/nodejs-15.0
+    - <net-libs/nodejs-20.0
 
     - sys-devel/llvm:13
     - sys-devel/clang:13