diff --git a/templates/image-server/ks-pvc.yaml b/templates/image-server/ks-pvc.yaml
index ec71dc4..200d87b 100644
--- a/templates/image-server/ks-pvc.yaml
+++ b/templates/image-server/ks-pvc.yaml
@@ -15,4 +15,5 @@ spec:
   wait: false
   interval: 30m
   retryInterval: 1m
+  targetNamespace: ${TENANT_NAMESPACE}
   timeout: 5m
diff --git a/templates/image-server/pvc/image-storage.yaml b/templates/image-server/pvc/image-storage.yaml
index 7af917f..1059377 100644
--- a/templates/image-server/pvc/image-storage.yaml
+++ b/templates/image-server/pvc/image-storage.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: ${TENANT_NAMESPACE}-image-storage
-  namespace: ${TENANT_NAMESPACE}
   annotations:
     helm.sh/resource-policy: keep
 spec: