diff --git a/flux2/apps/rocketchat/release.yaml b/flux2/apps/rocketchat/release.yaml
index eae7c10f37e266467c9460e6244fc3ecd227d432..864768e3b499729a8e1e466557a5f39ca35ee738 100644
--- a/flux2/apps/rocketchat/release.yaml
+++ b/flux2/apps/rocketchat/release.yaml
@@ -9,10 +9,10 @@ spec:
   chart:
     spec:
       chart: rocketchat
-      version: 2.0.10
+      # NOTE: Change the GitRepository yaml file if you want a different version
       sourceRef:
-        kind: HelmRepository
-        name: helm-stable
+        kind: GitRepository
+        name: rocketchat-helm-chart
         namespace: flux-system
   interval: 1h
   install:
diff --git a/flux2/apps/rocketchat/rocketchat-values-configmap.yaml b/flux2/apps/rocketchat/rocketchat-values-configmap.yaml
index 100c94221daaa1fa01e4d589e29a60b2261ded42..38ad797bb1c041278a6763e0a7db971211693f04 100644
--- a/flux2/apps/rocketchat/rocketchat-values-configmap.yaml
+++ b/flux2/apps/rocketchat/rocketchat-values-configmap.yaml
@@ -106,8 +106,9 @@ data:
         memory: 768Mi
 
     mongodb:
-      mongodbRootPassword: ${mongodb_root_password}
-      mongodbPassword: ${mongodb_password}
+      auth:
+        rootPassword: ${mongodb_root_password}
+        password: ${mongodb_password}
       podAnnotations:
         # Let the backup system include rocketchat data stored in mongodb.
         backup.velero.io/backup-volumes: "datadir"
diff --git a/flux2/infrastructure/sources/kustomization.yaml b/flux2/infrastructure/sources/kustomization.yaml
index 6ba7a09231ec049b0be61bb4088e592dd443c2ad..6ffb569adc36919b025fd18dc09fe6c2a836276c 100644
--- a/flux2/infrastructure/sources/kustomization.yaml
+++ b/flux2/infrastructure/sources/kustomization.yaml
@@ -11,6 +11,7 @@ resources:
   - local-path-provisioner.yaml
   - nextcloud.yaml
   - prometheus-community.yaml
+  - rocketchat-helm-chart.yaml
   - single-sign-on.yaml
   - vmware-tanzu.yaml
   - wekan.yaml
diff --git a/flux2/infrastructure/sources/rocketchat-helm-chart.yaml b/flux2/infrastructure/sources/rocketchat-helm-chart.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c7636940abf0841214309b02aba775db959f249a
--- /dev/null
+++ b/flux2/infrastructure/sources/rocketchat-helm-chart.yaml
@@ -0,0 +1,17 @@
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta1
+kind: GitRepository
+metadata:
+  name: rocketchat-helm-chart
+spec:
+  # The interval at which to check the upstream for updates
+  interval: 1h
+  # The repository URL, can be a HTTP/S or SSH address
+  url: https://github.com/greenhost/rocketchat-helm-chart
+  # The Git reference to checkout and monitor for changes
+  # (defaults to master)
+  # For all available options, see:
+  # https://toolkit.fluxcd.io/components/source/api/#source.toolkit.fluxcd.io/v1beta1.GitRepositoryRef
+  ref:
+    branch: openappstack
+    tag: 3.1.0-gh2