diff --git a/defaults-jalien.sh b/defaults-jalien.sh
index fe54ea3c4d..246784a1db 100644
--- a/defaults-jalien.sh
+++ b/defaults-jalien.sh
@@ -10,10 +10,10 @@ env:
 overrides:
   AliRoot:
     version: "%(tag_basename)s_JALIEN"
-    tag: v5-09-54r
+    tag: v5-09-54s
   AliPhysics:
     version: "%(tag_basename)s_JALIEN"
-    tag: v5-09-54r-01
+    tag: v5-09-54s-01
   autotools:
     tag: v1.5.0
 ---
diff --git a/defaults-next-root6.sh b/defaults-next-root6.sh
index 55ae685c11..891898399f 100644
--- a/defaults-next-root6.sh
+++ b/defaults-next-root6.sh
@@ -9,8 +9,8 @@ env:
 overrides:
   AliRoot:
     version: "%(tag_basename)s_ROOT6"
-    tag: v5-09-54r
+    tag: v5-09-54s
   AliPhysics:
     version: "%(tag_basename)s_ROOT6"
-    tag: v5-09-54r-01
+    tag: v5-09-54s-01
 ---
diff --git a/defaults-o2.sh b/defaults-o2.sh
index 36bbf31ddb..4b6580b437 100644
--- a/defaults-o2.sh
+++ b/defaults-o2.sh
@@ -10,7 +10,7 @@ env:
 overrides:
   AliRoot:
     version: "%(commit_hash)s_O2"
-    tag: v5-09-54r
+    tag: v5-09-54s
     requires:
       - ROOT
       - DPMJET
@@ -27,7 +27,7 @@ overrides:
       - boost
   AliPhysics:
     version: "%(commit_hash)s_O2"
-    tag: v5-09-54r-01
+    tag: v5-09-54s-01
   cgal:
     version: "4.12.2"
   fastjet:
diff --git a/defaults-prod-latest.sh b/defaults-prod-latest.sh
index a596ff3804..739f01ec2a 100644
--- a/defaults-prod-latest.sh
+++ b/defaults-prod-latest.sh
@@ -12,7 +12,7 @@ overrides:
   # Pinpoint AliRoot/AliPhysics
   AliRoot:
     version: "%(tag_basename)s"
-    tag: v5-09-54r
+    tag: v5-09-54s
     requires:
       - ROOT
       - DPMJET
@@ -23,7 +23,7 @@ overrides:
       - AliEn-ROOT-Legacy
   AliPhysics:
     version: "%(tag_basename)s"
-    tag: v5-09-54r-01
+    tag: v5-09-54s-01
   XRootD:
     tag: v3.3.6-alice2
     source: https://github.com/alisw/xrootd.git
diff --git a/defaults-release.sh b/defaults-release.sh
index 185cc13dd8..c79350d9f8 100644
--- a/defaults-release.sh
+++ b/defaults-release.sh
@@ -12,7 +12,7 @@ overrides:
   # Pinpoint AliRoot/AliPhysics
   AliRoot:
     version: "%(tag_basename)s"
-    tag: v5-09-54r
+    tag: v5-09-54s
     requires:
       - ROOT
       - DPMJET
@@ -23,7 +23,7 @@ overrides:
       - AliEn-ROOT-Legacy
   AliPhysics:
     version: "%(tag_basename)s"
-    tag: v5-09-54r-01
+    tag: v5-09-54s-01
   XRootD:
     tag: v3.3.6-alice2
     source: https://github.com/alisw/xrootd.git
diff --git a/defaults-user-next-root6.sh b/defaults-user-next-root6.sh
index 7be8234f15..d32db413b4 100644
--- a/defaults-user-next-root6.sh
+++ b/defaults-user-next-root6.sh
@@ -13,8 +13,8 @@ disable:
 overrides:
   AliRoot:
     version: "%(tag_basename)s"
-    tag: v5-09-54r
+    tag: v5-09-54s
   AliPhysics:
     version: "%(tag_basename)s"
-    tag: v5-09-54r-01
+    tag: v5-09-54s-01
 ---
diff --git a/defaults-user.sh b/defaults-user.sh
index acb5043c6e..fbc7078b03 100644
--- a/defaults-user.sh
+++ b/defaults-user.sh
@@ -14,7 +14,7 @@ disable:
 overrides:
   AliRoot:
     version: "%(tag_basename)s"
-    tag: v5-09-54r
+    tag: v5-09-54s
     requires:
       - ROOT
       - DPMJET
@@ -25,7 +25,7 @@ overrides:
       - AliEn-ROOT-Legacy
   AliPhysics:
     version: "%(tag_basename)s"
-    tag: v5-09-54r-01
+    tag: v5-09-54s-01
   XRootD:
     tag: v3.3.6-alice2
     source: https://github.com/alisw/xrootd.git