diff --git a/src/main/cljc/dda/c4k_website/website/website_internal.cljc b/src/main/cljc/dda/c4k_website/website/website_internal.cljc
index 40a2ac5..a4ee3bb 100644
--- a/src/main/cljc/dda/c4k_website/website/website_internal.cljc
+++ b/src/main/cljc/dda/c4k_website/website/website_internal.cljc
@@ -176,8 +176,7 @@
   (let [{:keys [unique-name]} config
         name (replace-dots-by-minus unique-name)]
     (->
-     (yaml/load-as-edn "website/hashfile-volume.yaml")
-     (assoc-in [:metadata :labels :app.kubernetes.part-of] name)
+     (yaml/load-as-edn "website/hash-state-pvc.yaml")
      (replace-all-matching-substrings-beginning-with "NAME" name))))
 
 
diff --git a/src/main/resources/website/hashfile-volume.yaml b/src/main/resources/website/hash-state-pvc.yaml
similarity index 73%
rename from src/main/resources/website/hashfile-volume.yaml
rename to src/main/resources/website/hash-state-pvc.yaml
index 99f35db..b0d3ecd 100644
--- a/src/main/resources/website/hashfile-volume.yaml
+++ b/src/main/resources/website/hash-state-pvc.yaml
@@ -1,10 +1,9 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: NAME-hashfile-volume
-  namespace: default
+  name: hash-state-volume
+  namespace: NAME
   labels:
-    app: NAME-nginx    
     app.kubernetes.part-of: NAME-website
 spec:
   storageClassName: local-path
diff --git a/src/test/cljc/dda/c4k_website/website/website_internal_test.cljc b/src/test/cljc/dda/c4k_website/website/website_internal_test.cljc
index b062915..f883a02 100644
--- a/src/test/cljc/dda/c4k_website/website/website_internal_test.cljc
+++ b/src/test/cljc/dda/c4k_website/website/website_internal_test.cljc
@@ -3,7 +3,6 @@
    #?(:clj [clojure.test :refer [deftest is are testing run-tests]]
       :cljs [cljs.test :refer-macros [deftest is are testing run-tests]])
    [clojure.spec.test.alpha :as st]
-   [dda.c4k-common.test-helper :as th]
    [dda.c4k-website.website.website-internal :as cut]))
 
 (st/instrument `cut/generate-nginx-configmap)
@@ -215,10 +214,12 @@
   (is (= {:apiVersion "v1",
           :kind "PersistentVolumeClaim",
           :metadata
-          {:name "test-io-hashfile-volume",
-           :namespace "default",
-           :labels {:app "test-io-nginx", :app.kubernetes.part-of "test-io"}},
-          :spec {:storageClassName "local-path", :accessModes ["ReadWriteOnce"], :resources {:requests {:storage "16Mi"}}}}
+          {:name "hash-state-volume",
+           :namespace "test-io",
+           :labels {:app.kubernetes.part-of "test-io-website"}},
+          :spec {:storageClassName "local-path", 
+                 :accessModes ["ReadWriteOnce"], 
+                 :resources {:requests {:storage "16Mi"}}}}
          (cut/generate-hashfile-volume {:issuer "staging"
                                         :build-cpu-request "500m"
                                         :build-cpu-limit "1700m"