diff --git a/defaults-next-root6.sh b/defaults-next-root6.sh
index e58010a5f1..cda8b2ac90 100644
--- a/defaults-next-root6.sh
+++ b/defaults-next-root6.sh
@@ -35,10 +35,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-35
+    tag: v5-09-36
   AliPhysics:
     version: "%(commit_hash)s_ROOT6"
-    tag: v5-09-35-01
+    tag: v5-09-36-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 dc6a20d6d4..b1474ace77 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-35
+    tag: v5-09-36
   AliPhysics:
     version: "%(tag_basename)s"
-    tag: v5-09-35-01
+    tag: v5-09-36-01
 ---
 # To be used with aliBuild option `--defaults prod-latest`.
 #
diff --git a/defaults-pwgmmtest.sh b/defaults-pwgmmtest.sh
index f92f88199b..3eaf9878e0 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-35
+    tag: v5-09-36
   AliPhysics:
     version: "%(commit_hash)s_PWGMMTEST"
-    tag: v5-09-35-01
+    tag: v5-09-36-01
   AGILe:
     version: "%(tag_basename)s_PWGMMTEST"
     source: https://github.com/alipwgmm/agile
diff --git a/defaults-root6.sh b/defaults-root6.sh
index 98c8d8787c..166c5cef83 100644
--- a/defaults-root6.sh
+++ b/defaults-root6.sh
@@ -35,10 +35,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-35
+    tag: v5-09-36
   AliPhysics:
     version: "%(commit_hash)s_ROOT6"
-    tag: v5-09-35-01
+    tag: v5-09-36-01
   GEANT4:
     tag: v10.3.3
     source: https://gitlab.cern.ch/geant4/geant4.git
diff --git a/defaults-user-root6.sh b/defaults-user-root6.sh
index 46e5229f7c..fdb5e29fa9 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-35
+    tag: v5-09-36
     requires:
       - ROOT
       - fastjet:(?!.*ppc64)
       - Vc
   AliPhysics:
     version: "%(tag_basename)s"
-    tag: v5-09-35-01
+    tag: v5-09-36-01
   GCC-Toolchain:
     tag: v7.3.0-alice1
     prefer_system_check: |
diff --git a/defaults-user.sh b/defaults-user.sh
index f0c6a370d2..4c28f52d26 100644
--- a/defaults-user.sh
+++ b/defaults-user.sh
@@ -7,14 +7,14 @@ env:
 overrides:
   AliRoot:
     version: "%(tag_basename)s"
-    tag: v5-09-35
+    tag: v5-09-36
     requires:
       - ROOT
       - fastjet:(?!.*ppc64)
       - Vc
   AliPhysics:
     version: "%(tag_basename)s"
-    tag: v5-09-35-01
+    tag: v5-09-36-01
 ---
 # To be used with aliBuild option `--defaults user`.
 #