diff --git a/k8s/infra/forgejo-runner/templates/deployment.yaml b/k8s/infra/forgejo-runner/templates/deployment.yaml
index b2552e5..6b11c26 100644
--- a/k8s/infra/forgejo-runner/templates/deployment.yaml
+++ b/k8s/infra/forgejo-runner/templates/deployment.yaml
@@ -107,10 +107,10 @@ spec:
       volumes:
         - name: runner-data
           persistentVolumeClaim:
-            claimName: runner-reg
+            claimName: {{ .Release.Name }}-reg
         - name: dind-storage
           persistentVolumeClaim:
-            claimName: runner-dind
+            claimName: {{ .Release.Name }}-dind
         - name: docker-certs
           emptyDir: {}    # DinD regenerates mTLS certs on each start
         - name: homelab-ca
diff --git a/k8s/infra/forgejo-runner/templates/pvc.yaml b/k8s/infra/forgejo-runner/templates/pvc.yaml
index c1ae8d1..6ca998f 100644
--- a/k8s/infra/forgejo-runner/templates/pvc.yaml
+++ b/k8s/infra/forgejo-runner/templates/pvc.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: runner-reg
+  name: {{ .Release.Name }}-reg
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ .Release.Name }}
@@ -15,7 +15,7 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: runner-dind
+  name: {{ .Release.Name }}-dind
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ .Release.Name }}