diff --git a/helm/partner-onboarder/templates/jobs.yaml b/helm/partner-onboarder/templates/jobs.yaml
index d076237..2292607 100644
--- a/helm/partner-onboarder/templates/jobs.yaml
+++ b/helm/partner-onboarder/templates/jobs.yaml
@@ -40,6 +40,8 @@ spec:
               value: {{ $module.name }}
             - name: push_reports_to_s3
               value: {{ quote $.Values.onboarding.variables.push_reports_to_s3 }}
+            - name: mosipid
+              value: {{ quote $.Values.onboarding.variables.mosipid }}
           envFrom:
             {{- if $.Values.onboarding.configmaps }}
             {{- range $cm_name, $cm_value := $.Values.onboarding.configmaps }}
diff --git a/helm/partner-onboarder/templates/pv.yaml b/helm/partner-onboarder/templates/pv.yaml
index 7d4f38b..3a480c5 100644
--- a/helm/partner-onboarder/templates/pv.yaml
+++ b/helm/partner-onboarder/templates/pv.yaml
@@ -1,12 +1,13 @@
+{{- if eq $.Values.onboarding.variables.push_reports_to_s3 false }}
 {{- range $module := $.Values.onboarding.modules }}
+---
 {{- if $module.enabled }}
-{{- if eq $.Values.onboarding.variables.push_reports_to_s3 false }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
   name: {{ $.Values.onboarding.volumes.reports.name }}-{{ $.Release.Namespace }}-{{ $module.name }}-pvc
   labels:
-    name: {{ $.Values.onboarding.volumes.reports.name }}
+    name: {{ $.Values.onboarding.volumes.reports.name }}-{{ $.Release.Namespace }}-{{ $module.name }}-pvc
 spec:
   storageClassName: {{ $.Values.onboarding.volumes.reports.storageClass }}
   capacity:
diff --git a/helm/partner-onboarder/templates/pvc.yaml b/helm/partner-onboarder/templates/pvc.yaml
index 5913bd2..c3779ee 100644
--- a/helm/partner-onboarder/templates/pvc.yaml
+++ b/helm/partner-onboarder/templates/pvc.yaml
@@ -1,6 +1,7 @@
+{{- if eq $.Values.onboarding.variables.push_reports_to_s3 false }}
 {{- range $module := $.Values.onboarding.modules }}
+---
 {{- if $module.enabled }}
-{{- if eq $.Values.onboarding.variables.push_reports_to_s3 false }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -15,9 +16,9 @@ spec:
   resources:
     requests:
       storage: {{ $.Values.onboarding.volumes.reports.size }}
-  selector:
-    matchLabels:
-      name: {{ $.Values.onboarding.volumes.reports.name }}
+#  selector:
+#    matchLabels:
+#      name: {{ $.Values.onboarding.volumes.reports.name }}-{{ $.Release.Namespace }}-{{ $module.name }}-pvc
 {{- end }}
 {{- end }}
 {{- end }}
diff --git a/helm/partner-onboarder/values.yaml b/helm/partner-onboarder/values.yaml
index 8fdc6d2..45274c7 100644
--- a/helm/partner-onboarder/values.yaml
+++ b/helm/partner-onboarder/values.yaml
@@ -477,3 +477,4 @@ onboarding:
         server: "nfs-server"  # Ip address of nfs server.
   variables:
     push_reports_to_s3: true
+    mosipid: false