diff --git a/README.md b/README.md
index 1e8b2084..192d4923 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ helm repo add appuio https://charts.appuio.ch
 | [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/secret-1.1.0/total)](https://github.com/appuio/charts/releases/tag/secret-1.1.0) | [secret](appuio/secret/README.md) |
 | [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/signalilo-0.12.1/total)](https://github.com/appuio/charts/releases/tag/signalilo-0.12.1) | [signalilo](appuio/signalilo/README.md) |
 | [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/snappass-1.0.0/total)](https://github.com/appuio/charts/releases/tag/snappass-1.0.0) | [snappass](appuio/snappass/README.md) |
-| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/stardog-0.19.0/total)](https://github.com/appuio/charts/releases/tag/stardog-0.19.0) | [stardog](appuio/stardog/README.md) |
+| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/stardog-0.20.0/total)](https://github.com/appuio/charts/releases/tag/stardog-0.20.0) | [stardog](appuio/stardog/README.md) |
 | [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/stardog-userrole-operator-0.2.3/total)](https://github.com/appuio/charts/releases/tag/stardog-userrole-operator-0.2.3) | [stardog-userrole-operator](appuio/stardog-userrole-operator/README.md) |
 | [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/trifid-2.0.2/total)](https://github.com/appuio/charts/releases/tag/trifid-2.0.2) | [trifid](appuio/trifid/README.md) |
 
diff --git a/appuio/stardog/Chart.yaml b/appuio/stardog/Chart.yaml
index dedd1c7b..98f5c393 100644
--- a/appuio/stardog/Chart.yaml
+++ b/appuio/stardog/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: stardog
-version: 0.19.0
+version: 0.20.0
 appVersion: 9.1.0
 description: Stardog is the world’s leading knowledge graph platform for the enterprise. Stardog makes it fast and easy to turn enterprise data into knowledge.
 home: "https://www.stardog.com/"
diff --git a/appuio/stardog/README.md b/appuio/stardog/README.md
index 74468300..3459c071 100644
--- a/appuio/stardog/README.md
+++ b/appuio/stardog/README.md
@@ -1,6 +1,6 @@
 # stardog
 
-![Version: 0.19.0](https://img.shields.io/badge/Version-0.19.0-informational?style=flat-square) ![AppVersion: 9.1.0](https://img.shields.io/badge/AppVersion-9.1.0-informational?style=flat-square)
+![Version: 0.20.0](https://img.shields.io/badge/Version-0.20.0-informational?style=flat-square) ![AppVersion: 9.1.0](https://img.shields.io/badge/AppVersion-9.1.0-informational?style=flat-square)
 
 Stardog is the world’s leading knowledge graph platform for the enterprise. Stardog makes it fast and easy to turn enterprise data into knowledge.
 
diff --git a/appuio/stardog/templates/statefulset.yaml b/appuio/stardog/templates/statefulset.yaml
index d6dd41d8..925e0920 100644
--- a/appuio/stardog/templates/statefulset.yaml
+++ b/appuio/stardog/templates/statefulset.yaml
@@ -60,6 +60,14 @@ spec:
               set -e
               sed "s|\$ZOOKEEPER_USERNAME|$ZOOKEEPER_USERNAME|g; s|\$ZOOKEEPER_PASSWORD|$ZOOKEEPER_PASSWORD|g" ${STARDOG_HOME}/stardog.properties.tpl > ${STARDOG_HOME}/stardog.properties
               /opt/stardog/bin/stardog-admin server start --foreground
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                - /bin/bash
+                - -c
+                - |
+                  /opt/stardog/bin/stardog-admin server stop -u admin -p ${STARDOG_ADMIN_PW}
           env:
             {{- if and .Values.zookeeper.enabled .Values.zookeeper.auth.enabled }}
             - name: ZOOKEEPER_USERNAME
@@ -74,6 +82,11 @@ spec:
               value: "{{ .Values.stardog.javaArgs }} -XX:ParallelGCThreads=2 -Dstardog.license.location=/run/secrets/stardog/stardog-license-key.bin"
             - name: STARDOG_HOME
               value: /var/opt/stardog/data/
+            - name: STARDOG_ADMIN_PW
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "stardog.fullname" $ }}-user-passwords
+                  key: admin
           ports:
             - name: stardog
               containerPort: 5820