diff --git a/ansible/group_vars/all/oas.yml b/ansible/group_vars/all/oas.yml
index 882a73d08288477b35c14074c7a91adfb68fbfb6..b2f2d2f07d164c91ed769168f3ba1f9e7578fc63 100644
--- a/ansible/group_vars/all/oas.yml
+++ b/ansible/group_vars/all/oas.yml
@@ -14,11 +14,12 @@ ansible_python_interpreter: "/usr/bin/env python3"
 
 # Nextcloud administrator password
 nextcloud_password: "{{ lookup('password', '{{ cluster_dir }}/secrets/nextcloud_admin_password chars=ascii_letters') }}"
-# Nextcloud mariadb password for nextcloud db
 nextcloud_mariadb_password: "{{ lookup('password', '{{ cluster_dir }}/secrets/nextcloud_mariadb_password chars=ascii_letters') }}"
-# Nextcloud mariadb root password
 nextcloud_mariadb_root_password: "{{ lookup('password', '{{ cluster_dir }}/secrets/nextcloud_mariadb_root_password chars=ascii_letters') }}"
-# Grafana administrator password
+onlyoffice_jwt_secret: "{{ lookup('password', '{{ cluster_dir }}/secrets/onlyoffice_jwt_secret chars=ascii_letters') }}"
+onlyoffice_postgresql_password: "{{ lookup('password', '{{ cluster_dir }}/secrets/onlyoffice_postgresql_password chars=ascii_letters') }}"
+onlyoffice_rabbitmq_password: "{{ lookup('password', '{{ cluster_dir }}/secrets/onlyoffice_rabbitmq_password chars=ascii_letters') }}"
+
 grafana_admin_password: "{{ lookup('password', '{{ cluster_dir }}/secrets/grafana_admin_password chars=ascii_letters') }}"
 
 # Kubernetes version
@@ -28,7 +29,7 @@ kubernetes_version: "v1.14.3-rancher1-1"
 git_charts_version: 'HEAD'
 git_local_storage_version: 'HEAD'
 # version of the https://open.greenhost.net/openappstack/nextcloud repo
-git_nextcloud_version: '20a744d242d9632f0616d97337d6ad18ef50dc67'
+git_nextcloud_version: 'cac00d369f5eeeddb7b33781ae3966b0c36fc308'
 
 # Application versions
 # https://github.com/kubernetes-sigs/krew/releases
diff --git a/ansible/roles/apps/tasks/helmfiles.yml b/ansible/roles/apps/tasks/helmfiles.yml
index dc448d4882408ce6b776d30142536bc86d758094..309989fd068ccdd87392e58012cba5805d976e82 100644
--- a/ansible/roles/apps/tasks/helmfiles.yml
+++ b/ansible/roles/apps/tasks/helmfiles.yml
@@ -24,6 +24,9 @@
     - NEXTCLOUD_PASSWORD: "{{ nextcloud_password }}"
     - NEXTCLOUD_MARIADB_PASSWORD: "{{ nextcloud_mariadb_password }}"
     - NEXTCLOUD_MARIADB_ROOT_PASSWORD: "{{ nextcloud_mariadb_root_password }}"
+    - ONLYOFFICE_JWT_SECRET: "{{ onlyoffice_jwt_secret }}"
+    - ONLYOFFICE_POSTGRESQL_PASSWORD: "{{ onlyoffice_postgresql_password }}"
+    - ONLYOFFICE_RABBITMQ_PASSWORD: "{{ onlyoffice_rabbitmq_password }}"
     - GRAFANA_ADMIN_PASSWORD: "{{ grafana_admin_password }}"
   shell: |
     set -e -x -o pipefail
diff --git a/helmfiles/values/nextcloud.yaml.gotmpl b/helmfiles/values/nextcloud.yaml.gotmpl
index 376beded449485e9c6a33914d701cd09326d2090..41aa56a444118b78f82fc22b4d5ae6159b2b384b 100644
--- a/helmfiles/values/nextcloud.yaml.gotmpl
+++ b/helmfiles/values/nextcloud.yaml.gotmpl
@@ -82,3 +82,9 @@ onlyoffice-documentserver:
 
   onlyoffice:
     server_name: "office.{{ .Environment.Values.domain }}"
+  jwtSecret: "{{ requiredEnv "ONLYOFFICE_JWT_SECRET" }}"
+  postgresql:
+    postgresqlPassword: "{{ requiredEnv "ONLYOFFICE_POSTGRESQL_PASSWORD" }}"
+  rabbitmq:
+    rabbitmq:
+      password: "{{ requiredEnv "ONLYOFFICE_RABBITMQ_PASSWORD" }}"