diff --git a/charts/app/Chart.yaml b/charts/app/Chart.yaml
index fda53e1..a84a706 100644
--- a/charts/app/Chart.yaml
+++ b/charts/app/Chart.yaml
@@ -3,7 +3,7 @@ name: app
 description: A Helm chart for Kubernetes Deployment
 type: application
 
-version: 0.15.2
+version: 0.15.3
 
 keywords:
   - deployment
diff --git a/charts/argo-applications/Chart.yaml b/charts/argo-applications/Chart.yaml
index 3e46589..3f9b488 100644
--- a/charts/argo-applications/Chart.yaml
+++ b/charts/argo-applications/Chart.yaml
@@ -3,7 +3,7 @@ name: argo-applications
 description: A Helm chart for Kubernetes argo applications
 type: application
 
-version: 0.15.2
+version: 0.15.3
 
 keywords:
   - argocd
diff --git a/charts/argo-workflows/Chart.yaml b/charts/argo-workflows/Chart.yaml
index 7630762..7b6868a 100644
--- a/charts/argo-workflows/Chart.yaml
+++ b/charts/argo-workflows/Chart.yaml
@@ -3,7 +3,7 @@ name: argo-workflows
 description: A Helm chart for Kubernetes argocd workflows
 type: application
 
-version: 0.15.2
+version: 0.15.3
 
 keywords:
   - argocd
diff --git a/charts/base/Chart.yaml b/charts/base/Chart.yaml
index 16a388a..046ec1a 100644
--- a/charts/base/Chart.yaml
+++ b/charts/base/Chart.yaml
@@ -3,7 +3,7 @@ name: base
 description: A Helm chart for Kubernetes with helm named templates
 type: library
 
-version: 0.15.2
+version: 0.15.3
 
 keywords:
   - deployment
diff --git a/charts/base/templates/_horizontalPodAutoscaler.tpl b/charts/base/templates/_horizontalPodAutoscaler.tpl
index 1413e7f..3f26af2 100644
--- a/charts/base/templates/_horizontalPodAutoscaler.tpl
+++ b/charts/base/templates/_horizontalPodAutoscaler.tpl
@@ -28,16 +28,26 @@ spec:
       resource:
         name: memory
         target:
+          {{- if hasKey . "AverageValue" }}
+          type: {{ .type | default "AverageValue" | quote  }}
+          averageValue: {{ .averageValue }}
+          {{- else }}
           type: {{ .type | default "Utilization" | quote  }}
           averageUtilization: {{ .averageUtilization | default 50 }}
+          {{- end }}
   {{- end }}
   {{- range .Values.autoscaling.cpu }}
     - type: Resource
       resource:
         name: cpu
         target:
-          type: {{ .type | default "Utilization" | quote }}
+          {{- if hasKey . "AverageValue" }}
+          type: {{ .type | default "AverageValue" | quote  }}
+          averageValue: {{ .averageValue }}
+          {{- else }}
+          type: {{ .type | default "Utilization" | quote  }}
           averageUtilization: {{ .averageUtilization | default 50 }}
+          {{- end }}
   {{- end }}
   {{- range .Values.autoscaling.pubsub_subscription }}
     - type: External
diff --git a/charts/cronjob/Chart.yaml b/charts/cronjob/Chart.yaml
index b82ba1f..3aa862d 100644
--- a/charts/cronjob/Chart.yaml
+++ b/charts/cronjob/Chart.yaml
@@ -3,7 +3,7 @@ name: cronjob
 description: A Helm chart for Kubernetes cronjob
 type: application
 
-version: 0.15.2
+version: 0.15.3
 
 keywords:
   - cronjob
diff --git a/charts/default-base/Chart.yaml b/charts/default-base/Chart.yaml
index 33189f3..a5a4307 100644
--- a/charts/default-base/Chart.yaml
+++ b/charts/default-base/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: default-base
 description: A Helm chart for Kubernetes - default-base for namespaces
 
-version: 0.15.2
+version: 0.15.3
 
 keywords:
   - BackendConfig
diff --git a/charts/ingress/Chart.yaml b/charts/ingress/Chart.yaml
index 3a738fa..3553427 100644
--- a/charts/ingress/Chart.yaml
+++ b/charts/ingress/Chart.yaml
@@ -3,7 +3,7 @@ name: ingress
 description: A Helm chart for Kubernetes ingress
 type: application
 
-version: 0.15.2
+version: 0.15.3
 
 keywords:
   - ingress
diff --git a/charts/job/Chart.yaml b/charts/job/Chart.yaml
index 1e4c0b6..bdbbc27 100644
--- a/charts/job/Chart.yaml
+++ b/charts/job/Chart.yaml
@@ -3,7 +3,7 @@ name: job
 description: A Helm chart for Kubernetes job
 type: application
 
-version: 0.15.2
+version: 0.15.3
 
 keywords:
   - job
diff --git a/charts/prometheus-rules/Chart.yaml b/charts/prometheus-rules/Chart.yaml
index 9d9cc11..8debd6f 100644
--- a/charts/prometheus-rules/Chart.yaml
+++ b/charts/prometheus-rules/Chart.yaml
@@ -3,7 +3,7 @@ name: prometheus-rules
 description: A Helm chart for Prometheus Rules
 type: application
 
-version: 0.15.2
+version: 0.15.3
 
 keywords:
   - job
diff --git a/charts/rbac/Chart.yaml b/charts/rbac/Chart.yaml
index d102940..e0d9e7c 100644
--- a/charts/rbac/Chart.yaml
+++ b/charts/rbac/Chart.yaml
@@ -3,7 +3,7 @@ name: rbac
 description: A Helm chart for Kubernetes rbac
 type: application
 
-version: 0.15.2
+version: 0.15.3
 
 keywords:
   - rbac
diff --git a/charts/service/Chart.yaml b/charts/service/Chart.yaml
index 740f6da..f5d755d 100644
--- a/charts/service/Chart.yaml
+++ b/charts/service/Chart.yaml
@@ -3,7 +3,7 @@ name: service
 description: A Helm chart for Kubernetes service
 type: application
 
-version: 0.15.2
+version: 0.15.3
 
 keywords:
   - service