diff --git a/charts/stable/paperless/Chart.yaml b/charts/stable/paperless/Chart.yaml
index 3c25fd17..be09c88c 100644
--- a/charts/stable/paperless/Chart.yaml
+++ b/charts/stable/paperless/Chart.yaml
@@ -2,18 +2,20 @@ apiVersion: v2
 appVersion: 1.5.0
 description: Paperless - Index and archive all of your scanned paper documents
 name: paperless
-version: 8.3.0
+version: 8.4.0
 kubeVersion: ">=1.16.0-0"
 keywords:
   - paperless
 home: https://github.com/k8s-at-home/charts/tree/master/charts/stable/paperless
 icon: https://avatars.githubusercontent.com/u/47271576?s=200&v=4
 sources:
-  - https://github.com/jonaswinkler/paperless-ng
+  - https://github.com/paperless-ngx/paperless-ngx
 maintainers:
   - name: mr-onion-2
   - name: jonnobrow
     email: jonathan@jonnobrow.co.uk
+  - name: morremeyer
+    email: charts@mor.re
 dependencies:
   - name: common
     repository: https://library-charts.k8s-at-home.com
@@ -29,8 +31,4 @@ dependencies:
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: Upgraded `common` chart dependency to version `4.3.0`.
-    - kind: changed
-      description: Upgraded `postgresql` chart dependency to version `10.14.4`.
-    - kind: changed
-      description: Upgraded `redis` chart dependency to version `15.6.10`.
+      description: Changed image and source links to the community fork paperless-ngx. See https://github.com/jonaswinkler/paperless-ng/issues/1599 and https://github.com/jonaswinkler/paperless-ng/issues/1632.
diff --git a/charts/stable/paperless/README.md b/charts/stable/paperless/README.md
index aa70a70e..410160f8 100644
--- a/charts/stable/paperless/README.md
+++ b/charts/stable/paperless/README.md
@@ -8,7 +8,7 @@ Paperless - Index and archive all of your scanned paper documents
 
 ## Source Code
 
-* <https://github.com/jonaswinkler/paperless-ng>
+* <https://github.com/paperless-ngx/paperless-ngx>
 
 ## Requirements
 
diff --git a/charts/stable/paperless/values.yaml b/charts/stable/paperless/values.yaml
index e5080247..1e6f0707 100644
--- a/charts/stable/paperless/values.yaml
+++ b/charts/stable/paperless/values.yaml
@@ -7,15 +7,16 @@
 
 image:
   # -- image repository
-  repository: jonaswinkler/paperless-ng
+  repository: ghcr.io/paperless-ngx/paperless-ngx
   # -- image pull policy
   pullPolicy: IfNotPresent
   # -- image tag
-  tag: 1.5.0
+  # @default -- chart.appVersion
+  tag:
 
 # -- See the following files for additional environment variables:
-# https://github.com/jonaswinkler/paperless-ng/tree/master/docker/compose/
-# https://github.com/jonaswinkler/paperless-ng/blob/master/paperless.conf.example
+# https://github.com/paperless-ngx/paperless-ngx/tree/main/docker/compose/
+# https://github.com/paperless-ngx/paperless-ngx/blob/main/paperless.conf.example
 # @default -- See below
 env:
   # -- Project name