diff --git a/elster-transfer/templates/deployment.yaml b/elster-transfer/templates/deployment.yaml
index 6b047c6c482ce478581e3d0af83da1abc8bfbb9e..9ebaaa997d5e0a1bfb73cd893a5cc2def44fa70e 100644
--- a/elster-transfer/templates/deployment.yaml
+++ b/elster-transfer/templates/deployment.yaml
@@ -83,7 +83,7 @@ spec:
       volumes:
         - name: etr-home
           persistentVolumeClaim:
-            claimName: {{ .Release.Name }}-home-pvc2
+            claimName: {{ .Release.Name }}-home-pvc
         {{- if (.Values.userAuthentication).enabled }}
         - name: etr-user
           configMap:
diff --git a/elster-transfer/templates/elstertransfer_user_cr.yaml b/elster-transfer/templates/elstertransfer_user_cr.yaml
index 73338622fe1a6ef240f5965551ae71c0db5acebc..4f6d76365a7a8b5247c500b87a5c1e0c21b9d1f7 100644
--- a/elster-transfer/templates/elstertransfer_user_cr.yaml
+++ b/elster-transfer/templates/elstertransfer_user_cr.yaml
@@ -8,7 +8,7 @@ metadata:
   name: {{ include "app.generateElsterTransferUserRessourceName" (deepCopy $user.login) }}
   namespace: {{ include "app.namespace" $ }}
 spec:
-  keep_after_delete: {{ $.Values.CR.keep_after_delete | default false }}
+  keep_after_delete: {{ $user.keep_after_delete | default false }}
   login: {{ $user.login }}  
   role: {{ $user.role | default "USER" }}
   credentials: {{ $user.credentials }}
diff --git a/elster-transfer/templates/etr_home_pvc.yaml b/elster-transfer/templates/etr_home_pvc.yaml
index 259e349285d3db00192edf45c3160e3f04fe4712..4ba0373f65cd070703817f43d2851feaa5c01864 100644
--- a/elster-transfer/templates/etr_home_pvc.yaml
+++ b/elster-transfer/templates/etr_home_pvc.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ .Release.Name }}-home-pvc2
+  name: {{ .Release.Name }}-home-pvc
   namespace: {{ .Release.Namespace }}
 spec:
   storageClassName: {{ (.Values.storage).className | default "ssd-retain" }}
diff --git a/elster-transfer/unit-tests/deployment_volume_mount_test.yaml b/elster-transfer/unit-tests/deployment_volume_mount_test.yaml
index 156b7761a9e43d9ef5fb27c1914f23799150c011..093e4f6471640bffb280f4ad0b73b6ae2b9779e2 100644
--- a/elster-transfer/unit-tests/deployment_volume_mount_test.yaml
+++ b/elster-transfer/unit-tests/deployment_volume_mount_test.yaml
@@ -21,7 +21,7 @@ tests:
            content:
               name: etr-home
               persistentVolumeClaim:
-                claimName: etr-home-pvc2
+                claimName: etr-home-pvc
 
   - it: should add etr-user volume mount
     set:
diff --git a/elster-transfer/unit-tests/etr_home_pvc_test.yaml b/elster-transfer/unit-tests/etr_home_pvc_test.yaml
index a338e9ff80bbbcd8d12846409e007e517b7f9f83..fb125ac7c8f2e7c982d3a5ada57eeb2d731f436a 100644
--- a/elster-transfer/unit-tests/etr_home_pvc_test.yaml
+++ b/elster-transfer/unit-tests/etr_home_pvc_test.yaml
@@ -16,7 +16,7 @@ tests:
     asserts:
       - equal:
           path: metadata.name
-          value: etr-home-pvc2
+          value: etr-home-pvc
       - equal:
           path: metadata.namespace
           value: by-helm-test