diff --git a/packages/system/linstor/templates/cluster.yaml b/packages/system/linstor/templates/cluster.yaml
index 584fd850f..bde247262 100644
--- a/packages/system/linstor/templates/cluster.yaml
+++ b/packages/system/linstor/templates/cluster.yaml
@@ -14,6 +14,12 @@ spec:
       name: linstor-api-ca
       kind: Issuer
   properties:
+  {{- if .Values.linstor.autoDiskful.enabled }}
+  - name: DrbdOptions/auto-diskful
+    value: {{ .Values.linstor.autoDiskful.minutes | quote }}
+  - name: DrbdOptions/auto-diskful-allow-cleanup
+    value: {{ .Values.linstor.autoDiskful.allowCleanup | quote }}
+  {{- end }}
   - name: DrbdOptions/Net/connect-int
     value: "15"
   - name: DrbdOptions/Net/ping-int
diff --git a/packages/system/linstor/values.yaml b/packages/system/linstor/values.yaml
index 23179bceb..1a94793bb 100644
--- a/packages/system/linstor/values.yaml
+++ b/packages/system/linstor/values.yaml
@@ -2,3 +2,9 @@ piraeusServer:
   image:
     repository: ghcr.io/cozystack/cozystack/piraeus-server
     tag: latest@sha256:417532baa2801288147cd9ac9ae260751c1a7754f0b829725d09b72a770c111a
+
+linstor:
+  autoDiskful:
+    enabled: true
+    minutes: 30
+    allowCleanup: true