diff --git a/packages/mom5/package.py b/packages/mom5/package.py
index fce38eb..898b936 100644
--- a/packages/mom5/package.py
+++ b/packages/mom5/package.py
@@ -30,7 +30,7 @@ class Mom5(MakefilePackage):
         multi=False,
         description="Build MOM5 to support a particular use case.")
 
-    with when("@:access-esm0,access-esm2:"):
+    with when("@master"):
         depends_on("netcdf-c@4.7.4:")
         depends_on("netcdf-fortran@4.5.2:")
         # Depend on virtual package "mpi".
diff --git a/packages/oasis3-mct/package.py b/packages/oasis3-mct/package.py
index 435c4be..9a3cdaa 100644
--- a/packages/oasis3-mct/package.py
+++ b/packages/oasis3-mct/package.py
@@ -23,7 +23,7 @@ class Oasis3Mct(MakefilePackage):
     variant("deterministic", default=False, description="Deterministic build.")
     variant("optimisation_report", default=False, description="Generate optimisation reports.")
 
-    with when("@:access-esm0,access-esm2:"):
+    with when("@master"):
         depends_on("netcdf-fortran@4.5.2:")
         # Depend on virtual package "mpi".
         depends_on("mpi")
@@ -251,7 +251,7 @@ def edit(self, spec, prefix):
 f           = $(F90)
 """
 
-        config["gcc"] = f"""
+        config["gcc"] = """
 # Compiling and other commands
 MAKE        = make
 F90         = mpif90 -Wall -fallow-argument-mismatch
@@ -295,7 +295,7 @@ def edit(self, spec, prefix):
         # Add support for the ifx compiler
         config["oneapi"] = config["intel"]
 
-        config["post"] = f"""
+        config["post"] = """
 f90FLAGS_1  = $(F90FLAGS_1)
 FFLAGS_1    = $(F90FLAGS_1)
 fFLAGS_1    = $(F90FLAGS_1)