diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53e6808fa131e78799f80f875e66b8fc4a002f0f..57a9e57ed8cf5a88345b8334a98235a32bbb0f78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [0.3.1] - 2021-09-30
+
+* Fix database service name for standalone architecture
+
 ## [0.3.0] - 2021-09-28
 
 * Cron overhaul:
diff --git a/Chart.yaml b/Chart.yaml
index 662d7f153c8ba6e961471940552d31c59dd8267e..bd18adaf46539fe7d0fa1a3d01ff47bffde27335 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -5,7 +5,7 @@ description: WordPress with a replicated MariaDB backend
 name: wordpress
 # Please only change the chart version as part of the release procedure: see
 # RELEASING.md
-version: 0.3.0
+version: 0.3.1
 icon: https://make.wordpress.org/design/files/2016/09/WordPress-logotype-wmark.png
 dependencies:
   - name: mariadb
diff --git a/values.yaml b/values.yaml
index 93ae529df36b3ffbe6e27b3cbe42927540d3e5ae..e71e9255965583764246effbf0196f233c31f900 100644
--- a/values.yaml
+++ b/values.yaml
@@ -220,13 +220,13 @@ ansibleVars:
 
 image:
   repository: open.greenhost.net:4567/openappstack/wordpress-helm/wordpress
-  tag: 0.3.0
+  tag: 0.3.1
   pullPolicy: Always
   pullSecrets: []
 
 initImage:
   repository: open.greenhost.net:4567/openappstack/wordpress-helm/wordpress-cli-ansible
-  tag: 0.3.0
+  tag: 0.3.1
   pullPolicy: Always
 
 ingress:
@@ -331,7 +331,7 @@ ansibleSecrets: |
   BACKUP_NAME: {{ .Release.Name }}
   BACKUP_TARGET: {{ .Values.backup.target }}
   BACKUP_ISDATE: {{ .Values.backup.isDate }}
-  DB_HOST: {{ .Release.Name }}-database-primary
+  DB_HOST: {{ ternary (printf "%s-%s" .Release.Name "database") (printf "%s-%s" .Release.Name "database-primary") (eq .Values.database.architecture "standalone") }}
   DB_NAME: {{ .Values.database.auth.database }}
   DB_PASS: {{ .Values.database.auth.password }}
   DB_PREFIX: {{ .Values.wordpress.config.db.prefix}}