diff --git a/chart/questions.yml b/chart/questions.yml
index cf95ba5..aec4c38 100644
--- a/chart/questions.yml
+++ b/chart/questions.yml
@@ -130,6 +130,12 @@ questions:
   group: "Private Registry Settings"
   type: password
   default: ""
+- variable: privateRegistry.registrySecret
+  label: Private registry secret name
+  description: "Longhorn will automatically generate a Kubernetes secret with this name and use it to pull images from your private registry."
+  group: "Private Registry Settings"
+  type: string
+  default: ""
 - variable: longhorn.default_setting
   default: "false"
   description: "Customize the default settings before installing Longhorn for the first time. This option will only work if the cluster hasn't installed Longhorn."
@@ -138,12 +144,6 @@ questions:
   show_subquestion_if: true
   group: "Longhorn Default Settings"
   subquestions:
-  - variable: defaultSettings.registrySecret
-    label: Private registry secret
-    description: "The Kubernetes Secret name"
-    group: "Longhorn Default Settings"
-    type: string
-    default: ""
   - variable: csi.kubeletRootDir
     default:
     description: "Specify kubelet root-dir. Leave blank to autodetect."
diff --git a/chart/templates/daemonset-sa.yaml b/chart/templates/daemonset-sa.yaml
index 1870aa0..f6e323b 100644
--- a/chart/templates/daemonset-sa.yaml
+++ b/chart/templates/daemonset-sa.yaml
@@ -82,9 +82,9 @@ spec:
       - name: longhorn-default-setting
         configMap:
           name: longhorn-default-setting
-      {{- if .Values.defaultSettings.registrySecret }}
+      {{- if .Values.privateRegistry.registrySecret }}
       imagePullSecrets:
-      - name: {{ .Values.defaultSettings.registrySecret }}
+      - name: {{ .Values.privateRegistry.registrySecret }}
       {{- end }}
       serviceAccountName: longhorn-service-account
   updateStrategy:
diff --git a/chart/templates/default-setting.yaml b/chart/templates/default-setting.yaml
index 610b646..421e9bd 100644
--- a/chart/templates/default-setting.yaml
+++ b/chart/templates/default-setting.yaml
@@ -21,7 +21,6 @@ data:
     backupstore-poll-interval: {{ .Values.defaultSettings.backupstorePollInterval }}
     taint-toleration: {{ .Values.defaultSettings.taintToleration }}
     priority-class: {{ .Values.defaultSettings.priorityClass }}
-    registry-secret: {{ .Values.defaultSettings.registrySecret }}
     auto-salvage: {{ .Values.defaultSettings.autoSalvage }}
     auto-delete-pod-when-volume-detached-unexpectedly: {{ .Values.defaultSettings.autoDeletePodWhenVolumeDetachedUnexpectedly }}
     disable-scheduling-on-cordoned-node: {{ .Values.defaultSettings.disableSchedulingOnCordonedNode }}
diff --git a/chart/templates/deployment-driver.yaml b/chart/templates/deployment-driver.yaml
index ec3a867..232358c 100644
--- a/chart/templates/deployment-driver.yaml
+++ b/chart/templates/deployment-driver.yaml
@@ -84,9 +84,9 @@ spec:
             value: {{ .Values.csi.snapshotterReplicaCount | quote }}
           {{- end }}
 
-      {{- if .Values.defaultSettings.registrySecret }}
+      {{- if .Values.privateRegistry.registrySecret }}
       imagePullSecrets:
-      - name: {{ .Values.defaultSettings.registrySecret }}
+      - name: {{ .Values.privateRegistry.registrySecret }}
       {{- end }}
       serviceAccountName: longhorn-service-account
       securityContext:
diff --git a/chart/templates/deployment-ui.yaml b/chart/templates/deployment-ui.yaml
index 1921dbd..027d54e 100644
--- a/chart/templates/deployment-ui.yaml
+++ b/chart/templates/deployment-ui.yaml
@@ -27,9 +27,9 @@ spec:
         env:
           - name: LONGHORN_MANAGER_IP
             value: "http://longhorn-backend:9500"
-      {{- if .Values.defaultSettings.registrySecret }}
+      {{- if .Values.privateRegistry.registrySecret }}
       imagePullSecrets:
-      - name: {{ .Values.defaultSettings.registrySecret }}
+      - name: {{ .Values.privateRegistry.registrySecret }}
       {{- end }}
 ---
 kind: Service
diff --git a/chart/templates/postupgrade-job.yaml b/chart/templates/postupgrade-job.yaml
index f493617..e3559eb 100644
--- a/chart/templates/postupgrade-job.yaml
+++ b/chart/templates/postupgrade-job.yaml
@@ -18,7 +18,7 @@ spec:
       containers:
       - name: longhorn-post-upgrade
         image: {{ template "registry_url" . }}{{ .Values.image.longhorn.manager.repository }}:{{ .Values.image.longhorn.manager.tag }}
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
         command:
         - longhorn-manager
         - post-upgrade
@@ -28,8 +28,8 @@ spec:
             fieldRef:
               fieldPath: metadata.namespace
       restartPolicy: OnFailure
-      {{- if .Values.defaultSettings.registrySecret }}
+      {{- if .Values.privateRegistry.registrySecret }}
       imagePullSecrets:
-      - name: {{ .Values.defaultSettings.registrySecret }}
+      - name: {{ .Values.privateRegistry.registrySecret }}
       {{- end }}
       serviceAccountName: longhorn-service-account
diff --git a/chart/templates/registry-secret.yml b/chart/templates/registry-secret.yml
index eeb9a8f..7112c89 100644
--- a/chart/templates/registry-secret.yml
+++ b/chart/templates/registry-secret.yml
@@ -1,10 +1,10 @@
-{{- if .Values.defaultSettings.registrySecret }}
+{{- if .Values.privateRegistry.registrySecret }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Values.defaultSettings.registrySecret }}
+  name: {{ .Values.privateRegistry.registrySecret }}
   labels: {{- include "longhorn.labels" . | nindent 4 }}
 type: kubernetes.io/dockerconfigjson
 data:
   .dockerconfigjson: {{ template "secret" . }}
-{{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/chart/templates/uninstall-job.yaml b/chart/templates/uninstall-job.yaml
index 4dde54b..6a36a16 100644
--- a/chart/templates/uninstall-job.yaml
+++ b/chart/templates/uninstall-job.yaml
@@ -18,7 +18,7 @@ spec:
       containers:
       - name: longhorn-uninstall
         image: {{ template "registry_url" . }}{{ .Values.image.longhorn.manager.repository }}:{{ .Values.image.longhorn.manager.tag }}
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
         command:
         - longhorn-manager
         - uninstall
@@ -29,8 +29,8 @@ spec:
             fieldRef:
               fieldPath: metadata.namespace
       restartPolicy: OnFailure
-      {{- if .Values.defaultSettings.registrySecret }}
+      {{- if .Values.privateRegistry.registrySecret }}
       imagePullSecrets:
-      - name: {{ .Values.defaultSettings.registrySecret }}
+      - name: {{ .Values.privateRegistry.registrySecret }}
       {{- end }}
       serviceAccountName: longhorn-service-account
diff --git a/chart/values.yaml b/chart/values.yaml
index 1acfd43..0e1d685 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -81,7 +81,6 @@ defaultSettings:
   backupstorePollInterval: ~
   taintToleration: ~
   priorityClass: ~
-  registrySecret: ~
   autoSalvage: ~
   autoDeletePodWhenVolumeDetachedUnexpectedly: ~
   disableSchedulingOnCordonedNode: ~
@@ -100,6 +99,7 @@ privateRegistry:
   registryUrl: ~
   registryUser: ~
   registryPasswd: ~
+  registrySecret: ~
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious