diff --git a/upstreamed/mariadb/Chart.yaml b/upstreamed/mariadb/Chart.yaml
index 58f06736ec..59b643ad7d 100644
--- a/upstreamed/mariadb/Chart.yaml
+++ b/upstreamed/mariadb/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mariadb
-version: 5.7.1
+version: 5.7.2
 appVersion: 10.1.38
 description: Fast, reliable, scalable, and easy to use open-source relational database system. MariaDB Server is intended for mission-critical, heavy-load production systems as well as for embedding into mass-deployed software. Highly available MariaDB cluster.
 keywords:
diff --git a/upstreamed/mariadb/templates/_helpers.tpl b/upstreamed/mariadb/templates/_helpers.tpl
index 99ff7806d8..63438a2f6e 100644
--- a/upstreamed/mariadb/templates/_helpers.tpl
+++ b/upstreamed/mariadb/templates/_helpers.tpl
@@ -26,14 +26,14 @@ If release name contains chart name it will be used as a full name.
 
 {{- define "master.fullname" -}}
 {{- if .Values.replication.enabled -}}
-{{- printf "%s-%s" .Release.Name "mariadb-master" | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-%s" (include "mariadb.fullname" .) "master" | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
-{{- printf "%s-%s" .Release.Name "mariadb" | trunc 63 | trimSuffix "-" -}}
+{{- include "mariadb.fullname" . -}}
 {{- end -}}
 {{- end -}}
 
 {{- define "slave.fullname" -}}
-{{- printf "%s-%s" .Release.Name "mariadb-slave" | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-%s" (include "mariadb.fullname" .) "slave" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{- define "mariadb.chart" -}}
diff --git a/upstreamed/orangehrm/Chart.yaml b/upstreamed/orangehrm/Chart.yaml
index 1504436788..c6b191edbd 100644
--- a/upstreamed/orangehrm/Chart.yaml
+++ b/upstreamed/orangehrm/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: orangehrm
-version: 4.0.2
-appVersion: 4.2.0-1
+version: 4.0.3
+appVersion: 4.3.0-0
 description: OrangeHRM is a free HR management system that offers a wealth of modules
   to suit the needs of your business.
 keywords:
diff --git a/upstreamed/orangehrm/values.yaml b/upstreamed/orangehrm/values.yaml
index eb47163aba..b14ca78e4e 100644
--- a/upstreamed/orangehrm/values.yaml
+++ b/upstreamed/orangehrm/values.yaml
@@ -10,7 +10,7 @@
 image:
   registry: docker.io
   repository: bitnami/orangehrm
-  tag: 4.2.0-1
+  tag: 4.3.0-0
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images