diff --git a/provisioners/pom.xml b/provisioners/pom.xml
index 8fd44aa30..6a477343b 100644
--- a/provisioners/pom.xml
+++ b/provisioners/pom.xml
@@ -270,6 +270,19 @@
                             <targetPackage>org.jboss.intersmash.model.helm.charts.values.eap8</targetPackage>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>charts.values.generate-schema-model.xp5</id>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <!-- JBoss EAP XP 5 Helm Chart model is generated from JSON schema at https://github.com/jbossas/eap-charts/eap-xp5-dev/charts/eap-xp5/values.schema.json -->
+                            <sourceDirectory>${basedir}/src/main/resources/org/jboss/intersmash/provision/helm/values/schema/xp5</sourceDirectory>
+                            <outputDirectory>${project.build.directory}/generated-sources/</outputDirectory>
+                            <targetPackage>org.jboss.intersmash.model.helm.charts.values.xp5</targetPackage>
+                        </configuration>
+                    </execution>
+
                 </executions>
             </plugin>
             <!--
diff --git a/provisioners/src/main/java/org/jboss/intersmash/provision/helm/wildfly/WildFlyHelmChartReleaseAdapter.java b/provisioners/src/main/java/org/jboss/intersmash/provision/helm/wildfly/WildFlyHelmChartReleaseAdapter.java
index 55a487778..8b20b722f 100644
--- a/provisioners/src/main/java/org/jboss/intersmash/provision/helm/wildfly/WildFlyHelmChartReleaseAdapter.java
+++ b/provisioners/src/main/java/org/jboss/intersmash/provision/helm/wildfly/WildFlyHelmChartReleaseAdapter.java
@@ -502,9 +502,40 @@ public WildflyHelmChartRelease withS2iChannel(String s2iChannel) {
 
 	@Override
 	public BuildMode getBuildMode() {
-		return adaptee.getBuild() == null ? null
-				: adaptee.getBuild().getS2i() != null ? BuildMode.S2I
-						: adaptee.getBuild().getBootableJar() != null ? BuildMode.BOOTABLE_JAR : null;
+		if (adaptee.getBuild() == null || adaptee.getBuild().getMode() == null) {
+			return null;
+		}
+		switch (adaptee.getBuild().getMode()) {
+			case S_2_I:
+				return BuildMode.S2I;
+			case BOOTABLE_JAR:
+				return BuildMode.BOOTABLE_JAR;
+			default:
+				return null;
+		}
+	}
+
+	@Override
+	public void setBuildMode(BuildMode buildMode) {
+		if (adaptee.getBuild() == null) {
+			adaptee.setBuild(new Build());
+		}
+		switch (buildMode) {
+			case S2I:
+				adaptee.getBuild().setMode(Build.Mode.S_2_I);
+				break;
+			case BOOTABLE_JAR:
+				adaptee.getBuild().setMode(Build.Mode.BOOTABLE_JAR);
+				break;
+			default:
+				log.warn("Unrecognized build mode option, not doing anything.");
+		}
+	}
+
+	@Override
+	public WildflyHelmChartRelease withBuildMode(BuildMode buildMode) {
+		this.setBuildMode(buildMode);
+		return this;
 	}
 
 	@Override
diff --git a/provisioners/src/main/java/org/jboss/intersmash/provision/helm/wildfly/WildflyHelmChartRelease.java b/provisioners/src/main/java/org/jboss/intersmash/provision/helm/wildfly/WildflyHelmChartRelease.java
index b81fb63e7..c01b1a384 100644
--- a/provisioners/src/main/java/org/jboss/intersmash/provision/helm/wildfly/WildflyHelmChartRelease.java
+++ b/provisioners/src/main/java/org/jboss/intersmash/provision/helm/wildfly/WildflyHelmChartRelease.java
@@ -105,6 +105,10 @@ public interface WildflyHelmChartRelease extends HelmChartRelease {
 
 	BuildMode getBuildMode();
 
+	void setBuildMode(BuildMode buildMode);
+
+	WildflyHelmChartRelease withBuildMode(BuildMode buildMode);
+
 	String getBootableJarBuilderImage();
 
 	void setBootableJarBuilderImage(String bootableJarBuilderImage);
diff --git a/provisioners/src/main/java/org/jboss/intersmash/provision/helm/wildfly/eap8/Eap8HelmChartReleaseAdapter.java b/provisioners/src/main/java/org/jboss/intersmash/provision/helm/wildfly/eap8/Eap8HelmChartReleaseAdapter.java
index 1e3952fed..289618b85 100644
--- a/provisioners/src/main/java/org/jboss/intersmash/provision/helm/wildfly/eap8/Eap8HelmChartReleaseAdapter.java
+++ b/provisioners/src/main/java/org/jboss/intersmash/provision/helm/wildfly/eap8/Eap8HelmChartReleaseAdapter.java
@@ -38,7 +38,7 @@
  * This adapter is compliant with the contract which is required by the
  * {@link org.jboss.intersmash.provision.helm.HelmChartOpenShiftProvisioner} logic, i.e. to
  * implement {@link HelmChartRelease}, and allows for us to leverage a generated
- * {@link Eap8HelmChartReleaseAdapter#adaptee}, i.e. in terms of UX, provide native release YAML definitions.
+ * {@link org.jboss.intersmash.provision.helm.wildfly.eap8.Eap8HelmChartReleaseAdapter#adaptee}, i.e. in terms of UX, provide native release YAML definitions.
  */
 @Slf4j
 public class Eap8HelmChartReleaseAdapter extends HelmChartReleaseAdapter<HelmEap8Release>
@@ -526,6 +526,27 @@ public BuildMode getBuildMode() {
 		return BuildMode.S2I;
 	}
 
+	@Override
+	public void setBuildMode(BuildMode buildMode) {
+		if (adaptee.getBuild() == null) {
+			adaptee.setBuild(new Build());
+		}
+		switch (buildMode) {
+			case S2I:
+				adaptee.getBuild().setMode(Build.Mode.S_2_I);
+			case BOOTABLE_JAR:
+				log.warn("EAP 8 does not support bootable JAR build mode!");
+			default:
+				adaptee.getBuild().setMode(null);
+		}
+	}
+
+	@Override
+	public WildflyHelmChartRelease withBuildMode(BuildMode buildMode) {
+		this.setBuildMode(buildMode);
+		return this;
+	}
+
 	@Override
 	public String getBootableJarBuilderImage() {
 		// no Bootable JAR image is supported by EAP 8 Helm Charts
diff --git a/provisioners/src/main/java/org/jboss/intersmash/provision/helm/wildfly/xp5/EapXp5HelmChartReleaseAdapter.java b/provisioners/src/main/java/org/jboss/intersmash/provision/helm/wildfly/xp5/EapXp5HelmChartReleaseAdapter.java
new file mode 100644
index 000000000..c6064bc50
--- /dev/null
+++ b/provisioners/src/main/java/org/jboss/intersmash/provision/helm/wildfly/xp5/EapXp5HelmChartReleaseAdapter.java
@@ -0,0 +1,763 @@
+package org.jboss.intersmash.provision.helm.wildfly.xp5;
+
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.jboss.intersmash.application.openshift.helm.HelmChartRelease;
+import org.jboss.intersmash.model.helm.charts.values.xp5.BootableJar;
+import org.jboss.intersmash.model.helm.charts.values.xp5.Build;
+import org.jboss.intersmash.model.helm.charts.values.xp5.Deploy;
+import org.jboss.intersmash.model.helm.charts.values.xp5.Env;
+import org.jboss.intersmash.model.helm.charts.values.xp5.Env__1;
+import org.jboss.intersmash.model.helm.charts.values.xp5.HelmXp5Release;
+import org.jboss.intersmash.model.helm.charts.values.xp5.Jdk17;
+import org.jboss.intersmash.model.helm.charts.values.xp5.Route;
+import org.jboss.intersmash.model.helm.charts.values.xp5.S2i;
+import org.jboss.intersmash.model.helm.charts.values.xp5.Tls;
+import org.jboss.intersmash.model.helm.charts.values.xp5.Tls__1;
+import org.jboss.intersmash.provision.helm.HelmChartReleaseAdapter;
+import org.jboss.intersmash.provision.helm.Image;
+import org.jboss.intersmash.provision.helm.wildfly.WildflyHelmChartRelease;
+
+import com.google.common.base.Strings;
+
+import io.fabric8.kubernetes.api.model.Volume;
+import io.fabric8.kubernetes.api.model.VolumeMount;
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * An adapter that implements a valid EAP 8 {@link HelmChartRelease} by exposing an internal instance of
+ * {@link HelmXp5Release} to store an EAP 8 Helm Charts release data and to represent a values file which can be serialized
+ * as an output for {@link HelmChartRelease#toValuesFile()}
+ *
+ * This adapter is compliant with the contract which is required by the
+ * {@link org.jboss.intersmash.provision.helm.HelmChartOpenShiftProvisioner} logic, i.e. to
+ * implement {@link HelmChartRelease}, and allows for us to leverage a generated
+ * {@link EapXp5HelmChartReleaseAdapter#adaptee}, i.e. in terms of UX, provide native release YAML definitions.
+ */
+@Slf4j
+public class EapXp5HelmChartReleaseAdapter extends HelmChartReleaseAdapter<HelmXp5Release>
+		implements HelmChartRelease, WildflyHelmChartRelease {
+
+	public EapXp5HelmChartReleaseAdapter(@NonNull HelmXp5Release release) {
+		super(release, new ArrayList<>());
+		initDefaultReplicas(release);
+	}
+
+	public EapXp5HelmChartReleaseAdapter(@NonNull HelmXp5Release release, List<Path> additionalValuesFiles) {
+		super(release, additionalValuesFiles);
+		initDefaultReplicas(release);
+	}
+
+	@Override
+	public Map<String, String> getDeploymentEnvironmentVariables() {
+		return adaptee.getDeploy() == null ? Map.of()
+				: adaptee.getDeploy().getEnv() == null || adaptee.getDeploy().getEnv().isEmpty() ? Map.of()
+						: adaptee.getDeploy().getEnv().stream()
+								.collect(Collectors.toMap(e -> e.getName(), e -> e.getValue()));
+	}
+
+	@Override
+	public void setDeploymentEnvironmentVariables(Map<String, String> deploymentEnvironmentVariables) {
+		if (adaptee.getDeploy() == null) {
+			adaptee.setDeploy(new Deploy());
+		}
+		if ((adaptee.getDeploy().getEnv() == null) || adaptee.getDeploy().getEnv().isEmpty()) {
+			adaptee.getDeploy().setEnv(new ArrayList<>());
+		} else {
+			adaptee.getDeploy().getEnv().clear();
+		}
+		// let's check just here, so there's a way to clear, i.e. by passing an empty or null list
+		if ((deploymentEnvironmentVariables != null) && !deploymentEnvironmentVariables.isEmpty()) {
+			deploymentEnvironmentVariables.entrySet().stream()
+					.forEach(e -> adaptee.getDeploy().getEnv().add(new Env__1().withName(e.getKey()).withValue(e.getValue())));
+		}
+	}
+
+	public WildflyHelmChartRelease withDeploymentEnvironmentVariables(
+			Map<String, String> deploymentEnvironmentVariables) {
+		this.setDeploymentEnvironmentVariables(deploymentEnvironmentVariables);
+		return this;
+	}
+
+	@Override
+	public WildflyHelmChartRelease withDeploymentEnvironmentVariable(String key, String value) {
+		if (adaptee.getDeploy() == null) {
+			adaptee.setDeploy(new Deploy());
+		}
+		if ((adaptee.getDeploy().getEnv() == null) || adaptee.getDeploy().getEnv().isEmpty()) {
+			adaptee.getDeploy().setEnv(new ArrayList<>());
+		}
+		adaptee.getDeploy().getEnv().add(new Env__1().withName(key).withValue(value));
+		return this;
+	}
+
+	@Override
+	public Map<String, String> getBuildEnvironmentVariables() {
+		return adaptee.getBuild() == null ? Map.of()
+				: adaptee.getBuild().getEnv() == null || adaptee.getBuild().getEnv().isEmpty() ? Map.of()
+						: adaptee.getBuild().getEnv().stream()
+								.collect(Collectors.toMap(e -> e.getName(), e -> e.getValue()));
+	}
+
+	@Override
+	public void setBuildEnvironmentVariables(Map<String, String> buildEnvironmentVariables) {
+		if (adaptee.getBuild() == null) {
+			adaptee.setBuild(new Build());
+		}
+		if ((adaptee.getBuild().getEnv() == null) || adaptee.getBuild().getEnv().isEmpty()) {
+			adaptee.getBuild().setEnv(new ArrayList<>());
+		} else {
+			adaptee.getBuild().getEnv().clear();
+		}
+		// let's check just here, so there's a way to clear, i.e. by passing an empty or null list
+		if ((buildEnvironmentVariables != null) && !buildEnvironmentVariables.isEmpty()) {
+			buildEnvironmentVariables.entrySet().stream()
+					.forEach(e -> adaptee.getBuild().getEnv().add(new Env().withName(e.getKey()).withValue(e.getValue())));
+		}
+	}
+
+	public WildflyHelmChartRelease withBuildEnvironmentVariables(Map<String, String> buildEnvironmentVariables) {
+		this.setBuildEnvironmentVariables(buildEnvironmentVariables);
+		return this;
+	}
+
+	@Override
+	public WildflyHelmChartRelease withBuildEnvironmentVariable(String key, String value) {
+		if (adaptee.getBuild() == null) {
+			adaptee.setBuild(new Build());
+		}
+		if ((adaptee.getBuild().getEnv() == null) || adaptee.getBuild().getEnv().isEmpty()) {
+			adaptee.getBuild().setEnv(new ArrayList<>());
+		}
+		adaptee.getBuild().getEnv().add(new Env().withName(key).withValue(value));
+		return this;
+	}
+
+	@Override
+	public List<Image> getInjectedImages() {
+		return adaptee.getBuild() == null ? List.of()
+				: adaptee.getBuild().getImages() == null ? List.of()
+						: (List<Image>) adaptee.getBuild().getImages();
+	}
+
+	@Override
+	public void setInjectedImages(List<Image> injectedImages) {
+		if (adaptee.getBuild() == null) {
+			adaptee.setBuild(new Build());
+		}
+		if ((adaptee.getBuild().getImages() == null)) {
+			adaptee.getBuild().setImages(new ArrayList<>());
+		} else {
+			((List) adaptee.getBuild().getImages()).clear();
+		}
+		// let's check just here, so there's a way to clear, i.e. by passing an empty or null list
+		if ((injectedImages != null) && !injectedImages.isEmpty()) {
+			((List) adaptee.getBuild().getImages()).addAll(injectedImages);
+		}
+	}
+
+	@Override
+	public WildflyHelmChartRelease withInjectedImages(List<Image> injectedImages) {
+		this.setInjectedImages(injectedImages);
+		return this;
+	}
+
+	@Override
+	public WildflyHelmChartRelease withInjectedImage(Image injectedImage) {
+		if (adaptee.getBuild() == null) {
+			adaptee.setBuild(new Build());
+		}
+		if (adaptee.getBuild().getImages() == null) {
+			adaptee.getBuild().setImages(new ArrayList<>());
+		}
+		((List) adaptee.getBuild().getImages()).add(injectedImage);
+		return this;
+	}
+
+	@Override
+	public List<Volume> getVolumes() {
+		return adaptee.getDeploy() == null ? List.of()
+				: adaptee.getDeploy().getVolumes() == null ? List.of()
+						: adaptee.getDeploy().getVolumes().stream()
+								.map(v -> (Volume) v)
+								.collect(Collectors.toList());
+	}
+
+	@Override
+	public void setVolumes(List<Volume> volumes) {
+		if (adaptee.getDeploy() == null) {
+			adaptee.setDeploy(new Deploy());
+		}
+		if ((adaptee.getDeploy().getVolumes() == null) || adaptee.getDeploy().getVolumes().isEmpty()) {
+			adaptee.getDeploy().setVolumes(new ArrayList<>());
+		} else {
+			adaptee.getDeploy().getVolumes().clear();
+		}
+		// let's check just here, so there's a way to clear, i.e. by passing an empty or null list
+		if ((volumes != null) && !volumes.isEmpty()) {
+			volumes.stream().forEach(v -> adaptee.getDeploy().getVolumes().add(v));
+		}
+	}
+
+	public WildflyHelmChartRelease withVolumes(List<Volume> volumes) {
+		this.setVolumes(volumes);
+		return this;
+	}
+
+	@Override
+	public WildflyHelmChartRelease withVolume(Volume volume) {
+		if (adaptee.getDeploy() == null) {
+			adaptee.setDeploy(new Deploy());
+		}
+		if ((adaptee.getDeploy().getVolumes() == null) || adaptee.getDeploy().getVolumes().isEmpty()) {
+			adaptee.getDeploy().setVolumes(new ArrayList<>());
+		}
+		adaptee.getDeploy().getVolumes().add(volume);
+		return this;
+	}
+
+	@Override
+	public List<VolumeMount> getVolumeMounts() {
+		return adaptee.getDeploy() == null ? List.of()
+				: adaptee.getDeploy().getVolumeMounts() == null ? List.of()
+						: adaptee.getDeploy().getVolumeMounts().stream()
+								.map(v -> new VolumeMount(
+										v.getMountPath(),
+										v.getMountPropagation(),
+										v.getName(),
+										v.getReadOnly(),
+										v.getSubPath(), null))
+								.collect(Collectors.toList());
+	}
+
+	@Override
+	public void setVolumeMounts(List<VolumeMount> volumeMounts) {
+		if (adaptee.getDeploy() == null) {
+			adaptee.setDeploy(new Deploy());
+		}
+		if ((adaptee.getDeploy().getVolumeMounts() == null) || adaptee.getDeploy().getVolumeMounts().isEmpty()) {
+			adaptee.getDeploy().setVolumeMounts(new ArrayList<>());
+		} else {
+			adaptee.getDeploy().getVolumeMounts().clear();
+		}
+		// let's check just here, so there's a way to clear, i.e. by passing an empty or null list
+		if ((volumeMounts != null) && !volumeMounts.isEmpty()) {
+			volumeMounts.stream()
+					.forEach(v -> adaptee.getDeploy().getVolumeMounts().add(
+							new org.jboss.intersmash.model.helm.charts.values.xp5.VolumeMount()
+									.withName(v.getName())
+									.withMountPath(v.getMountPath())
+									.withMountPropagation(v.getMountPropagation())
+									.withReadOnly(v.getReadOnly())
+									.withSubPath(v.getSubPath())));
+		}
+	}
+
+	@Override
+	public WildflyHelmChartRelease withVolumeMounts(List<VolumeMount> volumeMounts) {
+		this.setVolumeMounts(volumeMounts);
+		return this;
+	}
+
+	@Override
+	public WildflyHelmChartRelease withVolumeMount(VolumeMount volumeMount) {
+		if (adaptee.getDeploy() == null) {
+			adaptee.setDeploy(new Deploy());
+		}
+		if ((adaptee.getDeploy().getVolumeMounts() == null) || adaptee.getDeploy().getVolumeMounts().isEmpty()) {
+			adaptee.getDeploy().setVolumeMounts(new ArrayList<>());
+		}
+		adaptee.getDeploy().getVolumeMounts().add(
+				new org.jboss.intersmash.model.helm.charts.values.xp5.VolumeMount()
+						.withName(volumeMount.getName())
+						.withMountPath(volumeMount.getMountPath())
+						.withMountPropagation(volumeMount.getMountPropagation())
+						.withReadOnly(volumeMount.getReadOnly())
+						.withSubPath(volumeMount.getSubPath()));
+		return this;
+	}
+
+	@Override
+	public String getRouteHost() {
+		return adaptee.getDeploy() == null ? ""
+				: adaptee.getDeploy().getRoute() == null ? "" : adaptee.getDeploy().getRoute().getHost();
+	}
+
+	@Override
+	public void setRouteHost(String routeHost) {
+		if (adaptee.getDeploy() == null) {
+			adaptee.setDeploy(new Deploy());
+		}
+		if (adaptee.getDeploy().getRoute() == null) {
+			adaptee.getDeploy().setRoute(new Route());
+		}
+		adaptee.getDeploy().getRoute().setHost(routeHost);
+	}
+
+	public WildflyHelmChartRelease withRouteHost(String routeHost) {
+		this.setRouteHost(routeHost);
+		return this;
+	}
+
+	@Override
+	public boolean isRouteTLSEnabled() {
+		return adaptee.getDeploy() == null ? Boolean.FALSE
+				: adaptee.getDeploy().getRoute() == null ? Boolean.FALSE
+						: adaptee.getDeploy().getRoute().getTls() == null ? Boolean.FALSE
+								: adaptee.getDeploy().getRoute().getTls().getEnabled();
+	}
+
+	@Override
+	public void setRouteTLSEnabled(boolean routeTLSEnabled) {
+		if (adaptee.getDeploy() == null) {
+			adaptee.setDeploy(new Deploy());
+		}
+		if (adaptee.getDeploy().getRoute() == null) {
+			adaptee.getDeploy().setRoute(new Route());
+		}
+		if (adaptee.getDeploy().getRoute().getTls() == null) {
+			adaptee.getDeploy().getRoute().setTls(new Tls());
+		}
+		adaptee.getDeploy().getRoute().getTls().setEnabled(routeTLSEnabled);
+	}
+
+	@Override
+	public WildflyHelmChartRelease withRouteTLSEnabled(boolean routeTLSEnabled) {
+		this.setRouteTLSEnabled(routeTLSEnabled);
+		return this;
+	}
+
+	@Override
+	public boolean isTlsEnabled() {
+		return adaptee.getDeploy() == null ? Boolean.FALSE
+				: adaptee.getDeploy().getRoute() == null ? Boolean.FALSE
+						: adaptee.getDeploy().getTls() == null ? Boolean.FALSE : adaptee.getDeploy().getTls().getEnabled();
+	}
+
+	@Override
+	public void setTlsEnabled(boolean tlsEnabled) {
+		if (adaptee.getDeploy() == null) {
+			adaptee.setDeploy(new Deploy());
+		}
+		if (adaptee.getDeploy().getTls() == null) {
+			adaptee.getDeploy().setTls(new Tls__1());
+		}
+		adaptee.getDeploy().getTls().setEnabled(tlsEnabled);
+	}
+
+	@Override
+	public WildflyHelmChartRelease withTlsEnabled(boolean tlsEnabled) {
+		this.setTlsEnabled(tlsEnabled);
+		return this;
+	}
+
+	@Override
+	public LinkedHashSet<String> getS2iFeaturePacks() {
+		LinkedHashSet<String> result = new LinkedHashSet<>();
+		if (adaptee.getBuild() != null && adaptee.getBuild().getS2i() != null
+				&& !Strings.isNullOrEmpty(adaptee.getBuild().getS2i().getFeaturePacks())) {
+			Arrays.stream(adaptee.getBuild().getS2i().getFeaturePacks().split(","))
+					.forEach(fp -> result.add(fp));
+		}
+		return result;
+	}
+
+	@Override
+	public void setS2iFeaturePacks(LinkedHashSet<String> s2iFeaturePacks) {
+		if (adaptee.getBuild() == null) {
+			adaptee.setBuild(new Build());
+		}
+		if (adaptee.getBuild().getS2i() == null) {
+			adaptee.getBuild().setS2i(new S2i());
+		}
+		// let's check just here, so there's a way to clear, i.e. by passing an empty or null list
+		if ((s2iFeaturePacks != null) && !s2iFeaturePacks.isEmpty()) {
+			adaptee.getBuild().getS2i().setFeaturePacks(s2iFeaturePacks.stream().collect(Collectors.joining(",")));
+		}
+	}
+
+	@Override
+	public WildflyHelmChartRelease withS2iFeaturePacks(LinkedHashSet<String> s2iFeaturePacks) {
+		this.setS2iFeaturePacks(s2iFeaturePacks);
+		return this;
+	}
+
+	@Override
+	public WildflyHelmChartRelease withS2iFeaturePacks(String s2iFeaturePacks) {
+		LinkedHashSet s2iFeaturePacksSet = new LinkedHashSet<>(
+				Arrays.stream(s2iFeaturePacks.split(",")).collect(Collectors.toList()));
+		this.setS2iFeaturePacks(s2iFeaturePacksSet);
+		return this;
+	}
+
+	@Override
+	public WildflyHelmChartRelease withS2iFeaturePack(String s2iFeaturePack) {
+		if (adaptee.getBuild() == null) {
+			adaptee.setBuild(new Build());
+		}
+		if (adaptee.getBuild().getS2i() == null) {
+			adaptee.getBuild().setS2i(new S2i());
+		}
+		final List<String> featurePacks = new ArrayList<>();
+		if (!Strings.isNullOrEmpty(adaptee.getBuild().getS2i().getFeaturePacks())) {
+			featurePacks.addAll(Arrays.stream(adaptee.getBuild().getS2i().getFeaturePacks().split(","))
+					.collect(Collectors.toList()));
+		}
+		featurePacks.add(s2iFeaturePack);
+		adaptee.getBuild().getS2i().setFeaturePacks(featurePacks.stream().collect(Collectors.joining(",")));
+		return this;
+	}
+
+	@Override
+	public LinkedHashSet<String> getS2iGalleonLayers() {
+		LinkedHashSet result = new LinkedHashSet();
+		if (adaptee.getBuild() != null && adaptee.getBuild().getS2i() != null
+				&& !Strings.isNullOrEmpty(adaptee.getBuild().getS2i().getGalleonLayers())) {
+			Arrays.stream(adaptee.getBuild().getS2i().getGalleonLayers().split(","))
+					.forEach(gl -> result.add(gl));
+		}
+		return result;
+	}
+
+	@Override
+	public void setS2iGalleonLayers(LinkedHashSet<String> s2iGalleonLayers) {
+		if (adaptee.getBuild() == null) {
+			adaptee.setBuild(new Build());
+		}
+		if (adaptee.getBuild().getS2i() == null) {
+			adaptee.getBuild().setS2i(new S2i());
+		}
+		// let's check just here, so there's a way to clear, i.e. by passing an empty or null list
+		if ((s2iGalleonLayers != null) && !s2iGalleonLayers.isEmpty()) {
+			adaptee.getBuild().getS2i().setGalleonLayers(s2iGalleonLayers.stream().collect(Collectors.joining(",")));
+		}
+	}
+
+	@Override
+	public WildflyHelmChartRelease withS2iGalleonLayers(LinkedHashSet<String> s2iGalleonLayers) {
+		this.setS2iGalleonLayers(s2iGalleonLayers);
+		return this;
+	}
+
+	@Override
+	public WildflyHelmChartRelease withS2iGalleonLayers(String s2iGalleonLayers) {
+		LinkedHashSet s2iGalleonLayersSet = new LinkedHashSet<>(
+				Arrays.stream(s2iGalleonLayers.split(",")).collect(Collectors.toList()));
+		this.setS2iGalleonLayers(s2iGalleonLayersSet);
+		return this;
+	}
+
+	@Override
+	public WildflyHelmChartRelease withS2iGalleonLayer(String s2iGalleonLayer) {
+		if (adaptee.getBuild() == null) {
+			adaptee.setBuild(new Build());
+		}
+		if (adaptee.getBuild().getS2i() == null) {
+			adaptee.getBuild().setS2i(new S2i());
+		}
+		final List<String> galleonLayers = new ArrayList<>();
+		if (!Strings.isNullOrEmpty(adaptee.getBuild().getS2i().getGalleonLayers())) {
+			galleonLayers.addAll(Arrays.stream(adaptee.getBuild().getS2i().getGalleonLayers().split(","))
+					.collect(Collectors.toList()));
+		}
+		galleonLayers.add(s2iGalleonLayer);
+		adaptee.getBuild().getS2i().setGalleonLayers(galleonLayers.stream().collect(Collectors.joining(",")));
+		return this;
+	}
+
+	@Override
+	public LinkedHashSet<String> getS2iChannels() {
+		LinkedHashSet result = new LinkedHashSet();
+		if (adaptee.getBuild() != null && adaptee.getBuild().getS2i() != null
+				&& !Strings.isNullOrEmpty(adaptee.getBuild().getS2i().getChannels())) {
+			Arrays.stream(adaptee.getBuild().getS2i().getChannels().split(","))
+					.forEach(ch -> result.add(ch));
+		}
+		return result;
+	}
+
+	@Override
+	public void setS2iChannels(LinkedHashSet<String> s2iChannels) {
+		if (adaptee.getBuild() == null) {
+			adaptee.setBuild(new Build());
+		}
+		if (adaptee.getBuild().getS2i() == null) {
+			adaptee.getBuild().setS2i(new S2i());
+		}
+		// let's check just here, so there's a way to clear, i.e. by passing an empty or null list
+		if ((s2iChannels != null) && !s2iChannels.isEmpty()) {
+			adaptee.getBuild().getS2i().setChannels(s2iChannels.stream().collect(Collectors.joining(",")));
+		}
+	}
+
+	@Override
+	public WildflyHelmChartRelease withS2iChannels(LinkedHashSet<String> s2iChannels) {
+		this.setS2iChannels(s2iChannels);
+		return this;
+	}
+
+	@Override
+	public WildflyHelmChartRelease withS2iChannel(String s2iChannel) {
+		if (adaptee.getBuild() == null) {
+			adaptee.setBuild(new Build());
+		}
+		if (adaptee.getBuild().getS2i() == null) {
+			adaptee.getBuild().setS2i(new S2i());
+		}
+		final List<String> channels = new ArrayList<>();
+		if (!Strings.isNullOrEmpty(adaptee.getBuild().getS2i().getChannels())) {
+			channels.addAll(Arrays.stream(adaptee.getBuild().getS2i().getChannels().split(","))
+					.collect(Collectors.toList()));
+		}
+		channels.add(s2iChannel);
+		adaptee.getBuild().getS2i().setChannels(channels.stream().collect(Collectors.joining(",")));
+		return this;
+	}
+
+	@Override
+	public BuildMode getBuildMode() {
+		if (adaptee.getBuild() == null || adaptee.getBuild().getMode() == null) {
+			return null;
+		}
+		switch (adaptee.getBuild().getMode()) {
+			case S_2_I:
+				return BuildMode.S2I;
+			case BOOTABLE_JAR:
+				return BuildMode.BOOTABLE_JAR;
+			default:
+				return null;
+		}
+	}
+
+	@Override
+	public void setBuildMode(BuildMode buildMode) {
+		if (adaptee.getBuild() == null) {
+			adaptee.setBuild(new org.jboss.intersmash.model.helm.charts.values.xp5.Build());
+		}
+		switch (buildMode) {
+			case S2I:
+				adaptee.getBuild().setMode(Build.Mode.S_2_I);
+				break;
+			case BOOTABLE_JAR:
+				adaptee.getBuild().setMode(Build.Mode.BOOTABLE_JAR);
+				break;
+			default:
+				log.warn("Unrecognized build mode option, not doing anything.");
+		}
+	}
+
+	@Override
+	public WildflyHelmChartRelease withBuildMode(BuildMode buildMode) {
+		this.setBuildMode(buildMode);
+		return this;
+	}
+
+	@Override
+	public String getBootableJarBuilderImage() {
+		return adaptee.getBuild() == null ? ""
+				: adaptee.getBuild().getBootableJar() == null ? "" : adaptee.getBuild().getBootableJar().getBuilderImage();
+	}
+
+	@Override
+	public void setBootableJarBuilderImage(String bootableJarBuilderImage) {
+		if (adaptee.getBuild() == null) {
+			adaptee.setBuild(new org.jboss.intersmash.model.helm.charts.values.xp5.Build());
+		}
+		if (adaptee.getBuild().getBootableJar() == null) {
+			adaptee.getBuild().setBootableJar(new BootableJar());
+		}
+		adaptee.getBuild().getBootableJar().setBuilderImage(bootableJarBuilderImage);
+	}
+
+	@Override
+	public WildflyHelmChartRelease withBootableJarBuilderImage(String bootableJarBuilderImage) {
+		this.setBootableJarBuilderImage(bootableJarBuilderImage);
+		return this;
+	}
+
+	@Override
+	public String getSourceRepositoryUrl() {
+		return adaptee.getBuild() == null ? "" : adaptee.getBuild().getUri();
+	}
+
+	@Override
+	public void setSourceRepositoryUrl(String sourceRepositoryUrl) {
+		if (adaptee.getBuild() == null) {
+			adaptee.setBuild(new Build());
+		}
+		adaptee.getBuild().setUri(sourceRepositoryUrl);
+	}
+
+	@Override
+	public WildflyHelmChartRelease withSourceRepositoryUrl(String sourceRepositoryUrl) {
+		this.setSourceRepositoryUrl(sourceRepositoryUrl);
+		return this;
+	}
+
+	@Override
+	public String getSourceRepositoryRef() {
+		return adaptee.getBuild() == null ? "" : adaptee.getBuild().getRef();
+	}
+
+	@Override
+	public void setSourceRepositoryRef(String sourceRepositoryRef) {
+		if (adaptee.getBuild() == null) {
+			adaptee.setBuild(new Build());
+		}
+		adaptee.getBuild().setRef(sourceRepositoryRef);
+	}
+
+	@Override
+	public WildflyHelmChartRelease withSourceRepositoryRef(String sourceRepositoryRef) {
+		this.setSourceRepositoryRef(sourceRepositoryRef);
+		return this;
+	}
+
+	@Override
+	public String getContextDir() {
+		return adaptee.getBuild() == null ? "" : adaptee.getBuild().getContextDir();
+	}
+
+	@Override
+	public void setContextDir(String contextDir) {
+		if (adaptee.getBuild() == null) {
+			adaptee.setBuild(new Build());
+		}
+		adaptee.getBuild().setContextDir(contextDir);
+	}
+
+	@Override
+	public WildflyHelmChartRelease withContextDir(String contextDir) {
+		this.setContextDir(contextDir);
+		return this;
+	}
+
+	@Override
+	public Integer getReplicas() {
+		return adaptee.getDeploy() == null ? 0 : adaptee.getDeploy().getReplicas();
+	}
+
+	@Override
+	public void setReplicas(Integer replicas) {
+		if (adaptee.getDeploy() == null) {
+			adaptee.setDeploy(new Deploy());
+		}
+		adaptee.getDeploy().setReplicas(replicas);
+	}
+
+	@Override
+	public WildflyHelmChartRelease withReplicas(Integer replicas) {
+		this.setReplicas(replicas);
+		return this;
+	}
+
+	@Override
+	public boolean isBuildEnabled() {
+		return adaptee.getBuild() == null ? Boolean.FALSE : adaptee.getBuild().getEnabled();
+	}
+
+	@Override
+	public void setBuildEnabled(boolean buildEnabled) {
+		if (adaptee.getBuild() == null) {
+			adaptee.setBuild(new Build());
+		}
+		adaptee.getBuild().setEnabled(buildEnabled);
+	}
+
+	@Override
+	public WildflyHelmChartRelease withBuildEnabled(boolean buildEnabled) {
+		this.setBuildEnabled(buildEnabled);
+		return this;
+	}
+
+	@Override
+	public boolean isDeployEnabled() {
+		return adaptee.getDeploy() == null ? Boolean.FALSE : adaptee.getDeploy().getEnabled();
+	}
+
+	@Override
+	public void setDeployEnabled(boolean deployEnabled) {
+		if (adaptee.getDeploy() == null) {
+			adaptee.setDeploy(new Deploy());
+		}
+		adaptee.getDeploy().setEnabled(deployEnabled);
+	}
+
+	@Override
+	public WildflyHelmChartRelease withDeployEnabled(boolean deployEnabled) {
+		this.setDeployEnabled(deployEnabled);
+		return this;
+	}
+
+	@Override
+	public String getJdk17BuilderImage() {
+		return adaptee.getBuild() == null ? ""
+				: adaptee.getBuild().getS2i().getJdk17() == null ? ""
+						: adaptee.getBuild().getS2i().getJdk17().getBuilderImage();
+	}
+
+	@Override
+	public void setJdk17BuilderImage(String jdk17BuilderImage) {
+		if (adaptee.getBuild() == null) {
+			adaptee.setBuild(new Build());
+		}
+		if (adaptee.getBuild().getS2i() == null) {
+			adaptee.getBuild().setS2i(new S2i());
+		}
+		if (adaptee.getBuild().getS2i().getJdk17() == null) {
+			adaptee.getBuild().getS2i().setJdk17(new Jdk17());
+		}
+		adaptee.getBuild().getS2i().getJdk17().setBuilderImage(jdk17BuilderImage);
+		adaptee.getBuild().getS2i().setJdk(S2i.Jdk._17);
+	}
+
+	@Override
+	public WildflyHelmChartRelease withJdk17BuilderImage(String jdk17BuilderImage) {
+		this.setJdk17BuilderImage(jdk17BuilderImage);
+		return this;
+	}
+
+	@Override
+	public String getJdk17RuntimeImage() {
+		return adaptee.getBuild() == null ? ""
+				: adaptee.getBuild().getS2i().getJdk17() == null ? ""
+						: adaptee.getBuild().getS2i().getJdk17().getRuntimeImage();
+	}
+
+	@Override
+	public void setJdk17RuntimeImage(String jdk17RuntimeImage) {
+		if (adaptee.getBuild() == null) {
+			adaptee.setBuild(new Build());
+		}
+		if (adaptee.getBuild().getS2i() == null) {
+			adaptee.getBuild().setS2i(new S2i());
+		}
+		if (adaptee.getBuild().getS2i().getJdk17() == null) {
+			adaptee.getBuild().getS2i().setJdk17(new Jdk17());
+		}
+		adaptee.getBuild().getS2i().getJdk17().setRuntimeImage(jdk17RuntimeImage);
+	}
+
+	@Override
+	public WildflyHelmChartRelease withJdk17RuntimeImage(String jdk17RuntimeImage) {
+		this.setJdk17RuntimeImage(jdk17RuntimeImage);
+		return this;
+	}
+
+	private HelmXp5Release initDefaultReplicas(HelmXp5Release release) {
+		if (release.getDeploy() == null) {
+			release = release.withDeploy(new Deploy());
+		}
+		if (release.getDeploy().getReplicas() == null) {
+			release.getDeploy().setReplicas(1);
+		}
+		return release;
+	}
+}
diff --git a/provisioners/src/main/resources/org/jboss/intersmash/provision/helm/values/schema/eap8/helm-eap8-release.json b/provisioners/src/main/resources/org/jboss/intersmash/provision/helm/values/schema/eap8/helm-eap8-release.json
index 36358e61c..ed4a442db 100644
--- a/provisioners/src/main/resources/org/jboss/intersmash/provision/helm/values/schema/eap8/helm-eap8-release.json
+++ b/provisioners/src/main/resources/org/jboss/intersmash/provision/helm/values/schema/eap8/helm-eap8-release.json
@@ -2,632 +2,633 @@
   "$schema": "http://json-schema.org/schema#",
   "type": "object",
   "properties": {
-    "image": {
-      "type": ["object", "null"],
-      "properties": {
-        "name": {
-          "description": "Name of the application image. If not specified, the name of the Helm release will be used.",
-          "type": ["string", "null"]
-        },
-        "tag": {
-          "description": "Tag of the application image",
-          "type": ["string", "null"],
-          "default": "latest"
-        }
-      }
-    },
-    "build": {
-      "description": "Configuration to build the application image",
-      "type": "object",
-      "properties": {
-        "enabled": {
-          "description": "Enable/Disable building the application image",
-          "type": "boolean",
-          "default": true
-        },
-        "mode": {
-          "description": "Which mode to use to build the application",
-          "type": "string",
-          "enum": ["s2i"],
-          "default": "s2i"
-        },
-        "uri": {
-          "description": "URI of GitHub repository",
-          "type": "string"
-        },
-        "ref": {
-          "description": "Git reference",
-          "type": ["string", "null"]
-        },
-        "contextDir": {
-          "description": "Context directory within your Git repo to use as the root for the build",
-          "type": ["string", "null"]
-        },
-        "sourceSecret": {
-          "description": "Name of the Secret to use when cloning Git source project",
-          "type": ["string", "null"]
-        },
-        "pullSecret": {
-          "description": "Name of the Pull Secret",
-          "type": ["string", "null"]
-        },
-        "output": {
-          "description": "Configuration for the built application image",
-          "type": "object",
+      "image": {
+          "type": ["object", "null"],
           "properties": {
-            "kind": {
-              "description": "Determines where the application images will be pushed",
-              "type": "string",
-              "enum": ["ImageStreamTag", "DockerImage"],
-              "default": "ImageStreamTag"
-            },
-            "pushSecret": {
-              "description": "Name of the Push Secret",
-              "type": ["string", "null"]
-            }
-          }
-        },
-        "env": {
-          "description": "List of environment variables to set in the container. Cannot be updated.",
-          "items": {
-            "description": "EnvVar represents an environment variable present in a Container.",
-            "properties": {
               "name": {
-                "description": "Name of the environment variable. Must be a C_IDENTIFIER.",
-                "type": "string"
+                  "description": "Name of the application image. If not specified, the name of the Helm release will be used.",
+                  "type": ["string", "null"]
               },
-              "value": {
-                "description": "Variable references $(VAR_NAME) are expanded using the previous defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to \"\".",
-                "type": [
-                  "string",
-                  "null"
-                ]
+              "tag": {
+                  "description": "Tag of the application image",
+                  "type": ["string", "null"],
+                  "default": "latest"
+              }
+          }
+      },
+      "build": {
+          "description": "Configuration to build the application image",
+          "type": "object",
+          "properties": {
+              "enabled": {
+                  "description": "Enable/Disable building the application image",
+                  "type": "boolean",
+                  "default": true
               },
-              "valueFrom": {
-                "description": "EnvVarSource represents a source for the value of an EnvVar.",
+              "mode": {
+                  "description": "Which mode to use to build the application",
+                  "type": "string",
+                  "enum": ["s2i"],
+                  "default": "s2i"
+              },
+              "uri": {
+                  "description": "URI of GitHub repository",
+                  "type": "string"
+              },
+              "ref": {
+                  "description": "Git reference",
+                  "type": ["string", "null"]
+              },
+              "contextDir": {
+                  "description": "Context directory within your Git repo to use as the root for the build",
+                  "type": ["string", "null"]
+              },
+              "sourceSecret": {
+                "description": "Name of the Secret to use when cloning Git source project",
+                "type": ["string", "null"]
+              },
+              "pullSecret": {
+                "description": "Name of the Pull Secret",
+                "type": ["string", "null"]
+              },
+              "output": {
+                "description": "Configuration for the built application image",
+                "type": "object",
                 "properties": {
-                  "configMapKeyRef": {
-                    "description": "Selects a key from a ConfigMap.",
+                  "kind": {
+                    "description": "Determines where the application images will be pushed",
+                    "type": "string",
+                    "enum": ["ImageStreamTag", "DockerImage"],
+                    "default": "ImageStreamTag"
+                  },
+                  "pushSecret": {
+                    "description": "Name of the Push Secret",
+                    "type": ["string", "null"]
+                  }
+                }
+              },
+              "env": {
+                  "description": "List of environment variables to set in the container. Cannot be updated.",
+                  "items": {
+                    "description": "EnvVar represents an environment variable present in a Container.",
                     "properties": {
-                      "key": {
-                        "description": "The key to select.",
+                      "name": {
+                        "description": "Name of the environment variable. Must be a C_IDENTIFIER.",
                         "type": "string"
                       },
-                      "name": {
-                        "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
+                      "value": {
+                        "description": "Variable references $(VAR_NAME) are expanded using the previous defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to \"\".",
                         "type": [
                           "string",
                           "null"
                         ]
                       },
-                      "optional": {
-                        "description": "Specify whether the ConfigMap or its key must be defined",
-                        "type": "boolean"
+                      "valueFrom": {
+                        "description": "EnvVarSource represents a source for the value of an EnvVar.",
+                        "properties": {
+                          "configMapKeyRef": {
+                            "description": "Selects a key from a ConfigMap.",
+                            "properties": {
+                              "key": {
+                                "description": "The key to select.",
+                                "type": "string"
+                              },
+                              "name": {
+                                "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ]
+                              },
+                              "optional": {
+                                "description": "Specify whether the ConfigMap or its key must be defined",
+                                "type": "boolean"
+                              }
+                            },
+                            "required": [
+                              "key"
+                            ],
+                            "type": "object"
+                          },
+                          "fieldRef": {
+                            "description": "ObjectFieldSelector selects an APIVersioned field of an object.",
+                            "properties": {
+                              "apiVersion": {
+                                "description": "Version of the schema the FieldPath is written in terms of, defaults to \"v1\".",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ]
+                              },
+                              "fieldPath": {
+                                "description": "Path of the field to select in the specified API version.",
+                                "type": "string"
+                              }
+                            },
+                            "required": [
+                              "fieldPath"
+                            ],
+                            "type": "object"
+                          },
+                          "resourceFieldRef": {
+                            "description": "ResourceFieldSelector represents container resources (cpu, memory) and their output format",
+                            "properties": {
+                              "containerName": {
+                                "description": "Container name: required for volumes, optional for env vars",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ]
+                              },
+                              "divisor": {
+                                "oneOf": [
+                                  {
+                                    "type": [
+                                      "string",
+                                      "null"
+                                    ]
+                                  },
+                                  {
+                                    "type": "integer"
+                                  }
+                                ]
+                              },
+                              "resource": {
+                                "description": "Required: resource to select",
+                                "type": "string"
+                              }
+                            },
+                            "required": [
+                              "resource"
+                            ],
+                            "type": "object"
+                          },
+                          "secretKeyRef": {
+                            "description": "SecretKeySelector selects a key of a Secret.",
+                            "properties": {
+                              "key": {
+                                "description": "The key of the secret to select from.  Must be a valid secret key.",
+                                "type": "string"
+                              },
+                              "name": {
+                                "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ]
+                              },
+                              "optional": {
+                                "description": "Specify whether the Secret or its key must be defined",
+                                "type": "boolean"
+                              }
+                            },
+                            "required": [
+                              "key"
+                            ],
+                            "type": "object"
+                          }
+                        },
+                        "type": "object"
                       }
                     },
                     "required": [
-                      "key"
+                      "name"
                     ],
                     "type": "object"
                   },
-                  "fieldRef": {
-                    "description": "ObjectFieldSelector selects an APIVersioned field of an object.",
-                    "properties": {
-                      "apiVersion": {
-                        "description": "Version of the schema the FieldPath is written in terms of, defaults to \"v1\".",
-                        "type": [
-                          "string",
-                          "null"
-                        ]
-                      },
-                      "fieldPath": {
-                        "description": "Path of the field to select in the specified API version.",
-                        "type": "string"
-                      }
+                  "type": [
+                    "array",
+                    "null"
+                  ]
+              },
+              "resources": {
+                  "description": "Freeform resources field. More information: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/"
+              },
+              "images": {
+                  "description": "Freeform images injected in the source during build."
+              },
+              "triggers": {
+                  "description": "Webhooks to trigger building the application image",
+                  "type": ["object", "null"],
+                  "properties": {
+                    "githubSecret": {
+                      "description": "Name of the secret containing the WebHookSecretKey for the GitHub Webhook",
+                      "type": "string"
                     },
-                    "required": [
-                      "fieldPath"
-                    ],
-                    "type": "object"
-                  },
-                  "resourceFieldRef": {
-                    "description": "ResourceFieldSelector represents container resources (cpu, memory) and their output format",
-                    "properties": {
-                      "containerName": {
-                        "description": "Container name: required for volumes, optional for env vars",
-                        "type": [
-                          "string",
-                          "null"
-                        ]
+                    "genericSecret": {
+                      "description": "Name of the secret containing the WebHookSecretKey for the Generic Webhook",
+                      "type": "string"
+                    }
+                  }
+              },
+              "s2i": {
+                  "description": "Configuration specific to S2I Build (applicable only if build mode is set to s2i)",
+                  "type": ["object", "null"],
+                  "properties": {
+                      "kind": {
+                        "description": "Determines the type of images for S2I Builder and Runtime images",
+                        "type": "string",
+                        "enum": ["ImageStreamTag", "DockerImage", "ImageStreamImage"],
+                        "default": "DockerImage"
                       },
-                      "divisor": {
-                        "oneOf": [
-                          {
-                            "type": [
-                              "string",
-                              "null"
-                            ]
+                      "jdk": {
+                        "description": "JDK Version of the EAP S2I images",
+                        "type": "string",
+                        "enum": ["17"],
+                        "default": "17"
+                      },
+                      "jdk17": {
+                        "description": "EAP S2I images for JDK 17",
+                        "type": "object",
+                        "properties": {
+                          "builderImage": {
+                            "description": "EAP S2I Builder image for JDK 17",
+                            "type": "string"
                           },
-                          {
-                            "type": "integer"
+                          "runtimeImage": {
+                            "description": "EAP S2I Runtime image for JDK 17",
+                            "type": "string"
+                            }
                           }
-                        ]
+                        },
+                      "buildApplicationImage": {
+                        "description": "Determine if the application image must be built. If false, the Helm release will  build the first artifact image (with the name of the Helm release)",
+                        "type": "boolean",
+                        "default": true
                       },
-                      "resource": {
-                        "description": "Required: resource to select",
-                        "type": "string"
-                      }
-                    },
-                    "required": [
-                      "resource"
-                    ],
-                    "type": "object"
-                  },
-                  "secretKeyRef": {
-                    "description": "SecretKeySelector selects a key of a Secret.",
-                    "properties": {
-                      "key": {
-                        "description": "The key of the secret to select from.  Must be a valid secret key.",
-                        "type": "string"
+                      "builderKind": {
+                        "description": "Determines the type of images for S2I Builder image. If omitted, the value of the kind properties is used",
+                        "type":  ["string", "null"],
+                        "enum": ["ImageStreamTag", "DockerImage", "ImageStreamImage"]
                       },
-                      "name": {
-                        "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
-                        "type": [
-                          "string",
-                          "null"
-                        ]
+                      "runtimeKind": {
+                        "description": "Determines the type of images for S2I Runtime image. If omitted, the value of the kind properties is used",
+                        "type":  ["string", "null"],
+                        "enum": ["ImageStreamTag", "DockerImage", "ImageStreamImage"]
                       },
-                      "optional": {
-                        "description": "Specify whether the Secret or its key must be defined",
-                        "type": "boolean"
+                      "featurePacks": {
+                        "description": "List of Galleon feature-packs identified by Maven coordinates (`<groupId>:<artifactId>:<version>`). Deprecated, the recommended way to provision EAP is to use the eap-maven-plugin in the application pom.xml",
+                        "type": ["string", "array", "null"],
+                        "items": {
+                          "type": "string"
+                        }
+                      },
+                      "galleonDir": {
+                        "description": "Directory relative to the root directory for the build that contains custom content for Galleon.",
+                        "type": ["string", "null"]
+                      },
+                      "galleonLayers": {
+                          "description": "List of Galleon Layers to provision. If galleonLayers are configured, the featurePacks that provides the layers must be specified (including EAP feature pack). Deprecated, the recommended way to provision EAP is to use the eap-maven-plugin in the application pom.xml",
+                          "type": ["string", "array", "null"],
+                          "items": {
+                            "type": "string"
+                          }
+                      },
+                      "channels": {
+                        "description": "List of Channels identified by Maven coordinates (`<groupId>:<artifactId>`). If featurePacks are configured without any versioning, the channels that provides the latest feature packs can be specified. Deprecated, the recommended way to provision EAP is to use the eap-maven-plugin in the application pom.xml",
+                        "type": ["string", "array", "null"],
+                        "items": {
+                         "type": "string"
+                        }
                       }
-                    },
-                    "required": [
-                      "key"
-                    ],
-                    "type": "object"
                   }
-                },
-                "type": "object"
               }
-            },
-            "required": [
-              "name"
-            ],
-            "type": "object"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "resources": {
-          "description": "Freeform resources field. More information: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/"
-        },
-        "images": {
-          "description": "Freeform images injected in the source during build."
-        },
-        "triggers": {
-          "description": "Webhooks to trigger building the application image",
-          "type": ["object", "null"],
-          "properties": {
-            "githubSecret": {
-              "description": "Name of the secret containing the WebHookSecretKey for the GitHub Webhook",
-              "type": "string"
-            },
-            "genericSecret": {
-              "description": "Name of the secret containing the WebHookSecretKey for the Generic Webhook",
-              "type": "string"
-            }
           }
-        },
-        "s2i": {
-          "description": "Configuration specific to S2I Build (applicable only if build mode is set to s2i)",
-          "type": ["object", "null"],
+      },
+      "deploy": {
+          "description": "Configuration to deploy the application",
+          "type": "object",
           "properties": {
-            "kind": {
-              "description": "Determines the type of images for S2I Builder and Runtime images",
-              "type": "string",
-              "enum": ["ImageStreamTag", "DockerImage", "ImageStreamImage"],
-              "default": "DockerImage"
-            },
-            "jdk": {
-              "description": "JDK Version of the EAP S2I images",
-              "type": "string",
-              "enum": ["17"],
-              "default": "17"
-            },
-            "jdk17": {
-              "description": "EAP S2I images for JDK 17",
+            "annotations": {
               "type": "object",
-              "properties": {
-                "builderImage": {
-                  "description": "EAP S2I Builder image for JDK 17",
-                  "type": "string"
-                },
-                "runtimeImage": {
-                  "description": "EAP S2I Runtime image for JDK 17",
-                  "type": "string"
-                }
-              }
-            },
-            "buildApplicationImage": {
-              "description": "Determine if the application image must be built. If false, the Helm release will  build the first artifact image (with the name of the Helm release)",
-              "type": "boolean",
-              "default": true
-            },
-            "builderKind": {
-              "description": "Determines the type of images for S2I Builder image. If omitted, the value of the kind properties is used",
-              "type":  ["string", "null"],
-              "enum": ["ImageStreamTag", "DockerImage", "ImageStreamImage"]
-            },
-            "runtimeKind": {
-              "description": "Determines the type of images for S2I Runtime image. If omitted, the value of the kind properties is used",
-              "type":  ["string", "null"],
-              "enum": ["ImageStreamTag", "DockerImage", "ImageStreamImage"]
-            },
-            "featurePacks": {
-              "description": "List of Galleon feature-packs identified by Maven coordinates (`<groupId>:<artifactId>:<version>`). Deprecated, the recommended way to provision EAP is to use the eap-maven-plugin in the application pom.xml",
-              "type": ["string", "array", "null"],
-              "items": {
-                "type": "string"
-              }
-            },
-            "galleonDir": {
-              "description": "Directory relative to the root directory for the build that contains custom content for Galleon.",
-              "type": ["string", "null"]
-            },
-            "galleonLayers": {
-              "description": "List of Galleon Layers to provision. If galleonLayers are configured, the featurePacks that provides the layers must be specified (including EAP feature pack). Deprecated, the recommended way to provision EAP is to use the eap-maven-plugin in the application pom.xml",
-              "type": ["string", "array", "null"],
-              "items": {
+              "description": "Annotations that are applied to the deployed application and its pods",
+              "additionalProperties": {
                 "type": "string"
               }
             },
-            "channels": {
-              "description": "List of Channels identified by Maven coordinates (`<groupId>:<artifactId>`). If featurePacks are configured without any versioning, the channels that provides the latest feature packs can be specified. Deprecated, the recommended way to provision EAP is to use the eap-maven-plugin in the application pom.xml",
-              "type": ["string", "array", "null"],
-              "items": {
-                "type": "string"
-              }
-            }
-          }
-        }
-      }
-    },
-    "deploy": {
-      "description": "Configuration to deploy the application",
-      "type": "object",
-      "properties": {
-        "annotations": {
-          "type": "object",
-          "description": "Annotations that are applied to the deployed application and its pods",
-          "additionalProperties": {
-            "type": "string"
-          }
-        },
-        "enabled": {
-          "description": "Enable/Disable deploying the application image",
-          "type": "boolean",
-          "default": true
-        },
-        "replicas": {
-          "type": "integer",
-          "description": "Number of pod replicas to deploy"
-        },
-        "labels": {
-          "type": "object",
-          "description": "Labels that are applied to the deployed application and its pods",
-          "additionalProperties": {
-            "type":"string"
-          }
-        },
-        "resources": {
-          "description": "Freeform resources requirements to deploy the application image"
-        },
-        "env": {
-          "description": "List of environment variables to set in the container. Cannot be updated.",
-          "items": {
-            "description": "EnvVar represents an environment variable present in a Container.",
-            "properties": {
-              "name": {
-                "description": "Name of the environment variable. Must be a C_IDENTIFIER.",
-                "type": "string"
+              "enabled": {
+                  "description": "Enable/Disable deploying the application image",
+                  "type": "boolean",
+                  "default": true
               },
-              "value": {
-                "description": "Variable references $(VAR_NAME) are expanded using the previous defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to \"\".",
-                "type": [
-                  "string",
-                  "null"
-                ]
+              "replicas": {
+                  "type": "integer",
+                  "description": "Number of pod replicas to deploy"
               },
-              "valueFrom": {
-                "description": "EnvVarSource represents a source for the value of an EnvVar.",
-                "properties": {
-                  "configMapKeyRef": {
-                    "description": "Selects a key from a ConfigMap.",
+              "labels": {
+                "type": "object",
+                "description": "Labels that are applied to the deployed application and its pods",
+                "additionalProperties": {
+                  "type":"string"
+                }
+              },
+              "resources": {
+                  "description": "Freeform resources requirements to deploy the application image"
+              },
+              "env": {
+                  "description": "List of environment variables to set in the container. Cannot be updated.",
+                  "items": {
+                    "description": "EnvVar represents an environment variable present in a Container.",
                     "properties": {
-                      "key": {
-                        "description": "The key to select.",
+                      "name": {
+                        "description": "Name of the environment variable. Must be a C_IDENTIFIER.",
                         "type": "string"
                       },
-                      "name": {
-                        "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
+                      "value": {
+                        "description": "Variable references $(VAR_NAME) are expanded using the previous defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to \"\".",
                         "type": [
                           "string",
                           "null"
                         ]
                       },
-                      "optional": {
-                        "description": "Specify whether the ConfigMap or its key must be defined",
-                        "type": "boolean"
+                      "valueFrom": {
+                        "description": "EnvVarSource represents a source for the value of an EnvVar.",
+                        "properties": {
+                          "configMapKeyRef": {
+                            "description": "Selects a key from a ConfigMap.",
+                            "properties": {
+                              "key": {
+                                "description": "The key to select.",
+                                "type": "string"
+                              },
+                              "name": {
+                                "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ]
+                              },
+                              "optional": {
+                                "description": "Specify whether the ConfigMap or its key must be defined",
+                                "type": "boolean"
+                              }
+                            },
+                            "required": [
+                              "key"
+                            ],
+                            "type": "object"
+                          },
+                          "fieldRef": {
+                            "description": "ObjectFieldSelector selects an APIVersioned field of an object.",
+                            "properties": {
+                              "apiVersion": {
+                                "description": "Version of the schema the FieldPath is written in terms of, defaults to \"v1\".",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ]
+                              },
+                              "fieldPath": {
+                                "description": "Path of the field to select in the specified API version.",
+                                "type": "string"
+                              }
+                            },
+                            "required": [
+                              "fieldPath"
+                            ],
+                            "type": "object"
+                          },
+                          "resourceFieldRef": {
+                            "description": "ResourceFieldSelector represents container resources (cpu, memory) and their output format",
+                            "properties": {
+                              "containerName": {
+                                "description": "Container name: required for volumes, optional for env vars",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ]
+                              },
+                              "divisor": {
+                                "oneOf": [
+                                  {
+                                    "type": [
+                                      "string",
+                                      "null"
+                                    ]
+                                  },
+                                  {
+                                    "type": "integer"
+                                  }
+                                ]
+                              },
+                              "resource": {
+                                "description": "Required: resource to select",
+                                "type": "string"
+                              }
+                            },
+                            "required": [
+                              "resource"
+                            ],
+                            "type": "object"
+                          },
+                          "secretKeyRef": {
+                            "description": "SecretKeySelector selects a key of a Secret.",
+                            "properties": {
+                              "key": {
+                                "description": "The key of the secret to select from.  Must be a valid secret key.",
+                                "type": "string"
+                              },
+                              "name": {
+                                "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
+                                "type": [
+                                  "string",
+                                  "null"
+                                ]
+                              },
+                              "optional": {
+                                "description": "Specify whether the Secret or its key must be defined",
+                                "type": "boolean"
+                              }
+                            },
+                            "required": [
+                              "key"
+                            ],
+                            "type": "object"
+                          }
+                        },
+                        "type": "object"
                       }
                     },
                     "required": [
-                      "key"
+                      "name"
                     ],
                     "type": "object"
                   },
-                  "fieldRef": {
-                    "description": "ObjectFieldSelector selects an APIVersioned field of an object.",
+                  "type": [
+                    "array",
+                    "null"
+                  ]
+              },
+              "envFrom": {
+                  "description": "List of sources to populate environment variables in the container. The keys defined within a source must be a C_IDENTIFIER. All invalid keys will be reported as an event when the container is starting. When a key exists in multiple sources, the value associated with the last source will take precedence. Values defined by an Env with a duplicate key will take precedence. Cannot be updated.",
+                  "items": {
+                    "description": "EnvFromSource represents the source of a set of ConfigMaps",
                     "properties": {
-                      "apiVersion": {
-                        "description": "Version of the schema the FieldPath is written in terms of, defaults to \"v1\".",
-                        "type": [
-                          "string",
-                          "null"
-                        ]
+                      "configMapRef": {
+                        "description": "ConfigMapEnvSource selects a ConfigMap to populate the environment variables with.\n\nThe contents of the target ConfigMap's Data field will represent the key-value pairs as environment variables.",
+                        "properties": {
+                          "name": {
+                            "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
+                            "type": [
+                              "string",
+                              "null"
+                            ]
+                          },
+                          "optional": {
+                            "description": "Specify whether the ConfigMap must be defined",
+                            "type": "boolean"
+                          }
+                        },
+                        "type": "object"
                       },
-                      "fieldPath": {
-                        "description": "Path of the field to select in the specified API version.",
-                        "type": "string"
-                      }
-                    },
-                    "required": [
-                      "fieldPath"
-                    ],
-                    "type": "object"
-                  },
-                  "resourceFieldRef": {
-                    "description": "ResourceFieldSelector represents container resources (cpu, memory) and their output format",
-                    "properties": {
-                      "containerName": {
-                        "description": "Container name: required for volumes, optional for env vars",
+                      "prefix": {
+                        "description": "An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.",
                         "type": [
                           "string",
                           "null"
                         ]
                       },
-                      "divisor": {
-                        "oneOf": [
-                          {
+                      "secretRef": {
+                        "description": "SecretEnvSource selects a Secret to populate the environment variables with.\n\nThe contents of the target Secret's Data field will represent the key-value pairs as environment variables.",
+                        "properties": {
+                          "name": {
+                            "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
                             "type": [
                               "string",
                               "null"
                             ]
                           },
-                          {
-                            "type": "integer"
+                          "optional": {
+                            "description": "Specify whether the Secret must be defined",
+                            "type": "boolean"
                           }
-                        ]
-                      },
-                      "resource": {
-                        "description": "Required: resource to select",
-                        "type": "string"
+                        },
+                        "type": "object"
                       }
                     },
-                    "required": [
-                      "resource"
-                    ],
                     "type": "object"
                   },
-                  "secretKeyRef": {
-                    "description": "SecretKeySelector selects a key of a Secret.",
-                    "properties": {
-                      "key": {
-                        "description": "The key of the secret to select from.  Must be a valid secret key.",
-                        "type": "string"
+                  "type": [
+                    "array",
+                    "null"
+                  ]
+              },
+              "route": {
+                  "description": "Route configuration",
+                  "type": "object",
+                  "properties": {
+                      "enabled": {
+                          "description": "Enable/Disable creating a Route for the application",
+                          "default": true,
+                          "type": "boolean"
                       },
-                      "name": {
-                        "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
-                        "type": [
-                          "string",
-                          "null"
-                        ]
+                      "host": {
+                        "description": "alias/DNS that points to the service. If not specified a route name will typically be automatically chosen",
+                        "type": "string"
                       },
-                      "optional": {
-                        "description": "Specify whether the Secret or its key must be defined",
-                        "type": "boolean"
+                      "tls": {
+                        "description": "TLS Configuration for the Route",
+                        "type": "object",
+                        "properties": {
+                          "enabled" : {
+                            "description": "Determines if the Route should be TLS-encrypted. If deploy.tls.enabled is true, the route will use the secure service to acess to the deployment",
+                            "default": true,
+                            "type": "boolean"
+                          },
+                          "termination": {
+                            "description": "Determines the type of TLS termination to use",
+                            "type": "string",
+                            "enum": ["edge", "reencrypt", "passthrough"],
+                            "default": "edge"
+                          },
+                          "insecureEdgeTerminationPolicy": {
+                            "description": "Determines if insecure traffic should be redirected",
+                            "type": "string",
+                            "enum": ["Allow", "Disable", "Redirect"],
+                            "default": "Redirect"
+                          }
+                        }
                       }
-                    },
-                    "required": [
-                      "key"
-                    ],
-                    "type": "object"
                   }
-                },
-                "type": "object"
-              }
-            },
-            "required": [
-              "name"
-            ],
-            "type": "object"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "envFrom": {
-          "description": "List of sources to populate environment variables in the container. The keys defined within a source must be a C_IDENTIFIER. All invalid keys will be reported as an event when the container is starting. When a key exists in multiple sources, the value associated with the last source will take precedence. Values defined by an Env with a duplicate key will take precedence. Cannot be updated.",
-          "items": {
-            "description": "EnvFromSource represents the source of a set of ConfigMaps",
-            "properties": {
-              "configMapRef": {
-                "description": "ConfigMapEnvSource selects a ConfigMap to populate the environment variables with.\n\nThe contents of the target ConfigMap's Data field will represent the key-value pairs as environment variables.",
+              },
+              "tls": {
+                "description": "TLS Configuration",
+                "type": "object",
                 "properties": {
-                  "name": {
-                    "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
-                    "type": [
-                      "string",
-                      "null"
-                    ]
-                  },
-                  "optional": {
-                    "description": "Specify whether the ConfigMap must be defined",
+                  "enabled": {
+                    "description": "Enable the creation of a secure service to access the application.",
+                    "default": false,
                     "type": "boolean"
                   }
-                },
-                "type": "object"
+                }
               },
-              "prefix": {
-                "description": "An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.",
-                "type": [
-                  "string",
-                  "null"
-                ]
+              "livenessProbe": {
+                  "description": "Freeform livenessProbe configuration"
               },
-              "secretRef": {
-                "description": "SecretEnvSource selects a Secret to populate the environment variables with.\n\nThe contents of the target Secret's Data field will represent the key-value pairs as environment variables.",
-                "properties": {
-                  "name": {
-                    "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
-                    "type": [
-                      "string",
-                      "null"
-                    ]
-                  },
-                  "optional": {
-                    "description": "Specify whether the Secret must be defined",
-                    "type": "boolean"
+              "readinessProbe": {
+                  "description": "Freeform readinessProbe configuration"
+              },
+              "startupProbe": {
+                  "description": "Freeform startupProbe configuration"
+              },
+              "volumeMounts": {
+                "description": "Freeform array of volumeMounts",
+                "type": ["array", "null"],
+                "items": {
+                  "description": "VolumeMount describes a mounting of a Volume within a container.",
+                  "required": ["name", "mountPath"],
+                  "properties": {
+                    "mountPath": {
+                      "description": "Path within the container at which the volume should be mounted.  Must not contain ':'.",
+                      "type": "string"
+                    },
+                    "mountPropagation": {
+                      "description": "mountPropagation determines how mounts are propagated from the host to container and the other way around. When not set, MountPropagationHostToContainer is used. This field is alpha in 1.8 and can be reworked or removed in a future release.",
+                      "type": ["string", "null"]
+                    },
+                    "name": {
+                      "description": "This must match the Name of a Volume.",
+                      "type": "string"
+                    },
+                    "readOnly": {
+                      "description": "Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false.",
+                      "type": "boolean"
+                    },
+                    "subPath": {
+                      "description": "Path within the volume from which the container's volume should be mounted. Defaults to \"\" (volume's root).",
+                      "type": ["string","null"]
+                    }
                   }
-                },
-                "type": "object"
-              }
-            },
-            "type": "object"
-          },
-          "type": [
-            "array",
-            "null"
-          ]
-        },
-        "route": {
-          "description": "Route configuration",
-          "type": "object",
-          "properties": {
-            "enabled": {
-              "description": "Enable/Disable creating a Route for the application",
-              "default": true,
-              "type": "boolean"
-            },
-            "host": {
-              "description": "alias/DNS that points to the service. If not specified a route name will typically be automatically chosen",
-              "type": "string"
-            },
-            "tls": {
-              "description": "TLS Configuration for the Route",
-              "type": "object",
-              "properties": {
-                "enabled" : {
-                  "description": "Determines if the Route should be TLS-encrypted. If deploy.tls.enabled is true, the route will use the secure service to acess to the deployment",
-                  "default": true,
-                  "type": "boolean"
-                },
-                "termination": {
-                  "description": "Determines the type of TLS termination to use",
-                  "type": "string",
-                  "enum": ["edge", "reencrypt", "passthrough"],
-                  "default": "edge"
-                },
-                "insecureEdgeTerminationPolicy": {
-                  "description": "Determines if insecure traffic should be redirected",
-                  "type": "string",
-                  "enum": ["Allow", "Disable", "Redirect"],
-                  "default": "Redirect"
                 }
-              }
-            }
-          }
-        },
-        "tls": {
-          "description": "TLS Configuration",
-          "type": "object",
-          "properties": {
-            "enabled": {
-              "description": "Enable the creation of a secure service to access the application.",
-              "default": false,
-              "type": "boolean"
-            }
-          }
-        },
-        "livenessProbe": {
-          "description": "Freeform livenessProbe configuration"
-        },
-        "readinessProbe": {
-          "description": "Freeform readinessProbe configuration"
-        },
-        "startupProbe": {
-          "description": "Freeform startupProbe configuration"
-        },
-        "volumeMounts": {
-          "description": "Freeform array of volumeMounts",
-          "type": ["array", "null"],
-          "items": {
-            "description": "VolumeMount describes a mounting of a Volume within a container.",
-            "required": ["name", "mountPath"],
-            "properties": {
-              "mountPath": {
-                "description": "Path within the container at which the volume should be mounted.  Must not contain ':'.",
-                "type": "string"
               },
-              "mountPropagation": {
-                "description": "mountPropagation determines how mounts are propagated from the host to container and the other way around. When not set, MountPropagationHostToContainer is used. This field is alpha in 1.8 and can be reworked or removed in a future release.",
-                "type": ["string", "null"]
+              "volumes": {
+                "description": "Freeform array of volumes",
+                  "type": [ "array", "null"]
               },
-              "name": {
-                "description": "This must match the Name of a Volume.",
-                "type": "string"
+              "initContainers": {
+                "description": "Freeform array of initContainers",
+                "type": [ "array", "null"]
               },
-              "readOnly": {
-                "description": "Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false.",
-                "type": "boolean"
+              "extraContainers": {
+                "description": "Freeform array of extra containers",
+                "type": [ "array", "null"]
               },
-              "subPath": {
-                "description": "Path within the volume from which the container's volume should be mounted. Defaults to \"\" (volume's root).",
-                "type": ["string","null"]
-              }
-            }
-          }
-        },
-        "volumes": {
-          "description": "Freeform array of volumes",
-          "type": [ "array", "null"]
-        },
-        "initContainers": {
-          "description": "Freeform array of initContainers",
-          "type": [ "array", "null"]
-        },
-        "extraContainers": {
-          "description": "Freeform array of extra containers",
-          "type": [ "array", "null"]
-        },
-        "imagePullSecrets:": {
-          "description": "ImagePullSecrets is a list of references to secrets in the same namespace to use for pulling the application image",
-          "type": [ "array", "null"],
-          "items": {
-            "description": "Reference to a secret in the same namespace.",
-            "required": ["name"],
-            "properties": {
-              "name": {
-                "description": "Name of the referenced secret",
-                "type": "string"
+              "imagePullSecrets:": {
+                "description": "ImagePullSecrets is a list of references to secrets in the same namespace to use for pulling the application image",
+                "type": [ "array", "null"],
+                "items": {
+                  "description": "Reference to a secret in the same namespace.",
+                  "required": ["name"],
+                  "properties": {
+                    "name": {
+                      "description": "Name of the referenced secret",
+                      "type": "string"
+                    }
+                  }
+                }
               }
-            }
           }
-        }
       }
-    }
   }
 }
+
diff --git a/provisioners/src/main/resources/org/jboss/intersmash/provision/helm/values/schema/xp5/helm-xp5-release.json b/provisioners/src/main/resources/org/jboss/intersmash/provision/helm/values/schema/xp5/helm-xp5-release.json
new file mode 100644
index 000000000..f9dc5ab04
--- /dev/null
+++ b/provisioners/src/main/resources/org/jboss/intersmash/provision/helm/values/schema/xp5/helm-xp5-release.json
@@ -0,0 +1,755 @@
+{
+  "$schema": "http://json-schema.org/schema#",
+  "type": "object",
+  "properties": {
+    "image": {
+      "type": [
+        "object",
+        "null"
+      ],
+      "properties": {
+        "name": {
+          "description": "Name of the application image. If not specified, the name of the Helm release will be used.",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "tag": {
+          "description": "Tag of the application image",
+          "type": [
+            "string",
+            "null"
+          ],
+          "default": "latest"
+        }
+      }
+    },
+    "build": {
+      "description": "Configuration to build the application image",
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "description": "Enable/Disable building the application image",
+          "type": "boolean",
+          "default": true
+        },
+        "mode": {
+          "description": "Which mode to use to build the application",
+          "type": "string",
+          "enum": [
+            "s2i",
+            "bootable-jar"
+          ],
+          "default": "bootable-jar"
+        },
+        "uri": {
+          "description": "URI of GitHub repository",
+          "type": "string"
+        },
+        "ref": {
+          "description": "Git reference",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "contextDir": {
+          "description": "Context directory within your Git repo to use as the root for the build",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "sourceSecret": {
+          "description": "Name of the Secret to use when cloning Git source project",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "pullSecret": {
+          "description": "Name of the Pull Secret",
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "output": {
+          "description": "Configuration for the built application image",
+          "type": "object",
+          "properties": {
+            "kind": {
+              "description": "Determines where the application images will be pushed",
+              "type": "string",
+              "enum": [
+                "ImageStreamTag",
+                "DockerImage"
+              ],
+              "default": "ImageStreamTag"
+            },
+            "pushSecret": {
+              "description": "Name of the Push Secret",
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          }
+        },
+        "env": {
+          "description": "List of environment variables to set in the container. Cannot be updated.",
+          "items": {
+            "description": "EnvVar represents an environment variable present in a Container.",
+            "properties": {
+              "name": {
+                "description": "Name of the environment variable. Must be a C_IDENTIFIER.",
+                "type": "string"
+              },
+              "value": {
+                "description": "Variable references $(VAR_NAME) are expanded using the previous defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to \"\".",
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
+              "valueFrom": {
+                "description": "EnvVarSource represents a source for the value of an EnvVar.",
+                "properties": {
+                  "configMapKeyRef": {
+                    "description": "Selects a key from a ConfigMap.",
+                    "properties": {
+                      "key": {
+                        "description": "The key to select.",
+                        "type": "string"
+                      },
+                      "name": {
+                        "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
+                      },
+                      "optional": {
+                        "description": "Specify whether the ConfigMap or its key must be defined",
+                        "type": "boolean"
+                      }
+                    },
+                    "required": [
+                      "key"
+                    ],
+                    "type": "object"
+                  },
+                  "fieldRef": {
+                    "description": "ObjectFieldSelector selects an APIVersioned field of an object.",
+                    "properties": {
+                      "apiVersion": {
+                        "description": "Version of the schema the FieldPath is written in terms of, defaults to \"v1\".",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
+                      },
+                      "fieldPath": {
+                        "description": "Path of the field to select in the specified API version.",
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "fieldPath"
+                    ],
+                    "type": "object"
+                  },
+                  "resourceFieldRef": {
+                    "description": "ResourceFieldSelector represents container resources (cpu, memory) and their output format",
+                    "properties": {
+                      "containerName": {
+                        "description": "Container name: required for volumes, optional for env vars",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
+                      },
+                      "divisor": {
+                        "oneOf": [
+                          {
+                            "type": [
+                              "string",
+                              "null"
+                            ]
+                          },
+                          {
+                            "type": "integer"
+                          }
+                        ]
+                      },
+                      "resource": {
+                        "description": "Required: resource to select",
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "resource"
+                    ],
+                    "type": "object"
+                  },
+                  "secretKeyRef": {
+                    "description": "SecretKeySelector selects a key of a Secret.",
+                    "properties": {
+                      "key": {
+                        "description": "The key of the secret to select from.  Must be a valid secret key.",
+                        "type": "string"
+                      },
+                      "name": {
+                        "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
+                      },
+                      "optional": {
+                        "description": "Specify whether the Secret or its key must be defined",
+                        "type": "boolean"
+                      }
+                    },
+                    "required": [
+                      "key"
+                    ],
+                    "type": "object"
+                  }
+                },
+                "type": "object"
+              }
+            },
+            "required": [
+              "name"
+            ],
+            "type": "object"
+          },
+          "type": [
+            "array",
+            "null"
+          ]
+        },
+        "resources": {
+          "description": "Freeform resources field. More information: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/"
+        },
+        "images": {
+          "description": "Freeform images injected in the source during build."
+        },
+        "triggers": {
+          "description": "Webhooks to trigger building the application image",
+          "type": [
+            "object",
+            "null"
+          ],
+          "properties": {
+            "githubSecret": {
+              "description": "Name of the secret containing the WebHookSecretKey for the GitHub Webhook",
+              "type": "string"
+            },
+            "genericSecret": {
+              "description": "Name of the secret containing the WebHookSecretKey for the Generic Webhook",
+              "type": "string"
+            }
+          }
+        },
+        "s2i": {
+          "description": "Configuration specific to S2I Build (applicable only if build mode is set to s2i)",
+          "type": [
+            "object",
+            "null"
+          ],
+          "properties": {
+            "kind": {
+              "description": "Determines the type of images for S2I Builder and Runtime images",
+              "type": "string",
+              "enum": [
+                "ImageStreamTag",
+                "DockerImage",
+                "ImageStreamImage"
+              ],
+              "default": "DockerImage"
+            },
+            "jdk": {
+              "description": "JDK Version of the EAP S2I images",
+              "type": "string",
+              "enum": [
+                "17"
+              ],
+              "default": "17"
+            },
+            "jdk17": {
+              "description": "EAP S2I images for JDK 17",
+              "type": "object",
+              "properties": {
+                "builderImage": {
+                  "description": "EAP S2I Builder image for JDK 17",
+                  "type": "string"
+                },
+                "runtimeImage": {
+                  "description": "EAP S2I Runtime image for JDK 17",
+                  "type": "string"
+                }
+              }
+            },
+            "buildApplicationImage": {
+              "description": "Determine if the application image must be built. If false, the Helm release will  build the first artifact image (with the name of the Helm release)",
+              "type": "boolean",
+              "default": true
+            },
+            "builderKind": {
+              "description": "Determines the type of images for S2I Builder image. If omitted, the value of the kind properties is used",
+              "type": [
+                "string",
+                "null"
+              ],
+              "enum": [
+                "ImageStreamTag",
+                "DockerImage",
+                "ImageStreamImage"
+              ]
+            },
+            "runtimeKind": {
+              "description": "Determines the type of images for S2I Runtime image. If omitted, the value of the kind properties is used",
+              "type": [
+                "string",
+                "null"
+              ],
+              "enum": [
+                "ImageStreamTag",
+                "DockerImage",
+                "ImageStreamImage"
+              ]
+            },
+            "featurePacks": {
+              "description": "List of Galleon feature-packs identified by Maven coordinates (`<groupId>:<artifactId>:<version>`). Deprecated, the recommended way to provision EAP is to use the eap-maven-plugin in the application pom.xml",
+              "type": [
+                "string",
+                "array",
+                "null"
+              ],
+              "items": {
+                "type": "string"
+              }
+            },
+            "galleonDir": {
+              "description": "Directory relative to the root directory for the build that contains custom content for Galleon.",
+              "type": [
+                "string",
+                "null"
+              ]
+            },
+            "galleonLayers": {
+              "description": "List of Galleon Layers to provision. If galleonLayers are configured, the featurePacks that provides the layers must be specified (including EAP feature pack). Deprecated, the recommended way to provision EAP is to use the eap-maven-plugin in the application pom.xml",
+              "type": [
+                "string",
+                "array",
+                "null"
+              ],
+              "items": {
+                "type": "string"
+              }
+            },
+            "channels": {
+              "description": "List of Channels identified by Maven coordinates (`<groupId>:<artifactId>`). If featurePacks are configured without any versioning, the channels that provides the latest feature packs can be specified. Deprecated, the recommended way to provision EAP is to use the eap-maven-plugin in the application pom.xml",
+              "type": [
+                "string",
+                "array",
+                "null"
+              ],
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "bootableJar": {
+          "description": "Configuration specific to Bootable Jar Build (applicable only if build mode is set to bootable-jar)",
+          "type": [
+            "object",
+            "null"
+          ],
+          "properties": {
+            "builderImage": {
+              "description": "The JDK Builder image",
+              "type": [
+                "string",
+                "null"
+              ]
+            }
+          }
+        }
+      }
+    },
+    "deploy": {
+      "description": "Configuration to deploy the application",
+      "type": "object",
+      "properties": {
+        "annotations": {
+          "type": "object",
+          "description": "Annotations that are applied to the deployed application and its pods",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+        "enabled": {
+          "description": "Enable/Disable deploying the application image",
+          "type": "boolean",
+          "default": true
+        },
+        "replicas": {
+          "type": "integer",
+          "description": "Number of pod replicas to deploy"
+        },
+        "labels": {
+          "type": "object",
+          "description": "Labels that are applied to the deployed application and its pods",
+          "additionalProperties": {
+            "type": "string"
+          }
+        },
+        "resources": {
+          "description": "Freeform resources requirements to deploy the application image"
+        },
+        "env": {
+          "description": "List of environment variables to set in the container. Cannot be updated.",
+          "items": {
+            "description": "EnvVar represents an environment variable present in a Container.",
+            "properties": {
+              "name": {
+                "description": "Name of the environment variable. Must be a C_IDENTIFIER.",
+                "type": "string"
+              },
+              "value": {
+                "description": "Variable references $(VAR_NAME) are expanded using the previous defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to \"\".",
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
+              "valueFrom": {
+                "description": "EnvVarSource represents a source for the value of an EnvVar.",
+                "properties": {
+                  "configMapKeyRef": {
+                    "description": "Selects a key from a ConfigMap.",
+                    "properties": {
+                      "key": {
+                        "description": "The key to select.",
+                        "type": "string"
+                      },
+                      "name": {
+                        "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
+                      },
+                      "optional": {
+                        "description": "Specify whether the ConfigMap or its key must be defined",
+                        "type": "boolean"
+                      }
+                    },
+                    "required": [
+                      "key"
+                    ],
+                    "type": "object"
+                  },
+                  "fieldRef": {
+                    "description": "ObjectFieldSelector selects an APIVersioned field of an object.",
+                    "properties": {
+                      "apiVersion": {
+                        "description": "Version of the schema the FieldPath is written in terms of, defaults to \"v1\".",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
+                      },
+                      "fieldPath": {
+                        "description": "Path of the field to select in the specified API version.",
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "fieldPath"
+                    ],
+                    "type": "object"
+                  },
+                  "resourceFieldRef": {
+                    "description": "ResourceFieldSelector represents container resources (cpu, memory) and their output format",
+                    "properties": {
+                      "containerName": {
+                        "description": "Container name: required for volumes, optional for env vars",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
+                      },
+                      "divisor": {
+                        "oneOf": [
+                          {
+                            "type": [
+                              "string",
+                              "null"
+                            ]
+                          },
+                          {
+                            "type": "integer"
+                          }
+                        ]
+                      },
+                      "resource": {
+                        "description": "Required: resource to select",
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "resource"
+                    ],
+                    "type": "object"
+                  },
+                  "secretKeyRef": {
+                    "description": "SecretKeySelector selects a key of a Secret.",
+                    "properties": {
+                      "key": {
+                        "description": "The key of the secret to select from.  Must be a valid secret key.",
+                        "type": "string"
+                      },
+                      "name": {
+                        "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
+                        "type": [
+                          "string",
+                          "null"
+                        ]
+                      },
+                      "optional": {
+                        "description": "Specify whether the Secret or its key must be defined",
+                        "type": "boolean"
+                      }
+                    },
+                    "required": [
+                      "key"
+                    ],
+                    "type": "object"
+                  }
+                },
+                "type": "object"
+              }
+            },
+            "required": [
+              "name"
+            ],
+            "type": "object"
+          },
+          "type": [
+            "array",
+            "null"
+          ]
+        },
+        "envFrom": {
+          "description": "List of sources to populate environment variables in the container. The keys defined within a source must be a C_IDENTIFIER. All invalid keys will be reported as an event when the container is starting. When a key exists in multiple sources, the value associated with the last source will take precedence. Values defined by an Env with a duplicate key will take precedence. Cannot be updated.",
+          "items": {
+            "description": "EnvFromSource represents the source of a set of ConfigMaps",
+            "properties": {
+              "configMapRef": {
+                "description": "ConfigMapEnvSource selects a ConfigMap to populate the environment variables with.\n\nThe contents of the target ConfigMap's Data field will represent the key-value pairs as environment variables.",
+                "properties": {
+                  "name": {
+                    "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
+                  },
+                  "optional": {
+                    "description": "Specify whether the ConfigMap must be defined",
+                    "type": "boolean"
+                  }
+                },
+                "type": "object"
+              },
+              "prefix": {
+                "description": "An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER.",
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
+              "secretRef": {
+                "description": "SecretEnvSource selects a Secret to populate the environment variables with.\n\nThe contents of the target Secret's Data field will represent the key-value pairs as environment variables.",
+                "properties": {
+                  "name": {
+                    "description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
+                    "type": [
+                      "string",
+                      "null"
+                    ]
+                  },
+                  "optional": {
+                    "description": "Specify whether the Secret must be defined",
+                    "type": "boolean"
+                  }
+                },
+                "type": "object"
+              }
+            },
+            "type": "object"
+          },
+          "type": [
+            "array",
+            "null"
+          ]
+        },
+        "route": {
+          "description": "Route configuration",
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "description": "Enable/Disable creating a Route for the application",
+              "default": true,
+              "type": "boolean"
+            },
+            "host": {
+              "description": "alias/DNS that points to the service. If not specified a route name will typically be automatically chosen",
+              "type": "string"
+            },
+            "tls": {
+              "description": "TLS Configuration for the Route",
+              "type": "object",
+              "properties": {
+                "enabled": {
+                  "description": "Determines if the Route should be TLS-encrypted. If deploy.tls.enabled is true, the route will use the secure service to acess to the deployment",
+                  "default": true,
+                  "type": "boolean"
+                },
+                "termination": {
+                  "description": "Determines the type of TLS termination to use",
+                  "type": "string",
+                  "enum": [
+                    "edge",
+                    "reencrypt",
+                    "passthrough"
+                  ],
+                  "default": "edge"
+                },
+                "insecureEdgeTerminationPolicy": {
+                  "description": "Determines if insecure traffic should be redirected",
+                  "type": "string",
+                  "enum": [
+                    "Allow",
+                    "Disable",
+                    "Redirect"
+                  ],
+                  "default": "Redirect"
+                }
+              }
+            }
+          }
+        },
+        "tls": {
+          "description": "TLS Configuration",
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "description": "Enable the creation of a secure service to access the application.",
+              "default": false,
+              "type": "boolean"
+            }
+          }
+        },
+        "livenessProbe": {
+          "description": "Freeform livenessProbe configuration"
+        },
+        "readinessProbe": {
+          "description": "Freeform readinessProbe configuration"
+        },
+        "startupProbe": {
+          "description": "Freeform startupProbe configuration"
+        },
+        "volumeMounts": {
+          "description": "Freeform array of volumeMounts",
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "description": "VolumeMount describes a mounting of a Volume within a container.",
+            "required": [
+              "name",
+              "mountPath"
+            ],
+            "properties": {
+              "mountPath": {
+                "description": "Path within the container at which the volume should be mounted.  Must not contain ':'.",
+                "type": "string"
+              },
+              "mountPropagation": {
+                "description": "mountPropagation determines how mounts are propagated from the host to container and the other way around. When not set, MountPropagationHostToContainer is used. This field is alpha in 1.8 and can be reworked or removed in a future release.",
+                "type": [
+                  "string",
+                  "null"
+                ]
+              },
+              "name": {
+                "description": "This must match the Name of a Volume.",
+                "type": "string"
+              },
+              "readOnly": {
+                "description": "Mounted read-only if true, read-write otherwise (false or unspecified). Defaults to false.",
+                "type": "boolean"
+              },
+              "subPath": {
+                "description": "Path within the volume from which the container's volume should be mounted. Defaults to \"\" (volume's root).",
+                "type": [
+                  "string",
+                  "null"
+                ]
+              }
+            }
+          }
+        },
+        "volumes": {
+          "description": "Freeform array of volumes",
+          "type": [
+            "array",
+            "null"
+          ]
+        },
+        "initContainers": {
+          "description": "Freeform array of initContainers",
+          "type": [
+            "array",
+            "null"
+          ]
+        },
+        "extraContainers": {
+          "description": "Freeform array of extra containers",
+          "type": [
+            "array",
+            "null"
+          ]
+        },
+        "imagePullSecrets:": {
+          "description": "ImagePullSecrets is a list of references to secrets in the same namespace to use for pulling the application image",
+          "type": [
+            "array",
+            "null"
+          ],
+          "items": {
+            "description": "Reference to a secret in the same namespace.",
+            "required": [
+              "name"
+            ],
+            "properties": {
+              "name": {
+                "description": "Name of the referenced secret",
+                "type": "string"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
diff --git a/provisioners/src/test/java/org/jboss/intersmash/provision/helm/wildfly/Eap8HelmChartReleaseAdapterTest.java b/provisioners/src/test/java/org/jboss/intersmash/provision/helm/wildfly/EapHelmChartReleaseAdapterTest.java
similarity index 62%
rename from provisioners/src/test/java/org/jboss/intersmash/provision/helm/wildfly/Eap8HelmChartReleaseAdapterTest.java
rename to provisioners/src/test/java/org/jboss/intersmash/provision/helm/wildfly/EapHelmChartReleaseAdapterTest.java
index 15b8c14a7..8583e4119 100644
--- a/provisioners/src/test/java/org/jboss/intersmash/provision/helm/wildfly/Eap8HelmChartReleaseAdapterTest.java
+++ b/provisioners/src/test/java/org/jboss/intersmash/provision/helm/wildfly/EapHelmChartReleaseAdapterTest.java
@@ -4,9 +4,12 @@
 import java.util.stream.Collectors;
 
 import org.jboss.intersmash.model.helm.charts.values.eap8.HelmEap8Release;
+import org.jboss.intersmash.model.helm.charts.values.wildfly.Build;
 import org.jboss.intersmash.model.helm.charts.values.wildfly.HelmWildflyRelease;
+import org.jboss.intersmash.model.helm.charts.values.xp5.HelmXp5Release;
 import org.jboss.intersmash.provision.helm.Image;
 import org.jboss.intersmash.provision.helm.wildfly.eap8.Eap8HelmChartReleaseAdapter;
+import org.jboss.intersmash.provision.helm.wildfly.xp5.EapXp5HelmChartReleaseAdapter;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -18,7 +21,7 @@
  * their equivalent POJO) are working as expected, i.e. values are set properly to the adaptee and return expected
  * values once read.
  */
-class Eap8HelmChartReleaseAdapterTest {
+class EapHelmChartReleaseAdapterTest {
 
 	/**
 	 * Verify that the EAP 8 adapter for the EAP 8 values file POJO is properly storing and exposing the adaptee values
@@ -131,6 +134,7 @@ public void verifyWildFlyDynamicallyFilledAdapterTest() {
 				.withS2iChannel("ch1")
 				.withContextDir("context-dir")
 				.withBuildEnabled(Boolean.TRUE)
+				.withBuildMode(WildflyHelmChartRelease.BuildMode.BOOTABLE_JAR)
 				.withJdk17BuilderImage("jdk17-B")
 				.withJdk17RuntimeImage("jdk17-R")
 				.withBootableJarBuilderImage("BJ-I")
@@ -164,6 +168,7 @@ public void verifyWildFlyDynamicallyFilledAdapterTest() {
 		Assertions.assertEquals("fp1,fp2", actualAdaptee.getBuild().getS2i().getFeaturePacks());
 		Assertions.assertEquals("gl1,gl2", actualAdaptee.getBuild().getS2i().getGalleonLayers());
 		Assertions.assertEquals(Boolean.TRUE, actualAdaptee.getBuild().getEnabled());
+		Assertions.assertEquals(Build.Mode.BOOTABLE_JAR, actualAdaptee.getBuild().getMode());
 		Assertions.assertEquals("jdk17-B", actualAdaptee.getBuild().getS2i().getBuilderImage());
 		Assertions.assertEquals("jdk17-R", actualAdaptee.getBuild().getS2i().getRuntimeImage());
 		Assertions.assertEquals("BJ-I", actualAdaptee.getBuild().getBootableJar().getBuilderImage());
@@ -188,6 +193,7 @@ public void verifyWildFlyDynamicallyFilledAdapterTest() {
 		Assertions.assertEquals("gl1,gl2",
 				eap8HelmChartRelease.getS2iGalleonLayers().stream().collect(Collectors.joining(",")));
 		Assertions.assertEquals(Boolean.TRUE, eap8HelmChartRelease.isBuildEnabled());
+		Assertions.assertEquals(WildflyHelmChartRelease.BuildMode.BOOTABLE_JAR, eap8HelmChartRelease.getBuildMode());
 		Assertions.assertEquals("jdk17-B", eap8HelmChartRelease.getJdk17BuilderImage());
 		Assertions.assertEquals("jdk17-R", eap8HelmChartRelease.getJdk17RuntimeImage());
 		Assertions.assertEquals("BJ-I", eap8HelmChartRelease.getBootableJarBuilderImage());
@@ -202,4 +208,121 @@ public void verifyWildFlyDynamicallyFilledAdapterTest() {
 		Assertions.assertEquals(1, eap8HelmChartRelease.getDeploymentEnvironmentVariables().size());
 		Assertions.assertEquals(2, eap8HelmChartRelease.getInjectedImages().size());
 	}
+
+	/**
+	 * Verify that the EAP XP 5 adapter for the EAP XP 5values file POJO is properly storing and exposing the adaptee values
+	 */
+	@Test
+	public void verifyEapXp5DynamicallyFilledAdapterTest() {
+		// arrange
+		HelmXp5Release adaptee = new HelmXp5Release();
+		EapXp5HelmChartReleaseAdapter concreteAdapter = new EapXp5HelmChartReleaseAdapter(adaptee);
+		EapXp5HelmChartReleaseAdapter eapXp5HelmChartRelease = concreteAdapter;
+
+		SecretVolume secretVolume = new SecretVolume("v1", "s1");
+		eapXp5HelmChartRelease
+				.withSourceRepositoryUrl("url")
+				.withSourceRepositoryRef("ref")
+				.withS2iFeaturePacks("fp1,fp2")
+				.withS2iGalleonLayers("gl1,gl2")
+				.withS2iChannel("ch1")
+				.withContextDir("context-dir")
+				.withBuildEnabled(Boolean.TRUE)
+				.withBuildMode(WildflyHelmChartRelease.BuildMode.BOOTABLE_JAR)
+				.withJdk17BuilderImage("jdk17-B")
+				.withJdk17RuntimeImage("jdk17-R")
+				.withDeployEnabled(Boolean.FALSE)
+				.withReplicas(42)
+				.withRouteHost("route-host")
+				.withVolume(secretVolume.build())
+				.withVolumeMount(new VolumeMountBuilder()
+						.withName("vm1")
+						.withMountPath("mp1")
+						.withReadOnly(Boolean.TRUE).build())
+				.withRouteTLSEnabled(Boolean.FALSE)
+				.withTlsEnabled(Boolean.FALSE)
+				.withBuildEnvironmentVariable("a", "1")
+				.withDeploymentEnvironmentVariable("b", "2")
+				.withInjectedImage(
+						new Image(
+								new Image.From("ImageStreamTag", "openshift", "myImage:latest"),
+								List.of(new Image.Path("mySourcePath", "myDestPath"))))
+				.withInjectedImage(
+						new Image(
+								new Image.From("ImageStreamTag", "openshift", "anotherImage:latest"),
+								List.of(new Image.Path("anotherSourcePath", "anotherDestPath"))));
+
+		// act
+		final HelmXp5Release actualAdaptee = concreteAdapter.getAdaptee();
+
+		// assert
+		Assertions.assertEquals("url", actualAdaptee.getBuild().getUri());
+		Assertions.assertEquals("ref", actualAdaptee.getBuild().getRef());
+		Assertions.assertEquals("context-dir", actualAdaptee.getBuild().getContextDir());
+		Assertions.assertEquals("fp1,fp2", actualAdaptee.getBuild().getS2i().getFeaturePacks());
+		Assertions.assertEquals("gl1,gl2", actualAdaptee.getBuild().getS2i().getGalleonLayers());
+		Assertions.assertEquals("ch1", actualAdaptee.getBuild().getS2i().getChannels());
+		Assertions.assertEquals(Boolean.TRUE, actualAdaptee.getBuild().getEnabled());
+		Assertions.assertEquals("jdk17-B", actualAdaptee.getBuild().getS2i().getJdk17().getBuilderImage());
+		Assertions.assertEquals("jdk17-R", actualAdaptee.getBuild().getS2i().getJdk17().getRuntimeImage());
+		Assertions.assertEquals(org.jboss.intersmash.model.helm.charts.values.xp5.Build.Mode.BOOTABLE_JAR,
+				actualAdaptee.getBuild().getMode());
+		Assertions.assertEquals(Boolean.FALSE, actualAdaptee.getDeploy().getEnabled());
+		Assertions.assertEquals(42, actualAdaptee.getDeploy().getReplicas());
+		Assertions.assertEquals("route-host", actualAdaptee.getDeploy().getRoute().getHost());
+		Assertions.assertEquals(1, actualAdaptee.getDeploy().getVolumes().size());
+		Assertions.assertEquals(1, actualAdaptee.getDeploy().getVolumeMounts().size());
+		Assertions.assertEquals(Boolean.FALSE, actualAdaptee.getDeploy().getRoute().getTls().getEnabled());
+		Assertions.assertEquals(Boolean.FALSE, actualAdaptee.getDeploy().getTls().getEnabled());
+		Assertions.assertEquals(1, actualAdaptee.getBuild().getEnv().size());
+		Assertions.assertEquals(1, actualAdaptee.getDeploy().getEnv().size());
+		Assertions.assertTrue(List.class.isAssignableFrom(actualAdaptee.getBuild().getImages().getClass()));
+		List imagesInstancesList = (List) actualAdaptee.getBuild().getImages();
+		Assertions.assertEquals(2, imagesInstancesList.size());
+		Assertions.assertTrue(Image.class.isAssignableFrom(imagesInstancesList.get(0).getClass()));
+		// round trip check
+		Assertions.assertEquals("url", eapXp5HelmChartRelease.getSourceRepositoryUrl());
+		Assertions.assertEquals("ref", eapXp5HelmChartRelease.getSourceRepositoryRef());
+		Assertions.assertEquals("context-dir", eapXp5HelmChartRelease.getContextDir());
+		Assertions.assertEquals("fp1,fp2",
+				eapXp5HelmChartRelease.getS2iFeaturePacks().stream().collect(Collectors.joining(",")));
+		Assertions.assertEquals("gl1,gl2",
+				eapXp5HelmChartRelease.getS2iGalleonLayers().stream().collect(Collectors.joining(",")));
+		Assertions.assertEquals("ch1", eapXp5HelmChartRelease.getS2iChannels().stream().collect(Collectors.joining(",")));
+		Assertions.assertEquals(Boolean.TRUE, eapXp5HelmChartRelease.isBuildEnabled());
+		Assertions.assertEquals(WildflyHelmChartRelease.BuildMode.BOOTABLE_JAR, eapXp5HelmChartRelease.getBuildMode());
+		Assertions.assertEquals("jdk17-B", eapXp5HelmChartRelease.getJdk17BuilderImage());
+		Assertions.assertEquals("jdk17-R", eapXp5HelmChartRelease.getJdk17RuntimeImage());
+		Assertions.assertEquals(Boolean.FALSE, eapXp5HelmChartRelease.isDeployEnabled());
+		Assertions.assertEquals(42, eapXp5HelmChartRelease.getReplicas());
+		Assertions.assertEquals("route-host", eapXp5HelmChartRelease.getRouteHost());
+		Assertions.assertEquals(1, eapXp5HelmChartRelease.getVolumes().size());
+		Assertions.assertEquals(1, eapXp5HelmChartRelease.getVolumeMounts().size());
+		Assertions.assertEquals(Boolean.FALSE, eapXp5HelmChartRelease.isRouteTLSEnabled());
+		Assertions.assertEquals(Boolean.FALSE, eapXp5HelmChartRelease.isTlsEnabled());
+		Assertions.assertEquals(1, eapXp5HelmChartRelease.getBuildEnvironmentVariables().size());
+		Assertions.assertEquals(1, eapXp5HelmChartRelease.getDeploymentEnvironmentVariables().size());
+		Assertions.assertTrue(List.class.isAssignableFrom(actualAdaptee.getBuild().getImages().getClass()));
+		Assertions.assertEquals(2, eapXp5HelmChartRelease.getInjectedImages().size());
+	}
+
+	/**
+	 * Verify that the EAP XP 5 adapter properly sets even the S2I build mdoe value
+	 */
+	@Test
+	public void verifyEapXp5DynamicallyFilledAdapterS2iBuildModeTest() {
+		// arrange
+		HelmXp5Release adaptee = new HelmXp5Release();
+		EapXp5HelmChartReleaseAdapter concreteAdapter = new EapXp5HelmChartReleaseAdapter(adaptee);
+
+		concreteAdapter
+				.withBuildMode(WildflyHelmChartRelease.BuildMode.S2I);
+
+		final HelmXp5Release actualAdaptee = concreteAdapter.getAdaptee();
+
+		Assertions.assertEquals(org.jboss.intersmash.model.helm.charts.values.xp5.Build.Mode.S_2_I,
+				actualAdaptee.getBuild().getMode());
+		Assertions.assertEquals(WildflyHelmChartRelease.BuildMode.S2I, concreteAdapter.getBuildMode());
+	}
+
 }