diff --git a/charts/elasticsearch/Chart.yaml b/charts/elasticsearch/Chart.yaml
index 12166097af85d0477e573a2b65efebb8545116c6..5efd0a2e9d43587e14516c09b7ecc4856f4d2021 100644
--- a/charts/elasticsearch/Chart.yaml
+++ b/charts/elasticsearch/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.0.1
+version: 0.0.2
 
 appVersion: 6.8.22
diff --git a/charts/elasticsearch/README.md b/charts/elasticsearch/README.md
index 9020de1d346f76e35cb07d0cfe406043d53fb67e..89f6f532514034e6e740ab9ad83a39e4c16f00ef 100644
--- a/charts/elasticsearch/README.md
+++ b/charts/elasticsearch/README.md
@@ -1,6 +1,6 @@
 # Elasticsearch
 
-![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.8.22](https://img.shields.io/badge/AppVersion-6.8.22-informational?style=flat-square)
+![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.8.22](https://img.shields.io/badge/AppVersion-6.8.22-informational?style=flat-square)
 
 A Helm chart for Elasticsearch on Kubernetes
 
@@ -89,6 +89,7 @@ $ helm uninstall my-release
 | service.transportNodePort | int | `nil` | The transport node port (only relevant for type LoadBalancer or NodePort) |
 | service.clusterIP | string | `nil` | The cluster ip address (only relevant for type LoadBalancer or NodePort) |
 | service.loadBalancerIP | string | `nil` | The load balancer ip address (only relevant for type LoadBalancer) |
+| service.annotations | object | `{}` | Additional service annotations |
 
 ## Ingress parameters
 
diff --git a/charts/elasticsearch/templates/service.yaml b/charts/elasticsearch/templates/service.yaml
index e20d14baf4df0a2b6bfa736d1c66c164e3ef253a..a0ac0bf637d2a306b6c83acedbade63da6c2668b 100644
--- a/charts/elasticsearch/templates/service.yaml
+++ b/charts/elasticsearch/templates/service.yaml
@@ -3,7 +3,11 @@ kind: Service
 metadata:
   name: {{ include "elasticsearch.fullname" . }}
   labels:
-    {{- include "elasticsearch.labels" . | nindent 4 }}
+    {{- include "elasticsearch.labels" . | nindent 4 }}    
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:
diff --git a/charts/elasticsearch/values.yaml b/charts/elasticsearch/values.yaml
index 1c137cdc857adc5d8ab6e3b6dc3b91759469647e..6e7af2616662885df73098a362ca4ce35af6c0f0 100644
--- a/charts/elasticsearch/values.yaml
+++ b/charts/elasticsearch/values.yaml
@@ -51,6 +51,8 @@ service:
   clusterIP:
   ## The loadbalancer ip address (only relevant for type LoadBalancer)
   loadBalancerIP:
+  # Annotations to add to the service
+  annotations: {}
 
 ## Ingress configuration
 ingress:
diff --git a/charts/mariadb/Chart.yaml b/charts/mariadb/Chart.yaml
index e4c32b7eb45215599806dfb079005e0c0a954056..c646942bf9451fe98d64cd016f0b031218d5b85c 100644
--- a/charts/mariadb/Chart.yaml
+++ b/charts/mariadb/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.2.15
+version: 0.2.16
 
 appVersion: "10.5.13"
diff --git a/charts/mariadb/README.md b/charts/mariadb/README.md
index 713ea2a555ecefc8a84917279189c5a5323545fb..9bf80e56f1e475c4aa79d42f90dd2a0bb0bf7901 100644
--- a/charts/mariadb/README.md
+++ b/charts/mariadb/README.md
@@ -1,6 +1,6 @@
 # MariaDB
 
-![Version: 0.2.15](https://img.shields.io/badge/Version-0.2.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 10.5.13](https://img.shields.io/badge/AppVersion-10.5.13-informational?style=flat-square)
+![Version: 0.2.16](https://img.shields.io/badge/Version-0.2.16-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 10.5.13](https://img.shields.io/badge/AppVersion-10.5.13-informational?style=flat-square)
 
 A Helm chart for MariaDB on Kubernetes
 
@@ -82,6 +82,7 @@ $ helm uninstall my-release
 | service.nodePort | int | `nil` | The node port (only relevant for type LoadBalancer or NodePort) |
 | service.clusterIP | string | `nil` | The cluster ip address (only relevant for type LoadBalancer or NodePort) |
 | service.loadBalancerIP | string | `nil` | The load balancer ip address (only relevant for type LoadBalancer) |
+| service.annotations | object | `{}` | Additional service annotations |
 
 ## Storage parameters
 
diff --git a/charts/mariadb/templates/service.yaml b/charts/mariadb/templates/service.yaml
index 69af1321f10f3de2eb84919623320449ce0ae87a..42c40cf216934911c80a6b96f70b72741b509303 100644
--- a/charts/mariadb/templates/service.yaml
+++ b/charts/mariadb/templates/service.yaml
@@ -4,6 +4,10 @@ metadata:
   name: {{ include "mariadb.fullname" . }}
   labels:
     {{- include "mariadb.labels" . | nindent 4 }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:
diff --git a/charts/mariadb/values.yaml b/charts/mariadb/values.yaml
index a36f0c09c914f4757eb88fd5e59554ea3e9844a9..eee3979573d27c47d945ca3c329f9a7b8454b7dd 100644
--- a/charts/mariadb/values.yaml
+++ b/charts/mariadb/values.yaml
@@ -57,6 +57,8 @@ service:
   clusterIP:
   ## The loadbalancer ip address (only relevant for type LoadBalancer)
   loadBalancerIP:
+  # Annotations to add to the service
+  annotations: {}
 
 # Resource limits and requests
 resources: {}
diff --git a/charts/mongodb/Chart.yaml b/charts/mongodb/Chart.yaml
index 4810a850f51d84d9e05deb47eeea8cc1d678bf9e..6c78b31759b0d17cc06eb3890ae736282ec75dc3 100644
--- a/charts/mongodb/Chart.yaml
+++ b/charts/mongodb/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.3.5
+version: 0.3.6
 
 appVersion: "4.4.10"
diff --git a/charts/mongodb/README.md b/charts/mongodb/README.md
index 90929d0fb711d777398ac229aba5472c18a779a6..586b3b81fc4c72824d492853dd1daad1f659d73f 100644
--- a/charts/mongodb/README.md
+++ b/charts/mongodb/README.md
@@ -1,6 +1,6 @@
 # MongoDB
 
-![Version: 0.3.5](https://img.shields.io/badge/Version-0.3.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.4.10](https://img.shields.io/badge/AppVersion-4.4.10-informational?style=flat-square)
+![Version: 0.3.6](https://img.shields.io/badge/Version-0.3.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.4.10](https://img.shields.io/badge/AppVersion-4.4.10-informational?style=flat-square)
 
 A Helm chart for MongoDB on Kubernetes
 
@@ -83,6 +83,7 @@ $ helm uninstall my-release
 | service.nodePort | int | `nil` | The node port (only relevant for type LoadBalancer or NodePort) |
 | service.clusterIP | string | `nil` | The cluster ip address (only relevant for type LoadBalancer or NodePort) |
 | service.loadBalancerIP | string | `nil` | The load balancer ip address (only relevant for type LoadBalancer) |
+| service.annotations | object | `{}` | Additional service annotations |
 
 ## Storage parameters
 
diff --git a/charts/mongodb/templates/service.yaml b/charts/mongodb/templates/service.yaml
index 31357c0cba33fbecdd42ce634cd023ca4d4401b2..c76499d6464a14bba2a4a378cf6e81a849892c8b 100644
--- a/charts/mongodb/templates/service.yaml
+++ b/charts/mongodb/templates/service.yaml
@@ -4,6 +4,10 @@ metadata:
   name: {{ include "mongodb.fullname" . }}
   labels:
     {{- include "mongodb.labels" . | nindent 4 }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:
diff --git a/charts/mongodb/values.yaml b/charts/mongodb/values.yaml
index 91919943e1e884289bf90ed856c1755506792f00..90b4f0ef89cfbf0b80c8229bd865d5653538f43d 100644
--- a/charts/mongodb/values.yaml
+++ b/charts/mongodb/values.yaml
@@ -52,6 +52,8 @@ service:
   clusterIP:
   ## The loadbalancer ip address (only relevant for type LoadBalancer)
   loadBalancerIP:
+  # Annotations to add to the service
+  annotations: {}
 
 ## Resource limits and requests
 resources: {}
diff --git a/charts/postgres/Chart.yaml b/charts/postgres/Chart.yaml
index 93f3ba44e8e0f5c5e8e863852528252531233f32..4870492347622e824f19649f1947759928d2ca6e 100644
--- a/charts/postgres/Chart.yaml
+++ b/charts/postgres/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.3.2
+version: 0.2.15
 
-appVersion: "14.1"
+appVersion: "13.5"
diff --git a/charts/postgres/README.md b/charts/postgres/README.md
index 76bf508333b82a2dacf51c93318d2deace63dfd1..796f2942fed2c0717156baaad8b2b4565743051c 100644
--- a/charts/postgres/README.md
+++ b/charts/postgres/README.md
@@ -1,6 +1,6 @@
 # PostgreSQL
 
-![Version: 0.3.2](https://img.shields.io/badge/Version-0.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 14.1](https://img.shields.io/badge/AppVersion-14.1-informational?style=flat-square)
+![Version: 0.2.15](https://img.shields.io/badge/Version-0.2.15-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 13.5](https://img.shields.io/badge/AppVersion-13.5-informational?style=flat-square)
 
 A Helm chart for PostgreSQL on Kubernetes
 
@@ -90,6 +90,7 @@ $ helm uninstall my-release
 | service.nodePort | int | `nil` | The node port (only relevant for type LoadBalancer or NodePort) |
 | service.clusterIP | string | `nil` | The cluster ip address (only relevant for type LoadBalancer or NodePort) |
 | service.loadBalancerIP | string | `nil` | The load balancer ip address (only relevant for type LoadBalancer) |
+| service.annotations | object | `{}` | Additional service annotations |
 
 ## Storage parameters
 
diff --git a/charts/postgres/templates/service.yaml b/charts/postgres/templates/service.yaml
index d13b907fc15e799ac7ee60ad43c6ac60855010fc..40ac0468070bbfb311c9ed7833e9901fb4ab0cc8 100644
--- a/charts/postgres/templates/service.yaml
+++ b/charts/postgres/templates/service.yaml
@@ -4,6 +4,10 @@ metadata:
   name: {{ include "postgres.fullname" . }}
   labels:
     {{- include "postgres.labels" . | nindent 4 }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:
diff --git a/charts/postgres/values.yaml b/charts/postgres/values.yaml
index 87f367f3346d060abccb29d4326c0b7e2a3632e7..f1f499b4b54d33c90e99ab50d44fb53314fefdbb 100644
--- a/charts/postgres/values.yaml
+++ b/charts/postgres/values.yaml
@@ -54,6 +54,8 @@ service:
   clusterIP:
   ## The loadbalancer ip address (only relevant for type LoadBalancer)
   loadBalancerIP:
+  # Annotations to add to the service
+  annotations: {}
 
 resources: {}
   # limits:
diff --git a/charts/rabbitmq/Chart.yaml b/charts/rabbitmq/Chart.yaml
index 9ce507b6a4c6850303b9a8ab6cc47d09ce4dabad..9e734fbe07674a58c1dc80320385bb96bbcd22e9 100644
--- a/charts/rabbitmq/Chart.yaml
+++ b/charts/rabbitmq/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.4.5
+version: 0.3.11
 
-appVersion: "3.9.11"
+appVersion: "3.8.26"
diff --git a/charts/rabbitmq/README.md b/charts/rabbitmq/README.md
index 6614d88732c639ce6239ed4417b453cfaa781f4b..b780d7f4e60dd1dc5c2968cdfb0a5f77fbd0c95a 100644
--- a/charts/rabbitmq/README.md
+++ b/charts/rabbitmq/README.md
@@ -1,6 +1,6 @@
 # RabbitMQ
 
-![Version: 0.4.5](https://img.shields.io/badge/Version-0.4.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.9.11](https://img.shields.io/badge/AppVersion-3.9.11-informational?style=flat-square)
+![Version: 0.3.11](https://img.shields.io/badge/Version-0.3.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.8.26](https://img.shields.io/badge/AppVersion-3.8.26-informational?style=flat-square)
 
 A Helm chart for a RabbitMQ HA-cluster on Kubernetes
 
@@ -97,6 +97,7 @@ $ helm uninstall my-release
 | service.mgmt.nodePort | int | `nil` | Service node port (only relevant for type LoadBalancer or NodePort) |
 | service.prometheus.port | int | `15692` | Prometheus service port |
 | service.prometheus.nodePort | int | `nil` | Service node port (only relevant for type LoadBalancer or NodePort) |
+| service.annotations | object | `{}` | Additional service annotations |
 
 ## Extra services parameters
 
@@ -112,6 +113,7 @@ Section to define custom services
 | extraServices[].nodePort | int | `nil` | The node port (only relevant for type LoadBalancer or NodePort) |
 | extraServices[].clusterIP | string | `nil` | The cluster ip address (only relevant for type LoadBalancer or NodePort) |
 | extraServices[].loadBalancerIP | string | `nil` | The load balancer ip address (only relevant for type LoadBalancer) |
+| extraServices[].annotations | object | `{}` | Additional service annotations |
 
 ## Storage parameters
 
diff --git a/charts/rabbitmq/templates/extraservices.yaml b/charts/rabbitmq/templates/extraservices.yaml
index b85bd9ff0bb1a37f61d527ace9e0f84a284c9a7f..f9919df100de95d2508952aa58498a9e48299729 100644
--- a/charts/rabbitmq/templates/extraservices.yaml
+++ b/charts/rabbitmq/templates/extraservices.yaml
@@ -8,6 +8,10 @@ metadata:
   name: {{ $fullname }}-{{ $service.name }}
   labels:
     {{- $labels | nindent 4 }}
+  {{- with $service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ $service.type }}
   ports:
diff --git a/charts/rabbitmq/templates/service.yaml b/charts/rabbitmq/templates/service.yaml
index 9f3b7e65f81d47acbcc02b2594899459f6d0e54e..a5991da2aa9e619edc3a1b91914474019a47d37f 100644
--- a/charts/rabbitmq/templates/service.yaml
+++ b/charts/rabbitmq/templates/service.yaml
@@ -4,6 +4,10 @@ metadata:
   name: {{ include "rabbitmq.fullname" . }}
   labels:
     {{- include "rabbitmq.labels" . | nindent 4 }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   ports:
     - port: {{ .Values.service.amqp.port }}
diff --git a/charts/rabbitmq/values.yaml b/charts/rabbitmq/values.yaml
index c37de6f742c5016c4f4d1b6deae673b80749bcf9..96077fb63050edfcd9eee4ff634718424b3d2c2e 100644
--- a/charts/rabbitmq/values.yaml
+++ b/charts/rabbitmq/values.yaml
@@ -70,6 +70,8 @@ service:
   clusterIP:
   ## The loadbalancer ip address (only relevant for type LoadBalancer)
   loadBalancerIP:
+  # Annotations to add to the service
+  annotations: {}
 
 ## Custom list of extra services
 extraServices: []
@@ -88,6 +90,8 @@ extraServices: []
 #    clusterIP:
     ## The loadbalancer ip address (only relevant for type LoadBalancer)
 #    loadBalancerIP:
+    ## Annotations to add to the service
+#    annotations: {}
 
 ## Ingress configuration
 ingress:
diff --git a/charts/redis/Chart.yaml b/charts/redis/Chart.yaml
index 564b25a714424f2088b8c27a34b5971417527eb0..169d125e0dbad351665974ed3c5eab194fa953cf 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.4.8
+version: 0.4.9
 
 # This is the version number of the application being deployed.
 appVersion: "6.2.6"
diff --git a/charts/redis/README.md b/charts/redis/README.md
index 578c5e4d52ddf3c0e18e091a56a333559dd47f7d..141333066d01c7867741720fe703d6416bb3228f 100644
--- a/charts/redis/README.md
+++ b/charts/redis/README.md
@@ -1,6 +1,6 @@
 # Redis
 
-![Version: 0.4.8](https://img.shields.io/badge/Version-0.4.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.2.6](https://img.shields.io/badge/AppVersion-6.2.6-informational?style=flat-square)
+![Version: 0.4.9](https://img.shields.io/badge/Version-0.4.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.2.6](https://img.shields.io/badge/AppVersion-6.2.6-informational?style=flat-square)
 
 A Helm chart for Redis on Kubernetes
 
@@ -122,6 +122,7 @@ $ helm uninstall my-release
 | service.nodePort | int | `nil` | The node port (only relevant for type LoadBalancer or NodePort - not available when haMode is enabled) |
 | service.clusterIP | string | `nil` | The cluster ip address (only relevant for type LoadBalancer or NodePort) |
 | service.loadBalancerIP | string | `nil` | The load balancer ip address (only relevant for type LoadBalancer - not available when haMode is enabled) |
+| service.annotations | object | `{}` | Additional service annotations |
 
 ## Storage parameters
 
diff --git a/charts/redis/templates/service.yaml b/charts/redis/templates/service.yaml
index 42adcc0dcddf4b375f9e09bc2adbbc817e8caa38..ba83bc3c24dd71d0533f9862731a6d73a2ddc845 100644
--- a/charts/redis/templates/service.yaml
+++ b/charts/redis/templates/service.yaml
@@ -4,6 +4,10 @@ metadata:
   name: {{ include "redis.fullname" . }}
   labels:
     {{- include "redis.labels" . | nindent 4 }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   ports:
 {{- if .Values.haMode.enabled }}
diff --git a/charts/redis/values.yaml b/charts/redis/values.yaml
index 985ccdce40c1af7bcaad6e457773bc7a4e53c357..5735872827502a30de8de69a03284a13ddac266f 100644
--- a/charts/redis/values.yaml
+++ b/charts/redis/values.yaml
@@ -61,6 +61,8 @@ service:
   clusterIP:
   ## The loadbalancer ip address (only relevant for type LoadBalancer - not available when haMode is enabled)
   loadBalancerIP:
+  # Annotations to add to the service
+  annotations: {}
 
 ## Resource limits and requests (for Redis)
 resources: {}