diff --git a/Chart.lock b/Chart.lock
index c9e3ae48e69f42a1f876694630ec4ca044812ae3..5820f46a4548b3377be0de419866f16657d1ab67 100644
--- a/Chart.lock
+++ b/Chart.lock
@@ -4,9 +4,9 @@ dependencies:
   version: 2.14.2
 - name: rabbitmq
   repository: https://charts.bitnami.com/bitnami
-  version: 8.32.2
+  version: 9.0.1
 - name: redis
   repository: https://charts.bitnami.com/bitnami
   version: 16.8.9
-digest: sha256:50769887bfe838f3817941cfd6b902452eba55d6949b26961d4882b23f3d8b2a
-generated: "2022-04-28T04:07:18.958983965Z"
+digest: sha256:eb9d17fe59aab4b2b8908fde60c06f7fe7996997ea7dec8f3653c068f528394b
+generated: "2022-05-05T02:05:42.701720594Z"
diff --git a/Chart.yaml b/Chart.yaml
index dcb7c010b848908ed3e9b79029bee34af9473e9c..ba9f102b40287a0c548650d99c77fe76c9aafa7d 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 description: |
   A helm chart for installing NextCloud and setting up ONLYOFFICE integration
 name: nextcloud-onlyoffice
-version: 0.8.0
+version: 0.8.1
 appVersion: NC-23.0.3-OO-7.0.1.37
 icon: https://cdn.rawgit.com/docker-library/docs/defa5ffc7123177acd60ddef6e16bddf694cc35f/nextcloud/logo.svg
 dependencies:
@@ -13,7 +13,7 @@ dependencies:
     repository: "https://nextcloud.github.io/helm"
   # https://artifacthub.io/packages/helm/bitnami/rabbitmq
   - name: rabbitmq
-    version: 8.32.2
+    version: 9.0.1
     repository: "https://charts.bitnami.com/bitnami"
   # https://artifacthub.io/packages/helm/bitnami/redis
   - name: redis
diff --git a/templates/onlyoffice-deployment.yaml b/templates/onlyoffice-deployment.yaml
index ab6e3e3723cb8cd3e74dbb7edb3f752d5906512e..25a7e71e191cd09ebd0337bdd0e95ee8206794d3 100644
--- a/templates/onlyoffice-deployment.yaml
+++ b/templates/onlyoffice-deployment.yaml
@@ -77,7 +77,7 @@ spec:
           {{- end }}
           env:
             - name: AMQP_URI
-              value: "amqp://user:{{ .Values.rabbitmq.auth.password }}@{{ .Release.Name }}-rabbitmq:{{ .Values.rabbitmq.service.port }}"
+              value: "amqp://user:{{ .Values.rabbitmq.auth.password }}@{{ .Release.Name }}-rabbitmq:{{ .Values.rabbitmq.service.ports.amqp }}"
             - name: JWT_ENABLED
               value: "true"
             - name: JWT_SECRET