diff --git a/releases/22.0.0.3/full/helpers/build/infinispan-client-setup.sh b/releases/22.0.0.3/full/helpers/build/infinispan-client-setup.sh
index 5c49ae81..3a411e51 100755
--- a/releases/22.0.0.3/full/helpers/build/infinispan-client-setup.sh
+++ b/releases/22.0.0.3/full/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/22.0.0.3/kernel-slim/helpers/build/infinispan-client-setup.sh b/releases/22.0.0.3/kernel-slim/helpers/build/infinispan-client-setup.sh
index 5c49ae81..3a411e51 100755
--- a/releases/22.0.0.3/kernel-slim/helpers/build/infinispan-client-setup.sh
+++ b/releases/22.0.0.3/kernel-slim/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/22.0.0.6/full/helpers/build/infinispan-client-setup.sh b/releases/22.0.0.6/full/helpers/build/infinispan-client-setup.sh
index 5c49ae81..3a411e51 100755
--- a/releases/22.0.0.6/full/helpers/build/infinispan-client-setup.sh
+++ b/releases/22.0.0.6/full/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/22.0.0.6/kernel-slim/helpers/build/infinispan-client-setup.sh b/releases/22.0.0.6/kernel-slim/helpers/build/infinispan-client-setup.sh
index 5c49ae81..3a411e51 100755
--- a/releases/22.0.0.6/kernel-slim/helpers/build/infinispan-client-setup.sh
+++ b/releases/22.0.0.6/kernel-slim/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/22.0.0.8/full/helpers/build/infinispan-client-setup.sh b/releases/22.0.0.8/full/helpers/build/infinispan-client-setup.sh
index 5c49ae81..3a411e51 100755
--- a/releases/22.0.0.8/full/helpers/build/infinispan-client-setup.sh
+++ b/releases/22.0.0.8/full/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/22.0.0.8/kernel-slim/helpers/build/infinispan-client-setup.sh b/releases/22.0.0.8/kernel-slim/helpers/build/infinispan-client-setup.sh
index 5c49ae81..3a411e51 100755
--- a/releases/22.0.0.8/kernel-slim/helpers/build/infinispan-client-setup.sh
+++ b/releases/22.0.0.8/kernel-slim/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/latest/beta/helpers/build/infinispan-client-setup.sh b/releases/latest/beta/helpers/build/infinispan-client-setup.sh
index 5c49ae81..3a411e51 100755
--- a/releases/latest/beta/helpers/build/infinispan-client-setup.sh
+++ b/releases/latest/beta/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/latest/full/helpers/build/infinispan-client-setup.sh b/releases/latest/full/helpers/build/infinispan-client-setup.sh
index 5c49ae81..3a411e51 100755
--- a/releases/latest/full/helpers/build/infinispan-client-setup.sh
+++ b/releases/latest/full/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan
diff --git a/releases/latest/kernel-slim/helpers/build/infinispan-client-setup.sh b/releases/latest/kernel-slim/helpers/build/infinispan-client-setup.sh
index 5c49ae81..3a411e51 100755
--- a/releases/latest/kernel-slim/helpers/build/infinispan-client-setup.sh
+++ b/releases/latest/kernel-slim/helpers/build/infinispan-client-setup.sh
@@ -5,6 +5,7 @@ fi
 
 set -Eeox pipefail
 
+yum module enable -y maven:3.6
 yum update -y
 yum install -y maven
 mkdir -p /opt/ol/wlp/usr/shared/resources/infinispan