diff --git a/charts/commento/Chart.yaml b/charts/commento/Chart.yaml
index 18f38fe5598c1bd6bb6d1031c7afa7febe68c16d..6d8d7fe9e9d66d5b13a2c40f918e31801657ec70 100644
--- a/charts/commento/Chart.yaml
+++ b/charts/commento/Chart.yaml
@@ -7,7 +7,7 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.1.28
+version: 0.1.29
 
 appVersion: "v1.8.0"
 
diff --git a/charts/commento/README.md b/charts/commento/README.md
index 504eed894c66649732a861c6ff9e286c949cd467..9d46fe146c19a6d8896621adc775b0bbc82a0882 100644
--- a/charts/commento/README.md
+++ b/charts/commento/README.md
@@ -1,6 +1,6 @@
 # Commento
 
-![Version: 0.1.28](https://img.shields.io/badge/Version-0.1.28-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.8.0](https://img.shields.io/badge/AppVersion-v1.8.0-informational?style=flat-square)
+![Version: 0.1.29](https://img.shields.io/badge/Version-0.1.29-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.8.0](https://img.shields.io/badge/AppVersion-v1.8.0-informational?style=flat-square)
 
 ## Changelog
 
@@ -63,7 +63,8 @@ helm uninstall my-release
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
-| image.repository | string | `"registry.gitlab.com/commento/commento"` | Image name |
+| image.registry | string | `"registry.gitlab.com"` | Image registry |
+| image.repository | string | `"commento/commento"` | Image name |
 | image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | Image pull secrets |
 | strategy | object | `{}` | Pod deployment strategy |
diff --git a/charts/commento/RELEASENOTES.md b/charts/commento/RELEASENOTES.md
index 11f371943cc818f4b9a4a51892583aa7bc85306d..9082f80c023a4866e370280ec005833ecb3372fd 100644
--- a/charts/commento/RELEASENOTES.md
+++ b/charts/commento/RELEASENOTES.md
@@ -10,4 +10,5 @@
 | 0.1.26 | v1.8.0 | Updated chart dependencies (postgres 0.2.19) |
 | 0.1.27 | v1.8.0 | Updated chart dependencies (postgres 0.2.20) |
 | 0.1.28 | v1.8.0 | Updated chart dependencies (postgres 0.2.21) |
+| 0.1.29 | v1.8.0 | Implemented support for image.registry option |
 | | | |
diff --git a/charts/commento/templates/deployment.yaml b/charts/commento/templates/deployment.yaml
index ff8d0eb9163fae40330163f7b49e10720d4c755b..67c38fc02efa12bbf5ada14b51106b9f9fde56a5 100644
--- a/charts/commento/templates/deployment.yaml
+++ b/charts/commento/templates/deployment.yaml
@@ -41,7 +41,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
diff --git a/charts/commento/values.yaml b/charts/commento/values.yaml
index 5f94a14dbba99cf5435e043586531ea13b2d8a82..15d757d1795e7e271fe2728bd6d13192326e869a 100644
--- a/charts/commento/values.yaml
+++ b/charts/commento/values.yaml
@@ -2,7 +2,8 @@
 
 ## Commento image
 image:
-  repository: registry.gitlab.com/commento/commento
+  registry: "registry.gitlab.com"
+  repository: "commento/commento"
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
diff --git a/charts/ghost/Chart.yaml b/charts/ghost/Chart.yaml
index b782c2c7046e20b1a91320c80e9f0c24ad9e194e..6d073a773134186ec59d6a1168900511a9e0a4af 100644
--- a/charts/ghost/Chart.yaml
+++ b/charts/ghost/Chart.yaml
@@ -7,7 +7,7 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.60.0
+version: 0.60.1
 
 appVersion: "5.16.2"
 
diff --git a/charts/ghost/README.md b/charts/ghost/README.md
index e409d1a281062b46294408206e66041fcbbf9459..90bd055d7c8f61eb1d3208d212293c85f5ffd817 100644
--- a/charts/ghost/README.md
+++ b/charts/ghost/README.md
@@ -1,6 +1,6 @@
 # Ghost
 
-![Version: 0.60.0](https://img.shields.io/badge/Version-0.60.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.16.2](https://img.shields.io/badge/AppVersion-5.16.2-informational?style=flat-square)
+![Version: 0.60.1](https://img.shields.io/badge/Version-0.60.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.16.2](https://img.shields.io/badge/AppVersion-5.16.2-informational?style=flat-square)
 
 ## Changelog
 
@@ -64,6 +64,7 @@ helm uninstall my-release
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
+| image.registry | string | `"docker.io"` | Image registry |
 | image.repository | string | `"ghost"` | Image name |
 | image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | Image pull secrets |
@@ -137,11 +138,12 @@ helm uninstall my-release
 | mysql.userDatabase.user | string | `nil` | User name with full access to ghost database |
 | mysql.userDatabase.password | string | `nil` | Password of the ghost database user |
 | mysql.storage | string | `nil` | MySQL storage parameter (see storage parameters) |
-| externalDatabase.host | string | `nil` | External database host |
-| externalDatabase.name | string | `"ghost"` | External database name |
 | externalDatabase.type | string | `"sqlite"` | External database type (mysql or mariadb - default: sqlite) |
-| externalDatabase.user | string | `nil` | External database user |
-| externalDatabase.password | string | `nil` | External database password |
+| externalDatabase.sqliteDatabaseFile | string | `"content/data/ghost.db"` | Path to default SQLite database (only sqlite) |
+| externalDatabase.host | string | `nil` | External database host (only mysql/mariadb) |
+| externalDatabase.name | string | `"ghost"` | External database name (only mysql/mariadb) |
+| externalDatabase.user | string | `nil` | External database user (only mysql/mariadb) |
+| externalDatabase.password | string | `nil` | External database password (only mysql/mariadb) |
 | settings.mode | string | `"production"` | Ghost mode (production or development) |
 | settings.url | string | `nil` | URL of Ghost blog |
 | settings.logToStdout | bool | `true`| Log to stdout by default (otherwise logging will go to stdout and file) |
diff --git a/charts/ghost/RELEASENOTES.md b/charts/ghost/RELEASENOTES.md
index 120b8112c260fa5716e680fdb7c6addbbdebf0d0..072cc5594c82dd08b136af8e4d709adf8e64fb33 100644
--- a/charts/ghost/RELEASENOTES.md
+++ b/charts/ghost/RELEASENOTES.md
@@ -57,4 +57,5 @@
 | 0.59.0 | 5.14.1 | Upgraded to Ghost 5.14.1 |
 | 0.59.1 | 5.14.2 | Upgraded to Ghost 5.14.2 |
 | 0.60.0 | 5.16.2 | Upgraded to Ghost 5.16.2 |
+| 0.60.1 | 5.16.2 | Implemented support for image.registry option |
 | | | |
diff --git a/charts/ghost/templates/deployment.yaml b/charts/ghost/templates/deployment.yaml
index 997f6828e82e0bb4711a921d128e43d90250e9f2..cee04e3b46d51b66c2ab6fa1339d7397b1328edc 100644
--- a/charts/ghost/templates/deployment.yaml
+++ b/charts/ghost/templates/deployment.yaml
@@ -41,7 +41,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
diff --git a/charts/ghost/templates/secureconfig.yaml b/charts/ghost/templates/secureconfig.yaml
index 7a78667402f8de7ee3a61fd453961fb8573d35ee..774bff1d283822a527c69829d40a38263e4ad627 100644
--- a/charts/ghost/templates/secureconfig.yaml
+++ b/charts/ghost/templates/secureconfig.yaml
@@ -35,6 +35,7 @@ data:
   database__connection__database: {{ .name | b64enc }}
   {{- else }}
   database__client: {{ "sqlite3" | b64enc }}
+  database__connection__filename: {{ .sqliteDatabaseFile | b64enc }}
   {{- end }}
   {{- end }}
 {{- end }}
diff --git a/charts/ghost/values.yaml b/charts/ghost/values.yaml
index df188daf41ecf9b4b123aecb5d92ff44640f2b0e..38be7950834426f40a0379f596beb5e1f818e1a1 100644
--- a/charts/ghost/values.yaml
+++ b/charts/ghost/values.yaml
@@ -2,7 +2,8 @@
 
 ## Ghost docker image
 image:
-  repository: ghost
+  registry: "docker.io"
+  repository: "ghost"
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
@@ -142,19 +143,22 @@ externalDatabase:
   ## Type of database ("mysql" or "mariadb" - default: sqlite)
   type: sqlite
 
+  ## Path to default SQLite database (only sqlite)
+  sqliteDatabaseFile: "content/data/ghost.db"
+
   ## Name of the database (default: ghost)
   name: ghost
 
-  ## Database user (only mysql)
+  ## Database user (only mysql/mariadb)
   user:
 
-  ## Database password (only mysql)
+  ## Database password (only mysql/mariadb)
   password:
 
-  ## Database host (only for mysql)
+  ## Database host (only for mysql/mariadb)
   host:
 
-  ## Database port (only for mysql)
+  ## Database port (only for mysql/mariadb)
   port:
 
 ## Ghost specific configuration
diff --git a/charts/gitea/Chart.yaml b/charts/gitea/Chart.yaml
index d46b5da1e92209c2412a539197ae7eb25ed03889..1e76caf446ef58e313049b138a8e75cf3aaaaab2 100644
--- a/charts/gitea/Chart.yaml
+++ b/charts/gitea/Chart.yaml
@@ -8,7 +8,7 @@ maintainers:
   - name: groundhog2k
 
 # This is the chart version
-version: 0.6.5
+version: 0.6.6
 
 # This is the version number of the application being deployed.
 appVersion: "1.17.2"
diff --git a/charts/gitea/README.md b/charts/gitea/README.md
index d897d776776a048e54c0c103fa99ac55eb380fd5..c7459fb5ebfdf69e1e5b8b7e476a42008070b642 100644
--- a/charts/gitea/README.md
+++ b/charts/gitea/README.md
@@ -1,6 +1,6 @@
 # Gitea
 
-![Version: 0.6.5](https://img.shields.io/badge/Version-0.6.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.17.2](https://img.shields.io/badge/AppVersion-1.17.2-informational?style=flat-square)
+![Version: 0.6.6](https://img.shields.io/badge/Version-0.6.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.17.2](https://img.shields.io/badge/AppVersion-1.17.2-informational?style=flat-square)
 
 ## Changelog
 
@@ -63,6 +63,7 @@ helm uninstall my-release
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
+| image.registry | string | `"docker.io"` | Image registry |
 | image.repository | string | `"gitea/gitea"` | Image name |
 | image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | Image pull secrets |
diff --git a/charts/gitea/RELEASENOTES.md b/charts/gitea/RELEASENOTES.md
index ca391806a8a0414fd9aecff2d448b6c176621b0d..fb586200a7273efabe9d16be9020655a9c55359a 100644
--- a/charts/gitea/RELEASENOTES.md
+++ b/charts/gitea/RELEASENOTES.md
@@ -28,4 +28,5 @@
 | 0.6.3 | 1.17.1 | Updated chart dependencies (mariadb 0.2.22) |
 | 0.6.4 | 1.17.2 | Updated to Gitea 1.17.2 |
 | 0.6.5 | 1.17.2 | Updated chart dependencies (redis 0.5.6) |
+| 0.6.6 | 1.17.2 | Implemented support for image.registry option |
 | | | |
diff --git a/charts/gitea/templates/deployment.yaml b/charts/gitea/templates/deployment.yaml
index f50b68117ff969088ea510bc6fc3f55ed213ffcb..829d8b35c042057077e0cf5f11a190e3d0b27091 100644
--- a/charts/gitea/templates/deployment.yaml
+++ b/charts/gitea/templates/deployment.yaml
@@ -42,7 +42,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           command: [ "/scripts/init.sh" ]
           volumeMounts:
             - name: scripts
@@ -57,7 +57,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command: [ "/app/gitea/gitea" ]
           ports:
diff --git a/charts/gitea/templates/post-install.yaml b/charts/gitea/templates/post-install.yaml
index 305d42ca57e975d1fc2a5d7432c3908e6d7251ee..95fde0a4de45762b100a387d79e8a13a832b7d10 100644
--- a/charts/gitea/templates/post-install.yaml
+++ b/charts/gitea/templates/post-install.yaml
@@ -22,7 +22,7 @@ spec:
         - name: {{ .Chart.Name }}-postinstall
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           envFrom:
             - secretRef:
diff --git a/charts/gitea/values.yaml b/charts/gitea/values.yaml
index 99c8dc83b3c7423066ffa0554512cdb8721aa993..6615449ef081d57f0aae18f491d7e8ca360d4e89 100644
--- a/charts/gitea/values.yaml
+++ b/charts/gitea/values.yaml
@@ -2,7 +2,8 @@
 
 ## Gitea docker image
 image:
-  repository: gitea/gitea
+  registry: "docker.io"
+  repository: "gitea/gitea"
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
diff --git a/charts/graylog/Chart.yaml b/charts/graylog/Chart.yaml
index 09e8a1bea8aa86d5f0ec18bca4a34d13dfff5542..4503ad76475095a736644f2b3b820bd153ac3f59 100644
--- a/charts/graylog/Chart.yaml
+++ b/charts/graylog/Chart.yaml
@@ -7,7 +7,7 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.4.10
+version: 0.4.11
 
 appVersion: "4.3.7-jre11"
 
diff --git a/charts/graylog/README.md b/charts/graylog/README.md
index 28c11e73ac5fc527529ee2ca7cce10065d627fdc..08c85634c2b807fe97f4b2823829b53b18a0e387 100644
--- a/charts/graylog/README.md
+++ b/charts/graylog/README.md
@@ -1,6 +1,6 @@
 # Graylog
 
-![Version: 0.4.10](https://img.shields.io/badge/Version-0.4.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.7-jre11](https://img.shields.io/badge/AppVersion-4.3.7--jre11-informational?style=flat-square)
+![Version: 0.4.11](https://img.shields.io/badge/Version-0.4.11-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 4.3.7-jre11](https://img.shields.io/badge/AppVersion-4.3.7--jre11-informational?style=flat-square)
 
 ## Changelog
 
@@ -60,10 +60,12 @@ helm uninstall my-release
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
+| image.registry | string | `"docker.io"` | Image registry |
 | image.repository | string | `"graylog/graylog"` | Image name |
 | image.tag | string | `""` | Image tag |
 | initImage.pullPolicy | string | `"IfNotPresent"` | Init container image pull policy |
-| initImage.repository | string | `"busybox"` | Default init container image |
+| initImage.registry | string | `"docker.io"` | Image registry |
+| initImage.repository | string | `"maxmindinc/geoipupdate"` | Default init container image |
 | initImage.tag | string | `"latest"` | Init container image tag |
 | imagePullSecrets | list | `[]` | Image pull secrets |
 | startupProbe | object | `see values.yaml` | Startup probe configuration |
diff --git a/charts/graylog/RELEASENOTES.md b/charts/graylog/RELEASENOTES.md
index 5bb93bce5d0c01a4732552b0207dd7f3294116fd..d684f644b63c2af5958c09f0893d2aab86580cea 100644
--- a/charts/graylog/RELEASENOTES.md
+++ b/charts/graylog/RELEASENOTES.md
@@ -23,4 +23,5 @@
 | 0.4.8 | 4.3.5-jre11 | Updated chart dependencies (mongodb 0.3.16) |
 | 0.4.9 | 4.3.6-jre11 | Updated chart for Graylog 4.3.6 |
 | 0.4.10 | 4.3.7-jre11 | Updated chart for Graylog 4.3.7 |
+| 0.4.11 | 4.3.7-jre11 | Implemented support for image.registry option |
 | | | |
diff --git a/charts/graylog/templates/statefulset.yaml b/charts/graylog/templates/statefulset.yaml
index cb5c55df33f1c6f72c323ab1f9335cd7064c69f3..221d18e0b8ac3ca1092f9ef345016bcdb2fbeeb1 100644
--- a/charts/graylog/templates/statefulset.yaml
+++ b/charts/graylog/templates/statefulset.yaml
@@ -44,7 +44,7 @@ spec:
             allowPrivilegeEscalation: false
             privileged: false
           {{- end }}
-          image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}"
+          image: "{{ .Values.initImage.registry }}/{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}"
           imagePullPolicy: {{ .Values.initImage.pullPolicy }}
           envFrom:
             - secretRef:
@@ -58,7 +58,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           command: [ "/scripts/init.sh" ]
           volumeMounts:
@@ -72,7 +72,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
diff --git a/charts/graylog/values.yaml b/charts/graylog/values.yaml
index d16725d5002db1abde588b57968b86c14b62e821..3750a52e4c6af416b0ae1589d4c7992a8ea1b578 100644
--- a/charts/graylog/values.yaml
+++ b/charts/graylog/values.yaml
@@ -2,14 +2,16 @@
 
 ## Graylog docker image
 image:
-  repository: graylog/graylog
+  registry: "docker.io"
+  repository: "graylog/graylog"
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
 
 # Default Init container image
 initImage:
-  repository: maxmindinc/geoipupdate
+  registry: "docker.io"
+  repository: "maxmindinc/geoipupdate"
   pullPolicy: IfNotPresent
   tag: "latest"
 
diff --git a/charts/mariadb/Chart.yaml b/charts/mariadb/Chart.yaml
index 476f11a6a33620fa2549a253bd19d08e8981cb7e..9622df5aedb554c06ddc946a307b1bf172a76f8c 100644
--- a/charts/mariadb/Chart.yaml
+++ b/charts/mariadb/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.6.2
+version: 0.6.3
 
 appVersion: "10.9.3"
diff --git a/charts/mariadb/README.md b/charts/mariadb/README.md
index b907eefddec3075fa94c0436db8f9471f18f0d50..be4806ed9fd0d718886828aacdd5f3ca4ee1377d 100644
--- a/charts/mariadb/README.md
+++ b/charts/mariadb/README.md
@@ -1,6 +1,6 @@
 # MariaDB
 
-![Version: 0.6.2](https://img.shields.io/badge/Version-0.6.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 10.9.3](https://img.shields.io/badge/AppVersion-10.9.3-informational?style=flat-square)
+![Version: 0.6.3](https://img.shields.io/badge/Version-0.6.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 10.9.3](https://img.shields.io/badge/AppVersion-10.9.3-informational?style=flat-square)
 
 ## Changelog
 
@@ -55,6 +55,7 @@ helm uninstall my-release
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
+| image.registry | string | `"docker.io"` | Image registry |
 | image.repository | string | `"mariadb"` | Image name |
 | image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | Image pull secrets |
diff --git a/charts/mariadb/RELEASENOTES.md b/charts/mariadb/RELEASENOTES.md
index 05eade4f1b6daacf2ab707b9a2103984aa4022b4..5f7b8d025a462402b8c88aca020bdac1ef835cc4 100644
--- a/charts/mariadb/RELEASENOTES.md
+++ b/charts/mariadb/RELEASENOTES.md
@@ -28,4 +28,5 @@
 | 0.6.0 | 10.9.2 | Upgraded MariaDB to 10.9.2 |
 | 0.6.1 | 10.9.3 | Upgraded MariaDB to 10.9.3 |
 | 0.6.2 | 10.9.3 | Implemented support for custom inline init scripts |
+| 0.6.3 | 10.9.3 | Implemented support for image.registry option |
 | | | |
diff --git a/charts/mariadb/templates/statefulset.yaml b/charts/mariadb/templates/statefulset.yaml
index 20454851dabb7040a2be111f4644fb01ff94833e..c8c0dbeb15ad06f4a2cc833a41dea371d99c56d3 100644
--- a/charts/mariadb/templates/statefulset.yaml
+++ b/charts/mariadb/templates/statefulset.yaml
@@ -44,7 +44,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
             {{- if .Values.extraScripts }}
@@ -79,7 +79,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: sql
diff --git a/charts/mariadb/values.yaml b/charts/mariadb/values.yaml
index 54411d63461c550e68d8a39164cefb87a5da2212..12192f6c289fe6a912303272d23815501496404c 100644
--- a/charts/mariadb/values.yaml
+++ b/charts/mariadb/values.yaml
@@ -2,7 +2,8 @@
 
 ## MariaDB docker image
 image:
-  repository: mariadb
+  registry: "docker.io"
+  repository: "mariadb"
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
diff --git a/charts/mongodb/Chart.yaml b/charts/mongodb/Chart.yaml
index 8cf443f6dd42d1dd34147eaf4045714776acd298..311a55d862c2efa997d5439caec06fad06e47440 100644
--- a/charts/mongodb/Chart.yaml
+++ b/charts/mongodb/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.5.1
+version: 0.5.2
 
 appVersion: "6.0.1"
diff --git a/charts/mongodb/README.md b/charts/mongodb/README.md
index 43c0d5f3a98c08a8d800e9cc1f97287f0ad62ea4..e772df1096ac27a57f5772b3df3b3eb513dc5ad5 100644
--- a/charts/mongodb/README.md
+++ b/charts/mongodb/README.md
@@ -1,6 +1,6 @@
 # MongoDB
 
-![Version: 0.5.1](https://img.shields.io/badge/Version-0.5.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.0.1](https://img.shields.io/badge/AppVersion-6.0.1-informational?style=flat-square)
+![Version: 0.5.2](https://img.shields.io/badge/Version-0.5.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.0.1](https://img.shields.io/badge/AppVersion-6.0.1-informational?style=flat-square)
 
 ## Changelog
 
@@ -55,6 +55,7 @@ helm uninstall my-release
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
+| image.registry | string | `"docker.io"` | Image registry |
 | image.repository | string | `"mongo"` | Image name |
 | image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | Image pull secrets |
diff --git a/charts/mongodb/RELEASENOTES.md b/charts/mongodb/RELEASENOTES.md
index 5d057fb9582e58d2fc7c260882eaa4422ba56318..7a1040d37894d0f0b51e3c594ff151bf5c03d552 100644
--- a/charts/mongodb/RELEASENOTES.md
+++ b/charts/mongodb/RELEASENOTES.md
@@ -31,4 +31,5 @@
 | 0.4.10 | 5.0.12 | Upgraded to MongoDB 5.0.12 |
 | 0.5.0 | 6.0.1 | Upgraded to MongoDB 6.0.1 |
 | 0.5.1 | 6.0.1 | Implemented support for custom inline init scripts |
+| 0.5.2 | 6.0.1 | Implemented support for image.registry option |
 | | | |
diff --git a/charts/mongodb/templates/statefulset.yaml b/charts/mongodb/templates/statefulset.yaml
index 8d0f811b75ebcb080b4cd5422ed458f2601c6548..1ae34bae3b5cb4dab89bfa00dac93e187dd2f250 100644
--- a/charts/mongodb/templates/statefulset.yaml
+++ b/charts/mongodb/templates/statefulset.yaml
@@ -44,7 +44,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
             {{- if .Values.extraScripts }}
@@ -79,7 +79,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: mongodb
diff --git a/charts/mongodb/values.yaml b/charts/mongodb/values.yaml
index 717d412345f21ddd77651b508042e74484f1efac..bc2670c3028c345a263c401c77df1c0df431d4a7 100644
--- a/charts/mongodb/values.yaml
+++ b/charts/mongodb/values.yaml
@@ -2,7 +2,8 @@
 
 ## MongoDB docker image
 image:
-  repository: mongo
+  registry: "docker.io"
+  repository: "mongo"
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
diff --git a/charts/mysql/Chart.yaml b/charts/mysql/Chart.yaml
index 3b00f2814bbf4c22565b6a9cec1286778d4f125a..629c4ef74c711a787fee458f2b31c395830a1bf0 100644
--- a/charts/mysql/Chart.yaml
+++ b/charts/mysql/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.1.2
+version: 0.1.3
 
 appVersion: "8.0.30-oracle"
diff --git a/charts/mysql/README.md b/charts/mysql/README.md
index 0b56cf1eb2293ac76ff066795dc43672cadc72ec..f9db420a7c279676313bf1dab426fc4ccd5d8761 100644
--- a/charts/mysql/README.md
+++ b/charts/mysql/README.md
@@ -1,6 +1,6 @@
 # MySQL
 
-![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.0.30](https://img.shields.io/badge/AppVersion-8.0.30--oracle-informational?style=flat-square)
+![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 8.0.30](https://img.shields.io/badge/AppVersion-8.0.30--oracle-informational?style=flat-square)
 
 ## Changelog
 
@@ -55,6 +55,7 @@ helm uninstall my-release
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
+| image.registry | string | `"docker.io"` | Image registry |
 | image.repository | string | `"mysql"` | Image name |
 | image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | Image pull secrets |
diff --git a/charts/mysql/RELEASENOTES.md b/charts/mysql/RELEASENOTES.md
index e36568048fb1c2691fd70f70e21ed12862ff5c72..7c31277c3cf3f5346ea4b456ff82d9f1560a4b58 100644
--- a/charts/mysql/RELEASENOTES.md
+++ b/charts/mysql/RELEASENOTES.md
@@ -5,4 +5,5 @@
 | 0.1.0 | 8.0.29 | Initial version of chart |
 | 0.1.1 | 8.0.30 | Upgraded MySQL to 8.0.30 |
 | 0.1.2 | 8.0.30 | Implemented support for custom inline init scripts |
+| 0.1.3 | 8.0.30 | Implemented support for image.registry option |
 | | | |
diff --git a/charts/mysql/templates/statefulset.yaml b/charts/mysql/templates/statefulset.yaml
index 007a5d8078c9ed68dac59163ee1935d96477e694..2da99769c487ba88abf5fc231e7fe63f5269e6d5 100644
--- a/charts/mysql/templates/statefulset.yaml
+++ b/charts/mysql/templates/statefulset.yaml
@@ -44,7 +44,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
             {{- if .Values.extraScripts }}
@@ -79,7 +79,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: sql
diff --git a/charts/mysql/values.yaml b/charts/mysql/values.yaml
index 8f9281b132f01289445e7d97939cd5fa30078605..9d6a613bc1a9afddf5d9c4382b9bfd70cc1d702b 100644
--- a/charts/mysql/values.yaml
+++ b/charts/mysql/values.yaml
@@ -2,7 +2,8 @@
 
 ## MySQL docker image
 image:
-  repository: mysql
+  registry: "docker.io"
+  repository: "mysql"
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
index 64d287fb3fd25e3d9597449b5e8789bf0f709723..344fe92410995f55e024e53bbf9f6c89f7c0c08e 100644
--- a/charts/nextcloud/Chart.yaml
+++ b/charts/nextcloud/Chart.yaml
@@ -8,7 +8,7 @@ maintainers:
   - name: groundhog2k
 
 # This is the chart version.
-version: 0.11.12
+version: 0.11.13
 
 # This is the version number of the application being deployed.
 appVersion: "24.0.5-apache"
diff --git a/charts/nextcloud/README.md b/charts/nextcloud/README.md
index 0bdbd1958fe3b96954a3892c866f6d5ce9d04be4..3d9a3c705c2fdccf6419d48bd3f901af42bcbe0a 100644
--- a/charts/nextcloud/README.md
+++ b/charts/nextcloud/README.md
@@ -1,6 +1,6 @@
 # Nextcloud
 
-![Version: 0.11.12](https://img.shields.io/badge/Version-0.11.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 24.0.5-apache](https://img.shields.io/badge/AppVersion-24.0.5-informational?style=flat-square)
+![Version: 0.11.13](https://img.shields.io/badge/Version-0.11.13-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 24.0.5-apache](https://img.shields.io/badge/AppVersion-24.0.5-informational?style=flat-square)
 
 ## Changelog
 
@@ -98,6 +98,7 @@ helm uninstall my-release
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
+| image.registry | string | `"docker.io"` | Image registry |
 | image.repository | string | `"nextcloud"` | Image name |
 | image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | Image pull secrets |
@@ -123,6 +124,7 @@ helm uninstall my-release
 | containerPort | int | `8000` | Internal http container port |
 | replicaCount | int | `1` | Number of replicas |
 | initImage.pullPolicy | string | `"IfNotPresent"` | Init container image pull policy |
+| initImage.registry | string | `"docker.io"` | Image registry |
 | initImage.repository | string | `"busybox"` | Default init container image |
 | initImage.tag | string | `"latest"` | Init container image tag |
 | postUpgradeHook.enabled | bool | `true` | Enable post upgrade hook |
diff --git a/charts/nextcloud/RELEASENOTES.md b/charts/nextcloud/RELEASENOTES.md
index f9b02a46aa8e5699290837b1e6dd62e4ed9e78e5..698443eac67e2abaecf4bff8f3d3ca32c15d9ce8 100644
--- a/charts/nextcloud/RELEASENOTES.md
+++ b/charts/nextcloud/RELEASENOTES.md
@@ -23,4 +23,5 @@
 | 0.11.10 | 24.0.4-apache | Updated chart dependencies (mariadb 0.2.22) |
 | 0.11.11 | 24.0.5-apache | Upgraded to Nextcloud 24.0.5 |
 | 0.11.12 | 24.0.5-apache | Updated chart dependencies (redis 0.5.6) |
+| 0.11.13 | 24.0.5-apache | Implemented support for image.registry option |
 | | | |
diff --git a/charts/nextcloud/templates/customconfigshook.yaml b/charts/nextcloud/templates/customconfigshook.yaml
index d55579424a2109642b0e8f26240b020496b8313c..2d8f6417992edc5c1352c70ef703d3cd0d28eb93 100644
--- a/charts/nextcloud/templates/customconfigshook.yaml
+++ b/charts/nextcloud/templates/customconfigshook.yaml
@@ -24,7 +24,7 @@ spec:
         - name: {{ .Chart.Name }}-postinstall
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - /bin/sh
diff --git a/charts/nextcloud/templates/deployment.yaml b/charts/nextcloud/templates/deployment.yaml
index e6b2f238a8de519e63d0a7187934420e77dc7344..8926e3b07b1175eb5b834ba01ff43dd3e622c96a 100644
--- a/charts/nextcloud/templates/deployment.yaml
+++ b/charts/nextcloud/templates/deployment.yaml
@@ -43,7 +43,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}"
+          image: "{{ .Values.initImage.registry }}/{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}"
           imagePullPolicy: {{ .Values.initImage.pullPolicy }}
           # set Nextcloud directories to 770 and allow access only by www-data
           args:
@@ -60,7 +60,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - /bin/sh
@@ -91,7 +91,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           envFrom:
             - secretRef:
diff --git a/charts/nextcloud/templates/postupgradehook.yaml b/charts/nextcloud/templates/postupgradehook.yaml
index a9291b84e471ad020132fcc5a1a4279aa4ad2557..73dde06eab7f9029da0a428c78ff6f43386366f8 100644
--- a/charts/nextcloud/templates/postupgradehook.yaml
+++ b/charts/nextcloud/templates/postupgradehook.yaml
@@ -24,7 +24,7 @@ spec:
         - name: {{ .Chart.Name }}-postupgrade
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           envFrom:
             - secretRef:
diff --git a/charts/nextcloud/values.yaml b/charts/nextcloud/values.yaml
index 91b6e3a727e0558d0cc43b0afb694d472860a749..28f2b839e9ed9b7f1794c23e07015bebf0736c3c 100644
--- a/charts/nextcloud/values.yaml
+++ b/charts/nextcloud/values.yaml
@@ -2,14 +2,16 @@
 
 ## Netxcloud docker image
 image:
-  repository: nextcloud
+  registry: "docker.io"
+  repository: "nextcloud"
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
 
 # Default Init container image
 initImage:
-  repository: busybox
+  registry: "docker.io"
+  repository: "busybox"
   pullPolicy: IfNotPresent
   tag: "latest"
 
diff --git a/charts/postgres/Chart.yaml b/charts/postgres/Chart.yaml
index 88985572449c0ee9cf65968902fd87f46f9ef4e9..afcd31ae2ab5c0b397c662c233b6ba9a49e4c76e 100644
--- a/charts/postgres/Chart.yaml
+++ b/charts/postgres/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.3.12
+version: 0.3.13
 
 appVersion: "14.5"
diff --git a/charts/postgres/README.md b/charts/postgres/README.md
index 935a724695e1da87fff21a10ba4e2fb53f2ef048..5033fd93a52dfd0d2de1fc5bfa694a58230ef7f2 100644
--- a/charts/postgres/README.md
+++ b/charts/postgres/README.md
@@ -1,6 +1,6 @@
 # PostgreSQL
 
-![Version: 0.3.12](https://img.shields.io/badge/Version-0.3.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 14.5](https://img.shields.io/badge/AppVersion-14.5-informational?style=flat-square)
+![Version: 0.3.13](https://img.shields.io/badge/Version-0.3.13-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 14.5](https://img.shields.io/badge/AppVersion-14.5-informational?style=flat-square)
 
 ## Changelog
 
@@ -59,6 +59,7 @@ helm uninstall my-release
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
+| image.registry | string | `"docker.io"` | Image registry |
 | image.repository | string | `"postgres"` | Image name |
 | image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | Image pull secrets |
diff --git a/charts/postgres/RELEASENOTES.md b/charts/postgres/RELEASENOTES.md
index 73679794bf8325a2685e6fd48aeaf1037185ca9e..26bda53a5a7054f5895381bf2164ad6793887584 100644
--- a/charts/postgres/RELEASENOTES.md
+++ b/charts/postgres/RELEASENOTES.md
@@ -17,4 +17,5 @@
 | 0.3.10 | 14.4 | Upgraded to Postgres 14.4 |
 | 0.3.11 | 14.5 | Upgraded to Postgres 14.5 |
 | 0.3.12 | 14.5 | Implemented support for custom inline init scripts |
+| 0.3.13 | 14.5 | Implemented support for image.registry option |
 | | | |
diff --git a/charts/postgres/templates/statefulset.yaml b/charts/postgres/templates/statefulset.yaml
index 44762f627e831f8ae4e744a0edcdffa1a7220b56..e3a5469b4b6ce60c4e55f9e6b60a760148f4e218 100644
--- a/charts/postgres/templates/statefulset.yaml
+++ b/charts/postgres/templates/statefulset.yaml
@@ -44,7 +44,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
             {{- if .Values.extraScripts }}
@@ -79,7 +79,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: postgres
diff --git a/charts/postgres/values.yaml b/charts/postgres/values.yaml
index b80c8f62a625171b2e42fbacb42d167c1b5182f8..ccd87ff04bd7628d826ed9e86d679d2216ae5f4f 100644
--- a/charts/postgres/values.yaml
+++ b/charts/postgres/values.yaml
@@ -2,7 +2,8 @@
 
 ## PostgreSQL docker image
 image:
-  repository: postgres
+  registry: "docker.io"
+  repository: "postgres"
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
diff --git a/charts/rabbitmq/Chart.yaml b/charts/rabbitmq/Chart.yaml
index b043daf0bf1333b97af4bccf220b58694923ca40..8e96fba0608b56e92555d73fc174c4aae6dad9ba 100644
--- a/charts/rabbitmq/Chart.yaml
+++ b/charts/rabbitmq/Chart.yaml
@@ -7,6 +7,6 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.5.8
+version: 0.5.9
 
 appVersion: "3.10.7"
diff --git a/charts/rabbitmq/README.md b/charts/rabbitmq/README.md
index 28c147142b7fda36b19e73ad467d81edad32776f..04f7bc8e9fb9d0f9e4b2eee51fa1196dee8d85f9 100644
--- a/charts/rabbitmq/README.md
+++ b/charts/rabbitmq/README.md
@@ -1,6 +1,6 @@
 # RabbitMQ
 
-![Version: 0.5.8](https://img.shields.io/badge/Version-0.5.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.10.7](https://img.shields.io/badge/AppVersion-3.10.7-informational?style=flat-square)
+![Version: 0.5.9](https://img.shields.io/badge/Version-0.5.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.10.7](https://img.shields.io/badge/AppVersion-3.10.7-informational?style=flat-square)
 
 ## Changelog
 
@@ -55,9 +55,11 @@ helm uninstall my-release
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
+| image.registry | string | `"docker.io"` | Image registry |
 | image.repository | string | `"rabbitmq"` | Image name |
 | image.tag | string | `""` | Image tag |
 | initImage.pullPolicy | string | `"IfNotPresent"` | Init image pull policy |
+| initImage.registry | string | `"docker.io"` | Image registry |
 | initImage.repository | string | `"busybox"` | Init image name |
 | initImage.tag | string | `"latest"` | Init image tag |
 | imagePullSecrets | list | `[]` | Image pull secrets |
diff --git a/charts/rabbitmq/RELEASENOTES.md b/charts/rabbitmq/RELEASENOTES.md
index 9a6405716be86ba42ee5a068c68592c67e5a5182..ebbb01f7765e8d528cb21627fbc02b381da80b75 100644
--- a/charts/rabbitmq/RELEASENOTES.md
+++ b/charts/rabbitmq/RELEASENOTES.md
@@ -35,4 +35,5 @@
 | 0.5.6 | 3.10.5 | Added service monitor support |
 | 0.5.7 | 3.10.6 | Added service monitor support |
 | 0.5.8 | 3.10.7 | Upgraded to RabbitMQ 3.10.7 |
+| 0.5.9 | 3.10.7 | Implemented support for image.registry option |
 | | | |
diff --git a/charts/rabbitmq/templates/statefulset.yaml b/charts/rabbitmq/templates/statefulset.yaml
index bdd289e8a45fe337a3974cee0e122c90b75ee3fa..3c249758cb4a8768838089f5e02d6e0a43da82c9 100644
--- a/charts/rabbitmq/templates/statefulset.yaml
+++ b/charts/rabbitmq/templates/statefulset.yaml
@@ -44,7 +44,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}"
+          image: "{{ .Values.initImage.registry }}/{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}"
           imagePullPolicy: {{ .Values.initImage.pullPolicy }}
           env:
             {{- if .Values.authentication.erlangCookie }}
@@ -83,7 +83,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: amqp
diff --git a/charts/rabbitmq/values.yaml b/charts/rabbitmq/values.yaml
index acda4e61e92bad221fcbdb1bf1a8adaf9603a855..a7e1d34479e7aeba00b303d0596214738d669bdd 100644
--- a/charts/rabbitmq/values.yaml
+++ b/charts/rabbitmq/values.yaml
@@ -2,14 +2,16 @@
 
 ## RabbitMQ docker image
 image:
-  repository: rabbitmq
+  registry: "docker.io"
+  repository: "rabbitmq"
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
 
 # Default Init container image
 initImage:
-  repository: busybox
+  registry: "docker.io"
+  repository: "busybox"
   pullPolicy: IfNotPresent
   tag: "latest"
 
diff --git a/charts/redis/Chart.yaml b/charts/redis/Chart.yaml
index cadc79653baeba94a41b8361da255ff0c6dad732..ffa72dc5e0f671f6c01ed4a1d63e2999168c09dc 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.5.7
+version: 0.5.8
 
 # This is the version number of the application being deployed.
 appVersion: "7.0.5"
diff --git a/charts/redis/README.md b/charts/redis/README.md
index 4cea37c77532aac51e5259098b273dc47d740886..5bb2cb490b186f7f9ce0e6acc18d3ab3d4f82c30 100644
--- a/charts/redis/README.md
+++ b/charts/redis/README.md
@@ -1,6 +1,6 @@
 # Redis
 
-![Version: 0.5.7](https://img.shields.io/badge/Version-0.5.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.0.5](https://img.shields.io/badge/AppVersion-7.0.5-informational?style=flat-square)
+![Version: 0.5.8](https://img.shields.io/badge/Version-0.5.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 7.0.5](https://img.shields.io/badge/AppVersion-7.0.5-informational?style=flat-square)
 
 ## Changelog
 
@@ -88,6 +88,7 @@ helm uninstall my-release
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
+| image.registry | string | `"docker.io"` | Image registry |
 | image.repository | string | `"redis"` | Image name |
 | image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | Image pull secrets |
diff --git a/charts/redis/RELEASENOTES.md b/charts/redis/RELEASENOTES.md
index 3f8f295403734b7fda8e2fa540391592efa965a8..1765a3a57d006e98ea6c9170a6a4223e37ee3f57 100644
--- a/charts/redis/RELEASENOTES.md
+++ b/charts/redis/RELEASENOTES.md
@@ -13,4 +13,5 @@
 | 0.5.5 | 7.0.4 | Upgraded to Redis 7.0.4 |
 | 0.5.6 | 7.0.4 | Fixed typo in README.md |
 | 0.5.7 | 7.0.5 | Upgraded to Redis 7.0.5 |
+| 0.5.8 | 7.0.5 | Implemented support for image.registry option |
 | | | |
diff --git a/charts/redis/templates/statefulset.yaml b/charts/redis/templates/statefulset.yaml
index 76e8d4642a22928c8704400069a669a72de72d47..ae1c4d4ed466e6507fb9e6a3f3481d7c7080fc47 100644
--- a/charts/redis/templates/statefulset.yaml
+++ b/charts/redis/templates/statefulset.yaml
@@ -46,7 +46,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
             - mountPath: /data
@@ -81,7 +81,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: redis
@@ -180,7 +180,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: sentinel
diff --git a/charts/redis/values.yaml b/charts/redis/values.yaml
index 221afc3b7d8d5a6a1362828540891dfb159b3a46..49458eed68e806bb6698681a58790eb6e8b22bb6 100644
--- a/charts/redis/values.yaml
+++ b/charts/redis/values.yaml
@@ -2,7 +2,8 @@
 
 ## Redis docker image
 image:
-  repository: redis
+  registry: "docker.io"
+  repository: "redis"
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
diff --git a/charts/remark42/Chart.yaml b/charts/remark42/Chart.yaml
index e33e24995c18efa8d1ebbce689eb4c3bd07c09d0..d3051229754406b3030f9564cdcd56b92ad22664 100644
--- a/charts/remark42/Chart.yaml
+++ b/charts/remark42/Chart.yaml
@@ -7,7 +7,7 @@ type: application
 maintainers:
   - name: groundhog2k
 
-version: 0.4.4
+version: 0.4.5
 
 appVersion: "v1.10.1"
 
diff --git a/charts/remark42/README.md b/charts/remark42/README.md
index 6db10d7eaae3aea73c7a3f25bc39a581e644400e..32452d1e6650fc79ccecc34ab0beeaad476dd351 100644
--- a/charts/remark42/README.md
+++ b/charts/remark42/README.md
@@ -1,6 +1,6 @@
 # Remark42
 
-![Version: 0.4.4](https://img.shields.io/badge/Version-0.4.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.10.1](https://img.shields.io/badge/AppVersion-v1.10.1-informational?style=flat-square)
+![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: v1.10.1](https://img.shields.io/badge/AppVersion-v1.10.1-informational?style=flat-square)
 
 A Helm chart for Remark42 on Kubernetes
 
@@ -59,6 +59,7 @@ helm uninstall my-release
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
+| image.registry | string | `"docker.io"` | Image registry |
 | image.repository | string | `"umputun/remark42"` | Image name |
 | image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | Image pull secrets |
diff --git a/charts/remark42/RELEASENOTES.md b/charts/remark42/RELEASENOTES.md
index 302dd45f20441913e387dbebb25aa50e808839b7..45792e536a475b25b90c36abc5042f253d5a53f4 100644
--- a/charts/remark42/RELEASENOTES.md
+++ b/charts/remark42/RELEASENOTES.md
@@ -12,4 +12,5 @@
 | 0.4.2 | v1.10.1 | Updated chart dependencies (redis 0.5.1) |
 | 0.4.3 | v1.10.1 | Updated chart dependencies (redis 0.5.5) |
 | 0.4.4 | v1.10.1 | Updated chart dependencies (redis 0.5.6) |
+| 0.4.5 | v1.10.1 | Implemented support for image.registry option |
 | | | |
diff --git a/charts/remark42/templates/deployment.yaml b/charts/remark42/templates/deployment.yaml
index 71b8d555f6a971da18be5891c59f3d0b363f476d..9e706e4f4f4263bdbd43a70d35c434ec6603b373 100644
--- a/charts/remark42/templates/deployment.yaml
+++ b/charts/remark42/templates/deployment.yaml
@@ -41,7 +41,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           volumeMounts:
             - mountPath: /srvtmp
               name: remark-vol
@@ -53,7 +53,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
diff --git a/charts/remark42/values.yaml b/charts/remark42/values.yaml
index 870d92d789283dd58884d3b61c6c6e7ec9500b37..540b0d7a33d8379e78cb9aba478086a59e29b4d2 100644
--- a/charts/remark42/values.yaml
+++ b/charts/remark42/values.yaml
@@ -2,7 +2,8 @@
 
 ## Commento image
 image:
-  repository: umputun/remark42
+  registry: "docker.io"
+  repository: "umputun/remark42"
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
diff --git a/charts/wordpress/Chart.yaml b/charts/wordpress/Chart.yaml
index 893bd5ed2c08352f49c0607568edf75d0bd8cc2d..64f02cf671c0dd737e78e7bd0acb3a6af8a215a2 100644
--- a/charts/wordpress/Chart.yaml
+++ b/charts/wordpress/Chart.yaml
@@ -8,7 +8,7 @@ maintainers:
 type: application
 
 # This is the chart version.
-version: 0.6.4
+version: 0.6.5
 
 # This is the version number of the application being deployed.
 appVersion: "6.0.2-apache"
diff --git a/charts/wordpress/README.md b/charts/wordpress/README.md
index 1fe4993f448966598891253718f35b6ea50bf981..53e2261efef738b4392161782fe28df26b9b71a2 100644
--- a/charts/wordpress/README.md
+++ b/charts/wordpress/README.md
@@ -1,6 +1,6 @@
 # Wordpress
 
-![Version: 0.6.4](https://img.shields.io/badge/Version-0.6.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.0.2-apache](https://img.shields.io/badge/AppVersion-6.0.2--apache-informational?style=flat-square)
+![Version: 0.6.5](https://img.shields.io/badge/Version-0.6.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.0.2-apache](https://img.shields.io/badge/AppVersion-6.0.2--apache-informational?style=flat-square)
 
 ## Changelog
 
@@ -61,6 +61,7 @@ helm uninstall my-release
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
+| image.registry | string | `"docker.io"` | Image registry |
 | image.repository | string | `"wordpress"` | Image name |
 | image.tag | string | `""` | Image tag |
 | imagePullSecrets | list | `[]` | Image pull secrets |
diff --git a/charts/wordpress/RELEASENOTES.md b/charts/wordpress/RELEASENOTES.md
index 0fd9aa98067333dfcb0b24d15301b121203a0d24..56bd085a1be7c832c14fc792e5b2e0aa1fe5ac38 100644
--- a/charts/wordpress/RELEASENOTES.md
+++ b/charts/wordpress/RELEASENOTES.md
@@ -14,4 +14,5 @@
 | 0.6.2 | 6.0.1-apache | Upgraded to Wordpress 6.0.1 |
 | 0.6.3 | 6.0.1-apache | Updated chart dependencies (mariadb 0.2.22) |
 | 0.6.4 | 6.0.2-apache | Upgraded to Wordpress 6.0.2 |
+| 0.6.5 | 6.0.2-apache | Implemented support for image.registry option |
 | | | |
diff --git a/charts/wordpress/templates/deployment.yaml b/charts/wordpress/templates/deployment.yaml
index 4531a2fe6e299ec52996bd14c0ddcc587a093ae5..8f2a1b7694852b65b54d7f6ac123f09f37ae091d 100644
--- a/charts/wordpress/templates/deployment.yaml
+++ b/charts/wordpress/templates/deployment.yaml
@@ -42,7 +42,7 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           envFrom:
             - secretRef:
diff --git a/charts/wordpress/values.yaml b/charts/wordpress/values.yaml
index 91715e4699b0d1a89ace382415ffe65ce2ddb4f9..0eac2facf0a58af16f9d24efea974bf0cf3dfcaf 100644
--- a/charts/wordpress/values.yaml
+++ b/charts/wordpress/values.yaml
@@ -5,7 +5,8 @@ replicaCount: 1
 
 ## Netxcloud docker image
 image:
-  repository: wordpress
+  registry: "docker.io"
+  repository: "wordpress"
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""