diff --git a/.github/workflows/create-deploy-resources.yml b/.github/workflows/create-deploy-resources.yml
index 7b0a46592..c1a2065d0 100644
--- a/.github/workflows/create-deploy-resources.yml
+++ b/.github/workflows/create-deploy-resources.yml
@@ -48,7 +48,7 @@ jobs:
           distribution: temurin
           cache: maven
 
-      - name: Create k8s resources
+      - name: Create k8s resources and helm charts
         shell: bash
         run: scripts/generate-k8s-resources.sh
 
@@ -61,6 +61,6 @@ jobs:
         with:
           default_author: github_actions
           message: "Generate deploy resources (from ${{ github.workflow }} run # ${{ github.run_number }})"
-          add: '["**/deploy/k8s/*.yml", "deploy/k8s/*.yml", "**/deploy/docker-compose/*.yml", "deploy/docker-compose/*.yml", "deploy/db-init/**"]'
+          add: '["**/deploy/k8s/*.yml", "deploy/k8s/*.yml", "**/deploy/docker-compose/*.yml", "deploy/docker-compose/*.yml", "deploy/db-init/**", "**/deploy/helm/**]'
           pathspec_error_handling: exitImmediately
           new_branch: ${{ env.BRANCH }}
diff --git a/event-statistics/pom.xml b/event-statistics/pom.xml
index 3e1984e85..d5a0a2fcf 100644
--- a/event-statistics/pom.xml
+++ b/event-statistics/pom.xml
@@ -10,6 +10,7 @@
     <assertj.version>3.24.2</assertj.version>
     <awaitility.version>4.1.1</awaitility.version>
     <compiler-plugin.version>3.11.0</compiler-plugin.version>
+    <helm.version>1.0.8</helm.version>
     <maven.compiler.parameters>true</maven.compiler.parameters>
     <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -87,6 +88,11 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-opentelemetry</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkiverse.helm</groupId>
+      <artifactId>quarkus-helm</artifactId>
+      <version>${helm.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-junit5</artifactId>
diff --git a/rest-fights/pom.xml b/rest-fights/pom.xml
index 61a739eec..6bfe862ef 100644
--- a/rest-fights/pom.xml
+++ b/rest-fights/pom.xml
@@ -9,6 +9,7 @@
   <properties>
     <assertj.version>3.24.2</assertj.version>
     <compiler-plugin.version>3.11.0</compiler-plugin.version>
+    <helm.version>1.0.8</helm.version>
     <mapstruct.version>1.5.5.Final</mapstruct.version>
     <maven.compiler.parameters>true</maven.compiler.parameters>
     <maven.compiler.release>17</maven.compiler.release>
@@ -159,6 +160,11 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-opentelemetry</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkiverse.helm</groupId>
+      <artifactId>quarkus-helm</artifactId>
+      <version>${helm.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-junit5</artifactId>
diff --git a/rest-fights/src/main/resources/application.properties b/rest-fights/src/main/resources/application.properties
index 1a256cc33..0cb37cf95 100644
--- a/rest-fights/src/main/resources/application.properties
+++ b/rest-fights/src/main/resources/application.properties
@@ -122,3 +122,41 @@ quarkus.knative.labels.system=${quarkus.kubernetes.labels.system}
 %minikube.quarkus.config.profile.parent=prod
 %minikube.quarkus.kubernetes.deployment-target=minikube
 %minikube-17.quarkus.config.profile.parent=minikube
+
+# Helm
+## Version labels
+quarkus.helm.values."version".paths=\
+  (metadata.labels.app == ${quarkus.application.name}).*.labels.'app.kubernetes.io/version',\
+  (metadata.labels.app == ${quarkus.application.name}).*.selector.'app.kubernetes.io/version',\
+  (metadata.labels.app == ${quarkus.application.name}).*.matchLabels.'app.kubernetes.io/version',\
+  (kind == Role).metadata.'app.kubernetes.io/version',\
+  (kind == RoleBinding).metadata.'app.kubernetes.io/version'
+
+## Memory limits
+quarkus.helm.values."resources.limits.memory".paths=\
+  (metadata.labels.app == ${quarkus.application.name}).*.resources.limits.memory
+quarkus.helm.values."resources.requests.memory".paths=\
+  (metadata.labels.app == ${quarkus.application.name}).*.resources.requests.memory
+
+# OpenShift ImageStreams
+quarkus.helm.expressions.0.path=\
+  (kind == DeploymentConfig && metadata.labels.app == ${quarkus.application.name}).spec.template.spec.containers.(name == ${quarkus.application.name}).image
+quarkus.helm.expressions.0.expression=\
+  ${quarkus.application.name}:{{ .Values.app.version }}
+
+# OpenShift triggers
+quarkus.helm.expressions.1.path=\
+  (kind == DeploymentConfig && metadata.labels.app == ${quarkus.application.name}).spec.triggers.imageChangeParams.from.name
+quarkus.helm.expressions.1.expression=\
+  ${quarkus.application.name}:{{ .Values.app.version }}
+
+# K8S Deployment Image & KNative Service Image
+quarkus.helm.expressions.2.path=\
+  (kind == Deployment && metadata.labels.app == ${quarkus.application.name}).spec.template.spec.containers.(name == ${quarkus.application.name}).image
+quarkus.helm.expressions.2.expression=\
+  ${quarkus.container-image.registry}/${quarkus.container-image.group}/${quarkus.container-image.name}:{{ .Values.app.version }}
+
+quarkus.helm.expressions.3.path=\
+  (kind == Service && metadata.labels.app == ${quarkus.application.name}).spec.template.spec.containers.(name == ${quarkus.application.name}).image
+quarkus.helm.expressions.3.expression=\
+  ${quarkus.container-image.registry}/${quarkus.container-image.group}/${quarkus.container-image.name}:{{ .Values.app.version }}
diff --git a/rest-heroes/pom.xml b/rest-heroes/pom.xml
index 5690c0b72..e188bf997 100644
--- a/rest-heroes/pom.xml
+++ b/rest-heroes/pom.xml
@@ -9,6 +9,7 @@
   <properties>
     <assertj.version>3.24.2</assertj.version>
     <compiler-plugin.version>3.11.0</compiler-plugin.version>
+    <helm.version>1.0.8</helm.version>
     <mapstruct.version>1.5.5.Final</mapstruct.version>
     <maven.compiler.release>17</maven.compiler.release>
     <pact.version>1.0.1.Final</pact.version>
@@ -100,6 +101,11 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-opentelemetry</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkiverse.helm</groupId>
+      <artifactId>quarkus-helm</artifactId>
+      <version>${helm.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-junit5</artifactId>
diff --git a/rest-heroes/src/main/resources/application.yml b/rest-heroes/src/main/resources/application.yml
index 27891b91f..b5b23b90e 100644
--- a/rest-heroes/src/main/resources/application.yml
+++ b/rest-heroes/src/main/resources/application.yml
@@ -79,6 +79,27 @@ quarkus:
       app: "${quarkus.kubernetes.labels.app}"
       application: "${quarkus.openshift.part-of}"
       system: "${quarkus.kubernetes.labels.system}"
+  helm:
+    values:
+      "version":
+         paths: "(metadata.labels.app == ${quarkus.application.name}).*.labels.'app.kubernetes.io/version',(metadata.labels.app == ${quarkus.application.name}).*.selector.'app.kubernetes.io/version',(metadata.labels.app == ${quarkus.application.name}).*.matchLabels.'app.kubernetes.io/version',(kind == Role).metadata.'app.kubernetes.io/version',(kind == RoleBinding).metadata.'app.kubernetes.io/version'"
+      "resources.requests.memory":
+         paths: "(metadata.labels.app == ${quarkus.application.name}).*.resources.requests.memory"
+      "resources.limits.memory":
+         paths: "(metadata.labels.app == ${quarkus.application.name}).*.resources.limits.memory"
+    expressions:
+      '0':
+        path: "(kind == DeploymentConfig && metadata.labels.app == ${quarkus.application.name}).spec.template.spec.containers.(name == ${quarkus.application.name}).image"
+        expression: "${quarkus.application.name}:{{ .Values.app.version }}"
+      '1':
+        path: "(kind == DeploymentConfig && metadata.labels.app == ${quarkus.application.name}).spec.triggers.imageChangeParams.from.name"
+        expression: "${quarkus.application.name}:{{ .Values.app.version }}"
+      '2':
+        path: "(kind == Deployment && metadata.labels.app == ${quarkus.application.name}).spec.template.spec.containers.(name == ${quarkus.application.name}).image"
+        expression: "${quarkus.container-image.registry}/${quarkus.container-image.group}/${quarkus.container-image.name}:{{ .Values.app.version }}"
+      '3':
+        path: "(kind == Service && metadata.labels.app == ${quarkus.application.name}).spec.template.spec.containers.(name == ${quarkus.application.name}).image"
+        expression: "${quarkus.container-image.registry}/${quarkus.container-image.group}/${quarkus.container-image.name}:{{ .Values.app.version }}"
 
 "%dev":
   quarkus:
diff --git a/rest-villains/pom.xml b/rest-villains/pom.xml
index 605a8d37f..a064824e4 100644
--- a/rest-villains/pom.xml
+++ b/rest-villains/pom.xml
@@ -9,6 +9,7 @@
   <properties>
     <assertj.version>3.24.2</assertj.version>
     <compiler-plugin.version>3.11.0</compiler-plugin.version>
+    <helm.version>1.0.8</helm.version>
     <mapstruct.version>1.5.5.Final</mapstruct.version>
     <maven.compiler.release>17</maven.compiler.release>
     <pact.version>1.0.1.Final</pact.version>
@@ -100,6 +101,11 @@
       <groupId>io.opentelemetry.instrumentation</groupId>
       <artifactId>opentelemetry-jdbc</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkiverse.helm</groupId>
+      <artifactId>quarkus-helm</artifactId>
+      <version>${helm.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-junit5</artifactId>
diff --git a/rest-villains/src/main/resources/application.properties b/rest-villains/src/main/resources/application.properties
index f444896bd..8c1af7545 100644
--- a/rest-villains/src/main/resources/application.properties
+++ b/rest-villains/src/main/resources/application.properties
@@ -94,3 +94,45 @@ quarkus.knative.labels.system=${quarkus.kubernetes.labels.system}
 # Minikube
 %minikube.quarkus.config.profile.parent=prod
 %minikube.quarkus.kubernetes.deployment-target=minikube
+
+# Helm
+## Version labels
+quarkus.helm.values."version".paths=\
+  (metadata.labels.app == ${quarkus.application.name}).*.labels.'app.kubernetes.io/version',\
+  (metadata.labels.app == ${quarkus.application.name}).*.selector.'app.kubernetes.io/version',\
+  (metadata.labels.app == ${quarkus.application.name}).*.matchLabels.'app.kubernetes.io/version',\
+  (kind == Role).metadata.'app.kubernetes.io/version',\
+  (kind == RoleBinding).metadata.'app.kubernetes.io/version'
+
+## Memory limits
+quarkus.helm.values."resources.limits.memory".paths=\
+  (metadata.labels.app == ${quarkus.application.name}).*.resources.limits.memory
+quarkus.helm.values."resources.requests.memory".paths=\
+  (metadata.labels.app == ${quarkus.application.name}).*.resources.requests.memory
+
+# OpenShift ImageStreams
+quarkus.helm.expressions.0.path=\
+  (kind == DeploymentConfig && metadata.labels.app == ${quarkus.application.name}).spec.template.spec.containers.(name == ${quarkus.application.name}).image
+quarkus.helm.expressions.0.expression=\
+  ${quarkus.application.name}:{{ .Values.app.version }}
+
+# OpenShift triggers
+quarkus.helm.expressions.1.path=\
+  (kind == DeploymentConfig && metadata.labels.app == ${quarkus.application.name}).spec.triggers.imageChangeParams.from.name
+quarkus.helm.expressions.1.expression=\
+  ${quarkus.application.name}:{{ .Values.app.version }}
+
+# K8S Deployment Image & KNative Service Image
+quarkus.helm.expressions.2.path=\
+  (kind == Deployment && metadata.labels.app == ${quarkus.application.name}).spec.template.spec.containers.(name == ${quarkus.application.name}).image
+quarkus.helm.expressions.2.expression=\
+  ${quarkus.container-image.registry}/${quarkus.container-image.group}/${quarkus.container-image.name}:{{ .Values.app.version }}
+
+quarkus.helm.expressions.3.path=\
+  (kind == Service && metadata.labels.app == ${quarkus.application.name}).spec.template.spec.containers.(name == ${quarkus.application.name}).image
+quarkus.helm.expressions.3.expression=\
+  ${quarkus.container-image.registry}/${quarkus.container-image.group}/${quarkus.container-image.name}:{{ .Values.app.version }}
+
+
+
+
diff --git a/scripts/generate-k8s-resources.sh b/scripts/generate-k8s-resources.sh
index 6ffe38a8b..8806bd70b 100755
--- a/scripts/generate-k8s-resources.sh
+++ b/scripts/generate-k8s-resources.sh
@@ -1,17 +1,45 @@
-#!/bin/bash -ex
+#!/bin/bash
+# -u
+# -ex
+if [ "${DEBUG}" = true ]; then
+  set -u
+else
+  set -ex
+fi
 
 # Create the deploy/k8s files for each java version of each of the Quarkus services
 # Then add on the ui-super-heroes
 
-INPUT_DIR=src/main/kubernetes
-OUTPUT_DIR=deploy/k8s
+OUTPUT_DIR_K8S=deploy/k8s
+OUTPUT_DIR_HELM=deploy/helm
+
 DEPLOYMENT_TYPES=("kubernetes" "minikube" "openshift" "knative")
+PROJECTS=("rest-villains" "rest-heroes" "rest-fights" "event-statistics")
+KINDS=("java" "native")
+
+JAVA_VERSIONS=(17)
+NATIVE_JAVA_VERSION=17
+# Static initialization of version tuples
+# Each tuple contains, the kind (java or native), the java version and the version tag.
+# Native builds do not use all java versions, but a single one defined in NATIVE_JAVA_VERSION
+VERSION_TUPLES=( )
+for kind in "${KINDS[@]}"
+do
+  if [[ "$kind" == "native" ]]; then
+    VERSION_TUPLES+=( "$kind,$NATIVE_JAVA_VERSION,$kind" )
+  else
+    for javaVersion in "${JAVA_VERSIONS[@]}"
+    do
+      VERSION_TUPLES+=( "$kind,$javaVersion,$kind$javaVersion" )
+    done
+  fi
+done
 
 create_output_file() {
   local output_file=$1
 
   if [[ ! -f "$output_file" ]]; then
-    echo "Creating output file: $output_file"
+    # echo "Creating output file: $output_file"
     touch $output_file
   fi
 }
@@ -21,12 +49,13 @@ do_build() {
   local version_tag=$2
   local javaVersion=$3
   local kind=$4
+
   local container_tag="${version_tag}-latest"
   local git_server_url="${GITHUB_SERVER_URL:=https://github.com}"
   local git_repo="${GITHUB_REPOSITORY:=quarkusio/quarkus-super-heroes}"
   local github_ref_name="${BRANCH:=${GITHUB_REF_NAME:=main}}"
 
-  if [[ "$kind" == "native-" ]]; then
+  if [[ "$kind" == "native" ]]; then
     local mem_limit="128Mi"
     local mem_request="32Mi"
   else
@@ -34,12 +63,12 @@ do_build() {
     local mem_request="256Mi"
   fi
 
-  echo "Generating app resources for $project/$container_tag"
+  echo "Building app resources for $project/$version_tag"
   rm -rf $project/target
 
   printf -v deployment_types_str '%s,' "${DEPLOYMENT_TYPES[@]}"
 
-  $project/mvnw -f $project/pom.xml versions:set clean package \
+  $project/mvnw -q -f $project/pom.xml versions:set clean package \
     -DskipTests \
     -DnewVersion=$container_tag \
     -Dmaven.compiler.release=$javaVersion \
@@ -63,47 +92,140 @@ do_build() {
     -Dquarkus.knative.resources.limits.memory=$mem_limit \
     -Dquarkus.knative.resources.requests.memory=$mem_request \
     -Dquarkus.knative.annotations.\"app.openshift.io/vcs-url\"=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY \
-    -Dquarkus.knative.annotations.\"app.openshift.io/vcs-ref\"=$github_ref_name
+    -Dquarkus.knative.annotations.\"app.openshift.io/vcs-ref\"=$github_ref_name \
+    -Dquarkus.helm.version=1.0.0 \
+    -Dquarkus.helm.name=$project \
+    -Dquarkus.http.insecure-requests=disabled #Until https://github.com/quarkusio/quarkus/pull/33979 goes live (Quarkus 3.2 and backport)
+
+
+    # Bug in Dekorate: https://github.com/dekorateio/dekorate/pull/1217
+    # The spec.type in `service.yml` gets wrongly assigned to `ClusterIP`, but for `minikube` it must be `NodePort`.
+    # K8s generates the right value, but helm gets it wrong.
+    # Solution is to change the default value programmatically, but only for the `minikube` deployment type.
+    yq '.app.serviceType="NodePort"' -i $project/target/helm/minikube/$project/values.yaml
+
 }
 
-process_quarkus_project() {
+process_kubernetes_resources(){
   local project=$1
-  local deployment_type=$2
-  local version_tag=$3
-  local javaVersion=$4
-  local kind=$5
+  local version_tag=$2
+  local deployment_type=$3
+
+  echo "Processing k8s resources for ${project}:${deployment_type}"
+
   local output_filename="${version_tag}-${deployment_type}"
-  local app_generated_input_file="$project/target/kubernetes/${deployment_type}.yml"
-  local project_output_file="$project/$OUTPUT_DIR/${output_filename}.yml"
-  local all_apps_output_file="$OUTPUT_DIR/${output_filename}.yml"
+  local project_k8s_file="$project/$OUTPUT_DIR_K8S/${output_filename}.yml"
+  local all_apps_k8s_file="$OUTPUT_DIR_K8S/${output_filename}.yml"
+  local mvn_k8s_file="$project/target/kubernetes/${deployment_type}.yml"
 
-  rm -rf $project_output_file
+  mkdir -p $OUTPUT_DIR_K8S
+  mkdir -p $project/$OUTPUT_DIR_K8S
+  rm -rf $project_k8s_file
 
-  create_output_file $project_output_file
-  create_output_file $all_apps_output_file
+  create_output_file $project_k8s_file
+  create_output_file $all_apps_k8s_file
 
   # Now merge the generated resources to the top level (deploy/k8s)
-  if [[ -f "$app_generated_input_file" ]]; then
-    echo "Copying app generated input ($app_generated_input_file) to $project_output_file and $all_apps_output_file"
+  if [[ -f "$mvn_k8s_file" ]]; then
+    echo "Adding ${deployment_type} resources from ($mvn_k8s_file) to $project_k8s_file and $all_apps_k8s_file"
 
-    cat $app_generated_input_file >> $project_output_file
-    cat $app_generated_input_file >> $all_apps_output_file
+    cat $mvn_k8s_file >> $project_k8s_file
+    cat $mvn_k8s_file >> $all_apps_k8s_file
+
+  else
+    echo "****** The mvn_k8s_file file does not exit! $mvn_k8s_file  ************"
+    exit 255
   fi
 
   if [[ "$project" == "rest-fights" ]]; then
     # Create a descriptor for all of the downstream services (rest-heroes and rest-villains)
-    local all_downstream_output_file="$project/$OUTPUT_DIR/${output_filename}-all-downstream.yml"
-    local villains_output_file="rest-villains/$OUTPUT_DIR/${output_filename}.yml"
-    local heroes_output_file="rest-heroes/$OUTPUT_DIR/${output_filename}.yml"
+    local all_downstream_output_file="$project/$OUTPUT_DIR_K8S/${output_filename}-all-downstream.yml"
+    local villains_output_file="rest-villains/$OUTPUT_DIR_K8S/${output_filename}.yml"
+    local heroes_output_file="rest-heroes/$OUTPUT_DIR_K8S/${output_filename}.yml"
 
     rm -rf $all_downstream_output_file
 
     create_output_file $all_downstream_output_file
 
-    echo "Copying ${app_generated_input_file}, ${villains_output_file}, and $heroes_output_file to $all_downstream_output_file"
+    echo "Adding ${deployment_type} rest-fights resources ${mvn_k8s_file}, ${villains_output_file}, and $heroes_output_file to $all_downstream_output_file"
     cat $villains_output_file >> $all_downstream_output_file
     cat $heroes_output_file >> $all_downstream_output_file
-    cat $app_generated_input_file >> $all_downstream_output_file
+    cat $mvn_k8s_file >> $all_downstream_output_file
+  fi
+
+  if [ "${DEBUG}" = true ]; then
+     # Order the resources for testing purposes
+    echo "DEBUG: Sorting kubernetes resources at $project_k8s_file"
+    jbang yamlsort@someth2say -yamlpath "kind" -yamlpath "metadata.name" -i "${project_k8s_file}" > "${project_k8s_file}.sort";
+    mv -f "${project_k8s_file}.sort" "${project_k8s_file}"
+  fi
+}
+
+process_helm_resources(){
+    local project=$1
+    local deployment_type=$2
+    local version_tag=$3
+
+    local mvn_helm_dir="$project/target/helm/${deployment_type}/$project"
+    local project_helm_dir="$project/${OUTPUT_DIR_HELM}/${deployment_type}"
+    local all_apps_helm_dir="${OUTPUT_DIR_HELM}/${deployment_type}"
+
+    # Now copy the helm files into the deploy directory (deploy/helm) out of the transient target.
+    if [[ -d "$mvn_helm_dir" ]]; then
+      rm -rf $project_helm_dir
+      mkdir -p $project_helm_dir
+      echo "Copying generated helm chart $mvn_helm_dir to $project_helm_dir"
+      cp -R $mvn_helm_dir/* $project_helm_dir
+    else
+      echo "ERROR: The expected location of the maven generated helm chart is not found: $mvn_helm_dir"
+      exit
+    fi
+
+#    TODO: For rest-fights We should generate two different helm charts, one with "all-downstream" resources, and another without.
+#    if [[ "$project" == "rest-fights" ]]; then
+#      echo "Copying rest villain and heroes ${deployment_type} helm charts to the rest fights one "
+#      mkdir -p "${project_helm_dir}/charts/rest-villains"
+#      cp -R rest-villains/${OUTPUT_DIR_HELM}/${deployment_type}/* "${project_helm_dir}/charts/rest-villains"
+#      mkdir -p "${project_helm_dir}/charts/rest-heroes"
+#      cp -R rest-heroes/${OUTPUT_DIR_HELM}/${deployment_type}/* "${project_helm_dir}/charts/rest-heroes"
+#    fi
+
+#    echo "Copying generated helm chart $project_helm_dir to $all_apps_helm_dir"
+#    rm -rf $all_apps_helm_dir
+#    mkdir -p $all_apps_helm_dir
+#    cp -R $project_helm_dir/* $all_apps_helm_dir
+
+    # Execute templates into a k8s-like resources file.
+    # This is optional, and only enabled for testing purposes
+    if [ "${DEBUG}" = true ]; then
+      local project_helm_generated_dir=$project/deploy/helm/generated
+      mkdir -p $project_helm_generated_dir
+      local project_helm_generated_file=$project_helm_generated_dir/${version_tag}-$deployment_type.yml
+      echo "DEBUG: Applying and sorting helm resources for $project_helm_dir to $project_helm_generated_file"
+      helm template $project $project_helm_dir -f scripts/values-${version_tag}.yml > $project_helm_generated_file || exit
+      jbang yamlsort@someth2say -yamlpath "kind" -yamlpath "metadata.name" -i "$project_helm_generated_file" > "${project_helm_generated_file}.sort";
+      mv -f "${project_helm_generated_file}.sort" "$project_helm_generated_file"
+    fi
+}
+
+process_ui_project() {
+  local deployment_type=$1
+  local version_tag=$2
+  local project="ui-super-heroes"
+  local INPUT_DIR="src/main/kubernetes"
+  local project_input_directory="$project/$INPUT_DIR"
+  local input_file="$project_input_directory/${deployment_type}.yml"
+  local project_k8s_file="$project/$OUTPUT_DIR_K8S/app-${deployment_type}.yml"
+  local all_apps_k8s_file="$OUTPUT_DIR_K8S/${version_tag}-${deployment_type}.yml"
+
+  rm -rf $project_k8s_file
+  mkdir -p $project/$OUTPUT_DIR_K8S
+
+  if [[ -f "$input_file" ]]; then
+    create_output_file $project_k8s_file
+    echo "Adding UI resources at $input_file to $project_k8s_file and $all_apps_k8s_file"
+    cat $input_file >> $project_k8s_file
+    cat $input_file >> $all_apps_k8s_file
   fi
 }
 
@@ -117,7 +239,7 @@ create_monitoring() {
   for deployment_type in "kubernetes" "minikube" "openshift"
   do
     local output_file_name="${monitoring_name}-${deployment_type}.yml"
-    local output_file="$OUTPUT_DIR/$output_file_name"
+    local output_file="$OUTPUT_DIR_K8S/$output_file_name"
     local input_dir="$monitoring_name/k8s"
     create_output_file $output_file
 
@@ -133,39 +255,55 @@ create_monitoring() {
   done
 }
 
-rm -rf $OUTPUT_DIR/*.yml
+main(){
+  rm -rf $OUTPUT_DIR_K8S/*.yml
+  rm -rf OUTPUT_DIR_HELM/*.yml
 
-for kind in "" "native-"
-do
-  # Keeping this if/else here for the future when we might want to build multiple java versions
-  if [[ "$kind" == "native-" ]]; then
-    javaVersions=(17)
-  else
-    javaVersions=(17)
-#    javaVersions=(11 17)
+  local tag
+  local deployment_type
+  local project
+  local kind
+  local javaVersion
+  local version_tag
+
+  if [ "${DEBUG}" = true ]; then
+    echo "Kind,Java Version,Tag:" "${VERSION_TUPLES[@]}"
   fi
 
-  for javaVersion in ${javaVersions[@]}
+  for tag in "${VERSION_TUPLES[@]}"
   do
-    if [[ "$kind" == "native-" ]]; then
-      version_tag="native"
-    else
-      version_tag="${kind}java${javaVersion}"
-    fi
+    OLDIFS="$IFS"; IFS=','; set -- $tag;
+      kind=$1
+      javaVersion=$2
+      version_tag=$3
+    IFS="$OLDIFS"
 
-    for project in "rest-villains" "rest-heroes" "rest-fights" "event-statistics" "ui-super-heroes"
+    for project in "${PROJECTS[@]}"
     do
-      # Generate all the k8s resources for all deployment types in one shot
       do_build $project $version_tag $javaVersion $kind
 
-      for deployment_type in ${DEPLOYMENT_TYPES[@]}
+    done
+
+    for deployment_type in "${DEPLOYMENT_TYPES[@]}"
+    do
+      for project in "${PROJECTS[@]}"
       do
-        # For each deployment type, process the quarkus project
-        process_quarkus_project $project $deployment_type $version_tag $javaVersion $kind
+        process_kubernetes_resources $project $version_tag $deployment_type
+
+        process_helm_resources $project $deployment_type $version_tag
+
       done
     done
+
+    for deployment_type in "${DEPLOYMENT_TYPES[@]}"
+    do
+      process_ui_project $deployment_type $version_tag
+    done
+
   done
-done
 
-## Handle the monitoring
-create_monitoring
+  ## Handle the monitoring
+  create_monitoring
+}
+
+main
diff --git a/scripts/values-java17.yml b/scripts/values-java17.yml
new file mode 100644
index 000000000..eaf784c29
--- /dev/null
+++ b/scripts/values-java17.yml
@@ -0,0 +1,8 @@
+---
+app:
+  resources:
+    requests:
+      memory: 256Mi
+    limits:
+      memory: 768Mi
+  version: java17-latest
diff --git a/scripts/values-native.yml b/scripts/values-native.yml
new file mode 100644
index 000000000..3c0bbe724
--- /dev/null
+++ b/scripts/values-native.yml
@@ -0,0 +1,8 @@
+---
+app:
+  resources:
+    requests:
+      memory: 32Mi
+    limits:
+      memory: 128Mi
+  version: native-latest