diff --git a/defaults-alo.sh b/defaults-alo.sh
index c6ade080f2..d2523585c3 100644
--- a/defaults-alo.sh
+++ b/defaults-alo.sh
@@ -62,7 +62,7 @@ overrides:
       - "Xcode:(osx.*)"
       - ninja
   AliRoot:
-    tag: v5-09-38l
+    tag: v5-09-38m
     requires:
       - ROOT
       - Vc
diff --git a/defaults-jalien-root6.sh b/defaults-jalien-root6.sh
index e809400749..6923c92e37 100644
--- a/defaults-jalien-root6.sh
+++ b/defaults-jalien-root6.sh
@@ -12,7 +12,7 @@ overrides:
       which cmake && case `cmake --version | sed -e 's/.* //' | cut -d. -f1,2,3 | head -n1` in [0-2]*|3.[0-9].*|3.10.*) exit 1 ;; esac
   AliRoot:
     version: "%(tag_basename)s"
-    tag: v5-09-38l
+    tag: v5-09-38m
     requires:
       - JAliEn-ROOT
       - ROOT
@@ -20,7 +20,7 @@ overrides:
       - Vc
   AliPhysics:
     version: "%(tag_basename)s"
-    tag: v5-09-38l-01
+    tag: v5-09-38m-01
   GCC-Toolchain:
     tag: v7.3.0-alice1
     prefer_system_check: |
diff --git a/defaults-next-root6.sh b/defaults-next-root6.sh
index 578abe6b2d..0137d4fce9 100644
--- a/defaults-next-root6.sh
+++ b/defaults-next-root6.sh
@@ -34,10 +34,10 @@ overrides:
       printf "#include \"gsl/gsl_version.h\"\n#define GSL_V GSL_MAJOR_VERSION * 100 + GSL_MINOR_VERSION\n# if (GSL_V < 116)\n#error \"Cannot use system's gsl. Notice we only support versions from 1.16 (included)\"\n#endif\nint main(){}" | gcc  -I$(brew --prefix gsl)/include -xc++ - -o /dev/null
   AliRoot:
     version: "%(tag_basename)s_ROOT6"
-    tag: v5-09-38l
+    tag: v5-09-38m
   AliPhysics:
     version: "%(tag_basename)s_ROOT6"
-    tag: v5-09-38l-01
+    tag: v5-09-38m-01
   GEANT4:
     tag: v10.3.3
     source: https://gitlab.cern.ch/geant4/geant4.git
diff --git a/defaults-o2.sh b/defaults-o2.sh
index af2eb03349..21b3ce3e36 100644
--- a/defaults-o2.sh
+++ b/defaults-o2.sh
@@ -44,6 +44,7 @@ overrides:
       - "osx-system-openssl:(osx.*)"
   AliRoot:
     version: "%(commit_hash)s_O2"
+    tag: "v5-09-38m"
     requires:
       - ROOT
       - fastjet:(?!.*ppc64)
@@ -68,6 +69,7 @@ overrides:
       - boost
   AliPhysics:
     version: "%(commit_hash)s_O2"
+    tag: "v5-09-38m-01"
   GEANT4:
     tag: v10.3.3
     source: https://gitlab.cern.ch/geant4/geant4.git
diff --git a/defaults-prod-latest.sh b/defaults-prod-latest.sh
index abf25c2ce9..62bf0a0b9a 100644
--- a/defaults-prod-latest.sh
+++ b/defaults-prod-latest.sh
@@ -7,10 +7,10 @@ env:
 overrides:
   AliRoot:
     version: "%(tag_basename)s"
-    tag: v5-09-38l
+    tag: v5-09-38m
   AliPhysics:
     version: "%(tag_basename)s"
-    tag: v5-09-38l-01
+    tag: v5-09-38m-01
   # Use VMC packages compatible with ROOT 5
   GEANT3:
     version: "v2-7-p2"
diff --git a/defaults-pwgmmtest.sh b/defaults-pwgmmtest.sh
index 9de08feb40..83a13b17bf 100644
--- a/defaults-pwgmmtest.sh
+++ b/defaults-pwgmmtest.sh
@@ -30,10 +30,10 @@ overrides:
       printf "#include \"gsl/gsl_version.h\"\n#define GSL_V GSL_MAJOR_VERSION * 100 + GSL_MINOR_VERSION\n# if (GSL_V < 116)\n#error \"Cannot use system's gsl. Notice we only support versions from 1.16 (included)\"\n#endif\nint main(){}" | gcc  -I$(brew --prefix gsl)/include -xc++ - -o /dev/null
   AliRoot:
     version: "%(commit_hash)s_PWGMMTEST"
-    tag: v5-09-38l
+    tag: v5-09-38m
   AliPhysics:
     version: "%(commit_hash)s_PWGMMTEST"
-    tag: v5-09-38l-01
+    tag: v5-09-38m-01
   AGILe:
     version: "%(tag_basename)s_PWGMMTEST"
     source: https://github.com/alipwgmm/agile
diff --git a/defaults-release.sh b/defaults-release.sh
index ccebcf87b3..6c1eaad00e 100644
--- a/defaults-release.sh
+++ b/defaults-release.sh
@@ -8,10 +8,10 @@ overrides:
   # Pinpoint AliRoot/AliPhysics
   AliRoot:
     version: "%(tag_basename)s"
-    tag: v5-09-38l
+    tag: v5-09-38m
   AliPhysics:
     version: "%(tag_basename)s"
-    tag: v5-09-38l-01
+    tag: v5-09-38m-01
   # Use VMC packages compatible with ROOT 5
   GEANT3:
     version: "v2-7-p2"
diff --git a/defaults-root6.sh b/defaults-root6.sh
index b1f4df104e..6f78b4f190 100644
--- a/defaults-root6.sh
+++ b/defaults-root6.sh
@@ -34,10 +34,10 @@ overrides:
       printf "#include \"gsl/gsl_version.h\"\n#define GSL_V GSL_MAJOR_VERSION * 100 + GSL_MINOR_VERSION\n# if (GSL_V < 116)\n#error \"Cannot use system's gsl. Notice we only support versions from 1.16 (included)\"\n#endif\nint main(){}" | gcc  -I$(brew --prefix gsl)/include -xc++ - -o /dev/null
   AliRoot:
     version: "%(commit_hash)s_ROOT6"
-    tag: v5-09-38l
+    tag: v5-09-38m
   AliPhysics:
     version: "%(commit_hash)s_ROOT6"
-    tag: v5-09-38l-01
+    tag: v5-09-38m-01
   GEANT4:
     tag: v10.3.3
     source: https://gitlab.cern.ch/geant4/geant4.git
diff --git a/defaults-user-next-root6.sh b/defaults-user-next-root6.sh
index 20c6ab8abc..3da9a0d98e 100644
--- a/defaults-user-next-root6.sh
+++ b/defaults-user-next-root6.sh
@@ -12,14 +12,14 @@ overrides:
       which cmake && case `cmake --version | sed -e 's/.* //' | cut -d. -f1,2,3 | head -n1` in [0-2]*|3.[0-9].*|3.10.*) exit 1 ;; esac
   AliRoot:
     version: "%(tag_basename)s"
-    tag: v5-09-38l
+    tag: v5-09-38m
     requires:
       - ROOT
       - fastjet:(?!.*ppc64)
       - Vc
   AliPhysics:
     version: "%(tag_basename)s"
-    tag: v5-09-38l-01
+    tag: v5-09-38m-01
   GCC-Toolchain:
     tag: v7.3.0-alice1
     prefer_system_check: |
diff --git a/defaults-user-root6.sh b/defaults-user-root6.sh
index b885356be2..c7dcd950e3 100644
--- a/defaults-user-root6.sh
+++ b/defaults-user-root6.sh
@@ -12,14 +12,14 @@ overrides:
       which cmake && case `cmake --version | sed -e 's/.* //' | cut -d. -f1,2,3 | head -n1` in [0-2]*|3.[0-9].*|3.10.*) exit 1 ;; esac
   AliRoot:
     version: "%(tag_basename)s"
-    tag: v5-09-38l
+    tag: v5-09-38m
     requires:
       - ROOT
       - fastjet:(?!.*ppc64)
       - Vc
   AliPhysics:
     version: "%(tag_basename)s"
-    tag: v5-09-38l-01
+    tag: v5-09-38m-01
   GCC-Toolchain:
     tag: v7.3.0-alice1
     prefer_system_check: |
diff --git a/defaults-user.sh b/defaults-user.sh
index 1913f4ea32..edc60b688a 100644
--- a/defaults-user.sh
+++ b/defaults-user.sh
@@ -7,14 +7,14 @@ env:
 overrides:
   AliRoot:
     version: "%(tag_basename)s"
-    tag: v5-09-38l
+    tag: v5-09-38m
     requires:
       - ROOT
       - fastjet:(?!.*ppc64)
       - Vc
   AliPhysics:
     version: "%(tag_basename)s"
-    tag: v5-09-38l-01
+    tag: v5-09-38m-01
 ---
 # To be used with aliBuild option `--defaults user`.
 #