diff --git a/images/ubuntu/scripts/build/install-gcc-compilers.sh b/images/ubuntu/scripts/build/install-gcc-compilers.sh
index ac0b91909..642b80dfd 100644
--- a/images/ubuntu/scripts/build/install-gcc-compilers.sh
+++ b/images/ubuntu/scripts/build/install-gcc-compilers.sh
@@ -5,15 +5,8 @@
 ################################################################################
 
 # Source the helpers for use with the script
-source $HELPER_SCRIPTS/os.sh
 source $HELPER_SCRIPTS/install.sh
 
-# Install GNU C++ compiler
-if ! is_ubuntu24 ; then
-    add-apt-repository ppa:ubuntu-toolchain-r/test -y
-    apt-get update -y
-fi
-
 versions=$(get_toolset_value '.gcc.versions[]')
 
 for version in ${versions[*]}; do
diff --git a/images/ubuntu/scripts/build/install-gfortran.sh b/images/ubuntu/scripts/build/install-gfortran.sh
index fe2e16c15..78d3d23a7 100644
--- a/images/ubuntu/scripts/build/install-gfortran.sh
+++ b/images/ubuntu/scripts/build/install-gfortran.sh
@@ -6,13 +6,6 @@
 
 # Source the helpers for use with the script
 source $HELPER_SCRIPTS/install.sh
-source $HELPER_SCRIPTS/os.sh
-
-# Install GNU Fortran compiler
-if ! is_ubuntu24 ; then
-    add-apt-repository ppa:ubuntu-toolchain-r/test -y
-    apt-get update -y
-fi
 
 versions=$(get_toolset_value '.gfortran.versions[]')
 
diff --git a/images/ubuntu/toolsets/toolset-2204.json b/images/ubuntu/toolsets/toolset-2204.json
index b36e575a2..60c7997a9 100644
--- a/images/ubuntu/toolsets/toolset-2204.json
+++ b/images/ubuntu/toolsets/toolset-2204.json
@@ -292,16 +292,14 @@
         "versions": [
             "g++-9",
             "g++-10",
-            "g++-12",
-            "g++-13"
+            "g++-12"
         ]
     },
     "gfortran": {
         "versions": [
             "gfortran-9",
             "gfortran-10",
-            "gfortran-12",
-            "gfortran-13"
+            "gfortran-12"
         ]
     },
     "php": {