diff --git a/charts/stable/paperless/Chart.yaml b/charts/stable/paperless/Chart.yaml
index e3355640..1d135771 100644
--- a/charts/stable/paperless/Chart.yaml
+++ b/charts/stable/paperless/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: ngx-1.7.0
 description: Paperless - Index and archive all of your scanned paper documents
 name: paperless
-version: 8.6.2
+version: 8.7.0
 kubeVersion: ">=1.16.0-0"
 keywords:
   - paperless
@@ -30,5 +30,5 @@ dependencies:
     condition: redis.enabled
 annotations:
   artifacthub.io/changes: |
-    - kind: changed
-      description: Update appVersion to 1.7.0
+    - kind: added
+      description: Set PAPERLESS_URL automatically
diff --git a/charts/stable/paperless/README.md b/charts/stable/paperless/README.md
index 2389927c..ca682d89 100644
--- a/charts/stable/paperless/README.md
+++ b/charts/stable/paperless/README.md
@@ -1,6 +1,6 @@
 # paperless
 
-![Version: 8.6.2](https://img.shields.io/badge/Version-8.6.2-informational?style=flat-square) ![AppVersion: ngx-1.7.0](https://img.shields.io/badge/AppVersion-ngx--1.7.0-informational?style=flat-square)
+![Version: 8.7.0](https://img.shields.io/badge/Version-8.7.0-informational?style=flat-square) ![AppVersion: ngx-1.7.0](https://img.shields.io/badge/AppVersion-ngx--1.7.0-informational?style=flat-square)
 
 Paperless - Index and archive all of your scanned paper documents
 
@@ -96,15 +96,15 @@ N/A
 
 ## Changelog
 
-### Version 8.6.2
+### Version 8.7.0
 
 #### Added
 
-N/A
+* Set PAPERLESS_URL automatically
 
 #### Changed
 
-* Update appVersion to 1.7.0
+N/A
 
 #### Fixed
 
diff --git a/charts/stable/paperless/templates/common.yaml b/charts/stable/paperless/templates/common.yaml
index a6613c2c..09b4bbc8 100644
--- a/charts/stable/paperless/templates/common.yaml
+++ b/charts/stable/paperless/templates/common.yaml
@@ -1 +1,11 @@
+{{/* Make sure all variables are set properly */}}
+{{- include "common.values.setup" . }}
+
+{{/* Append the hardcoded settings */}}
+{{- define "paperless.harcodedValues" -}}
+env:
+    PAPERLESS_URL: {{ (first .Values.ingress.main.hosts).host }}
+{{- end -}}
+{{- $_ := merge .Values (include "paperless.harcodedValues" . | fromYaml) -}}
+
 {{ include "common.all" . }}
diff --git a/charts/stable/paperless/values.yaml b/charts/stable/paperless/values.yaml
index ff116b74..cde42dee 100644
--- a/charts/stable/paperless/values.yaml
+++ b/charts/stable/paperless/values.yaml
@@ -36,6 +36,7 @@ env:
   # PAPERLESS_ADMIN_USER: admin
   # -- Password for the root user
   # PAPERLESS_ADMIN_PASSWORD: admin
+  # PAPERLESS_URL: <set to main ingress by default>
 
 # -- Configures service settings for the chart.
 # @default -- See values.yaml