diff --git a/deploy-as-code/helm/charts/health-services/project-factory/values.yaml b/deploy-as-code/helm/charts/health-services/project-factory/values.yaml
index a2b45023a2..649c6337f1 100644
--- a/deploy-as-code/helm/charts/health-services/project-factory/values.yaml
+++ b/deploy-as-code/helm/charts/health-services/project-factory/values.yaml
@@ -104,15 +104,7 @@ env: |
   - name: CONTEXT_PATH
     value: "/project-factory"
   - name: FILE_STORE_SERVICE_END_POINT
-    value: filestore/v1/files
-  - name: ENABLE_DYNAMIC_TEMPLATE_FOR
-    value: {{ .Values.enableDynamicTemplate | default "" }}
-  - name: IS_CALL_GENERATE_WHEN_DELIVERY_CONDITIONS_DIFFER
-    value: {{ .Values.CallGenerateWhenDeliveryConditionsDiffer | default "false" }}
-  - name: EXCLUDE_HIERARCHY_TYPE_FROM_BOUNDARY_CODES
-    value: {{ .Values.ExcludeHierarchyTypeFromBoundaryCodes | default "false" }}
-  - name: EXCLUDE_BOUNDARY_NAME_AT_LAST_FROM_BOUNDARY_CODES
-    value: {{ .Values.ExcludeBoundaryTypeFromLastBoundaryCodes | default "false" }}  
+    value: filestore/v1/files  
   - name: EGOV_MDMS_V2_SEARCH_ENDPOINT
     value: {{ .Values.mdmsV2SearchEndpoint | default "mdms-v2/v2/_search" }}
   - name: EGOV_MDMS_V1_SEARCH_ENDPOINT
@@ -152,6 +144,14 @@ env: |
   - name: CMP_IDGEN_IDNAME
     value: campaign.number
   - name: EGOV_HOST
+  - name: ENABLE_DYNAMIC_TEMPLATE_FOR
+    value: {{ .Values.enableDynamicTemplate | default "" }}
+  - name: IS_CALL_GENERATE_WHEN_DELIVERY_CONDITIONS_DIFFER
+    value: {{ .Values.CallGenerateWhenDeliveryConditionsDiffer | default "false" }}
+  - name: EXCLUDE_HIERARCHY_TYPE_FROM_BOUNDARY_CODES
+    value: {{ .Values.ExcludeHierarchyTypeFromBoundaryCodes | default "false" }}
+  - name: EXCLUDE_BOUNDARY_NAME_AT_LAST_FROM_BOUNDARY_CODES
+    value: {{ .Values.ExcludeBoundaryTypeFromLastBoundaryCodes | default "false" }}
     valueFrom:
       configMapKeyRef:
         name: egov-config