diff --git a/charts/mariadb/Chart.yaml b/charts/mariadb/Chart.yaml
index 18326a289dad2ed0b4a707ed8e22f5bf20e84c44..dfe030e1dcf6ecba92c9ccede0d638a14f6e77fc 100644
--- a/charts/mariadb/Chart.yaml
+++ b/charts/mariadb/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.2.8
+version: 0.2.9
 
 appVersion: "10.5.8"
diff --git a/charts/mariadb/README.md b/charts/mariadb/README.md
index 6f58970e5dede06d28cebe4b6e43e8be02d99235..beceab63c5214767b4750302e6be8c7ba135c1d9 100644
--- a/charts/mariadb/README.md
+++ b/charts/mariadb/README.md
@@ -1,6 +1,6 @@
 # MariaDB
 
-![Version: 0.2.8](https://img.shields.io/badge/Version-0.2.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 10.5.8](https://img.shields.io/badge/AppVersion-10.5.8-informational?style=flat-square)
+![Version: 0.2.9](https://img.shields.io/badge/Version-0.2.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 10.5.8](https://img.shields.io/badge/AppVersion-10.5.8-informational?style=flat-square)
 
 A Helm chart for MariaDB on Kubernetes
 
diff --git a/charts/mariadb/templates/service-internal.yaml b/charts/mariadb/templates/service-internal.yaml
deleted file mode 100644
index bdd58c04cae92bb12201b9dba9fa77c2b15817f7..0000000000000000000000000000000000000000
--- a/charts/mariadb/templates/service-internal.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "mariadb.fullname" . }}-internal
-  labels:
-    {{- include "mariadb.labels" . | nindent 4 }}
-spec:
-  type: ClusterIP
-  clusterIP: None
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: sql
-      protocol: TCP
-      name: sql
-  selector:
-    {{- include "mariadb.selectorLabels" . | nindent 4 }}
diff --git a/charts/mariadb/templates/statefulset.yaml b/charts/mariadb/templates/statefulset.yaml
index 70ffc8e2cad133df898ba8d713e914b9515c6730..f0a6d069b502d0e08e1ecab70b3609fe915c4526 100644
--- a/charts/mariadb/templates/statefulset.yaml
+++ b/charts/mariadb/templates/statefulset.yaml
@@ -6,7 +6,7 @@ metadata:
     {{- include "mariadb.labels" . | nindent 4 }}
 spec:
   replicas: 1
-  serviceName: {{ include "mariadb.fullname" . }}-internal
+  serviceName: {{ include "mariadb.fullname" . }}
   selector:
     matchLabels:
       {{- include "mariadb.selectorLabels" . | nindent 6 }}
diff --git a/charts/postgres/Chart.yaml b/charts/postgres/Chart.yaml
index cb9156e91b34340c481b866f107a806bb6ce4dd9..8a73ea3ceb16e252ee15002bb69da0cb95f1e528 100644
--- a/charts/postgres/Chart.yaml
+++ b/charts/postgres/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.2.7
+version: 0.2.8
 
 appVersion: "13.1"
diff --git a/charts/postgres/README.md b/charts/postgres/README.md
index dc35fb945f5593c71e382bfc4d43334d953f5fcb..5b72a3bf9b33d24788693623433fdd5c306e11d0 100644
--- a/charts/postgres/README.md
+++ b/charts/postgres/README.md
@@ -1,6 +1,6 @@
 # PostgreSQL
 
-![Version: 0.2.7](https://img.shields.io/badge/Version-0.2.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 13.1](https://img.shields.io/badge/AppVersion-13.1-informational?style=flat-square)
+![Version: 0.2.8](https://img.shields.io/badge/Version-0.2.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 13.1](https://img.shields.io/badge/AppVersion-13.1-informational?style=flat-square)
 
 A Helm chart for PostgreSQL on Kubernetes
 
diff --git a/charts/postgres/templates/service-internal.yaml b/charts/postgres/templates/service-internal.yaml
deleted file mode 100644
index e9545b98c48ec47bb663c859f6c5b1759d7ce649..0000000000000000000000000000000000000000
--- a/charts/postgres/templates/service-internal.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "postgres.fullname" . }}-internal
-  labels:
-    {{- include "postgres.labels" . | nindent 4 }}
-spec:
-  type: ClusterIP
-  clusterIP: None
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: postgres
-      protocol: TCP
-      name: postgres
-  selector:
-    {{- include "postgres.selectorLabels" . | nindent 4 }}
diff --git a/charts/postgres/templates/statefulset.yaml b/charts/postgres/templates/statefulset.yaml
index 24bd3739ab9650ff0adc4f738d6d5068d9024eee..9f6a2028f6c09d417b6630299174c8d8eb45de44 100644
--- a/charts/postgres/templates/statefulset.yaml
+++ b/charts/postgres/templates/statefulset.yaml
@@ -6,7 +6,7 @@ metadata:
     {{- include "postgres.labels" . | nindent 4 }}
 spec:
   replicas: 1
-  serviceName: {{ include "postgres.fullname" . }}-internal
+  serviceName: {{ include "postgres.fullname" . }}
   selector:
     matchLabels:
       {{- include "postgres.selectorLabels" . | nindent 6 }}
@@ -43,14 +43,14 @@ spec:
               protocol: TCP
           env:
             - name: PGDATA
-              value: /var/lib/postgresql/data/pg
+              value: "/var/lib/postgresql/data/pg"
             {{- if .Values.settings.authMethod }}
             - name: POSTGRES_HOST_AUTH_METHOD
-              value: {{ .Values.settings.authMethod }}
+              value: {{ .Values.settings.authMethod | quote }}
             {{- end }}
             {{- if .Values.settings.initDbArgs }}
             - name: POSTGRES_INITDB_ARGS
-              value: {{ .Values.settings.initDbArgs }}
+              value: {{ .Values.settings.initDbArgs | quote }}
             {{- end }}
           {{- with .Values.env }}
             {{- toYaml . | nindent 12 }}
diff --git a/charts/redis/Chart.yaml b/charts/redis/Chart.yaml
index 984847aed8dd12da60ad395c3cbb5c59253e134e..5f84a48d99c6d41aff93a3052415888f10573742 100644
--- a/charts/redis/Chart.yaml
+++ b/charts/redis/Chart.yaml
@@ -8,7 +8,7 @@ maintainers:
   - name: groundhog2k
 
 # This is the chart version
-version: 0.2.8
+version: 0.2.9
 
 # This is the version number of the application being deployed.
 appVersion: "6.0.10"
diff --git a/charts/redis/README.md b/charts/redis/README.md
index 46e44bf7db3e4a33875641836f081aea08fd4eba..ee8d71db150ea46ca6ea30fee56772994fafc68c 100644
--- a/charts/redis/README.md
+++ b/charts/redis/README.md
@@ -1,6 +1,6 @@
 # Redis
 
-![Version: 0.2.8](https://img.shields.io/badge/Version-0.2.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.0.10](https://img.shields.io/badge/AppVersion-6.0.10-informational?style=flat-square)
+![Version: 0.2.9](https://img.shields.io/badge/Version-0.2.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.0.10](https://img.shields.io/badge/AppVersion-6.0.10-informational?style=flat-square)
 
 A Helm chart for Redis on Kubernetes
 
diff --git a/charts/redis/templates/service-internal.yaml b/charts/redis/templates/service-internal.yaml
deleted file mode 100644
index ed13c5248237f7c99751885bedae066af27e3b14..0000000000000000000000000000000000000000
--- a/charts/redis/templates/service-internal.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "redis.fullname" . }}-internal
-  labels:
-    {{- include "redis.labels" . | nindent 4 }}
-spec:
-  type: ClusterIP
-  clusterIP: None
-  ports:
-    - port: {{ .Values.service.port }}
-      targetPort: redis
-      protocol: TCP
-      name: redis
-  selector:
-    {{- include "redis.selectorLabels" . | nindent 4 }}
diff --git a/charts/redis/templates/statefulset.yaml b/charts/redis/templates/statefulset.yaml
index c8bca76e7c5e8a3a7d10833046c82e403babf6c0..3c964f9ceb75c62966677b1f4354d2090815cc80 100644
--- a/charts/redis/templates/statefulset.yaml
+++ b/charts/redis/templates/statefulset.yaml
@@ -6,7 +6,7 @@ metadata:
     {{- include "redis.labels" . | nindent 4 }}
 spec:
   replicas: 1
-  serviceName: {{ include "redis.fullname" . }}-internal
+  serviceName: {{ include "redis.fullname" . }}
   selector:
     matchLabels:
       {{- include "redis.selectorLabels" . | nindent 6 }}