diff --git a/plugins/storage/install b/plugins/storage/install
index cad455d0d8e..47159dde304 100755
--- a/plugins/storage/install
+++ b/plugins/storage/install
@@ -5,9 +5,9 @@ set -eo pipefail
 trigger-storage-install() {
   declare desc="storage install trigger"
   declare trigger="install"
-  local storage_directory="${DOKKU_LIB_ROOT}/data/storage"
-  mkdir -p "${storage_directory}"
-  chown dokku:dokku "${storage_directory}"
+
+  mkdir -p "${DOKKU_LIB_ROOT}/data/storage"
+  chown "${DOKKU_SYSTEM_USER}:${DOKKU_SYSTEM_GROUP}" "${DOKKU_LIB_ROOT}/data/storage"
 
   STORAGE_SUDOERS_FILE="/etc/sudoers.d/dokku-storage"
   local mode="0440"