diff --git a/Golden_Repo/c/Cartopy/Cartopy-0.20.0-gpsmpi-2021b.eb b/Golden_Repo/c/Cartopy/Cartopy-0.20.0-GCCcore-11.2.0.eb
similarity index 96%
rename from Golden_Repo/c/Cartopy/Cartopy-0.20.0-gpsmpi-2021b.eb
rename to Golden_Repo/c/Cartopy/Cartopy-0.20.0-GCCcore-11.2.0.eb
index d12f5162a08892f8cd7a90a8b8b96e9d593eadf2..532e489bdc4f0a6c110374adbdaa9f4486aceee1 100644
--- a/Golden_Repo/c/Cartopy/Cartopy-0.20.0-gpsmpi-2021b.eb
+++ b/Golden_Repo/c/Cartopy/Cartopy-0.20.0-GCCcore-11.2.0.eb
@@ -8,7 +8,7 @@ version = '0.20.0'
 homepage = 'https://scitools.org.uk/cartopy/docs/latest/'
 description = """Cartopy is a Python package designed to make drawing maps for data analysis and visualisation easy."""
 
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
 
 dependencies = [
     ('Python', '3.9.6'),
diff --git a/Golden_Repo/f/Fiona/Fiona-1.8.20-gpsmpi-2021b.eb b/Golden_Repo/f/Fiona/Fiona-1.8.20-GCCcore-11.2.0.eb
similarity index 96%
rename from Golden_Repo/f/Fiona/Fiona-1.8.20-gpsmpi-2021b.eb
rename to Golden_Repo/f/Fiona/Fiona-1.8.20-GCCcore-11.2.0.eb
index 51148ac92e39a1724ae8685ed9137f35fef0febf..3feb046fdf8b570df4ed4432f8477553e2da112d 100644
--- a/Golden_Repo/f/Fiona/Fiona-1.8.20-gpsmpi-2021b.eb
+++ b/Golden_Repo/f/Fiona/Fiona-1.8.20-GCCcore-11.2.0.eb
@@ -10,7 +10,7 @@ mappings, and iterators instead of classes specific to OGR. Fiona can read and w
 multi-layered GIS formats and zipped virtual file systems and integrates readily with other Python GIS
 packages such as pyproj, Rtree, and Shapely."""
 
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
 
 dependencies = [
     ('Python', '3.9.6'),
diff --git a/Golden_Repo/g/GDAL/GDAL-3.3.2-gpsmpi-2021b.eb b/Golden_Repo/g/GDAL/GDAL-3.3.2-GCCcore-11.2.0.eb
similarity index 94%
rename from Golden_Repo/g/GDAL/GDAL-3.3.2-gpsmpi-2021b.eb
rename to Golden_Repo/g/GDAL/GDAL-3.3.2-GCCcore-11.2.0.eb
index b8ec94b40d2ab1d013a38b66d50b51cadb6d93aa..f1cc8fa2bd7547538882743cec9d4c3d4d8a9cfd 100644
--- a/Golden_Repo/g/GDAL/GDAL-3.3.2-gpsmpi-2021b.eb
+++ b/Golden_Repo/g/GDAL/GDAL-3.3.2-GCCcore-11.2.0.eb
@@ -9,8 +9,7 @@ description = """GDAL is a translator library for raster geospatial data formats
  to the calling application for all supported formats. It also comes with a variety of useful commandline utilities for
  data translation and processing."""
 
-toolchain = {'name': 'gpsmpi', 'version': '2021b'}
-toolchainopts = {'usempi': True}
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
 
 source_urls = ['https://download.osgeo.org/gdal/%(version)s/']
 sources = [SOURCELOWER_TAR_XZ]
@@ -28,7 +27,7 @@ builddependencies = [
 dependencies = [
     ('binutils', '2.37'),
     ('Python', '3.9.6'),
-    ('netCDF', '4.8.1'),
+    ('netCDF', '4.8.1', '-serial'),
     ('expat', '2.4.1'),
     ('GEOS', '3.9.1'),
     ('SQLite', '3.36'),
@@ -43,7 +42,7 @@ dependencies = [
     ('PROJ', '8.1.0'),
     ('libgeotiff', '1.7.0'),
     ('SciPy-bundle', '2021.10', '', ('gcccoremkl', '11.2.0-2021.4.0')),
-    ('HDF5', '1.12.1'),
+    ('HDF5', '1.12.1', '-serial'),
     ('HDF', '4.2.15'),
 ]