diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/AddEditLocalUnitsModal/AddEditLocalUnitsForm/i18n.json b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/AddEditLocalUnitsModal/AddEditLocalUnitsForm/i18n.json
index a1720cadcb..d8ad9a8883 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/AddEditLocalUnitsModal/AddEditLocalUnitsForm/i18n.json
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/AddEditLocalUnitsModal/AddEditLocalUnitsForm/i18n.json
@@ -10,8 +10,10 @@
         "localUnitsFormFocalPerson": "Focal person",
         "localUnitsFormSource": "Source",
         "localUnitsAddressTitle": "Address and Contact",
-        "localUnitsSpecialtiesTitle": "Specialties and Capacity",
+        "localUnitsFacilityCategoryTitle": "Facility Category",
+        "localUnitsFacilityCapacityTitle": "Facility Capacity",
         "localUnitsHumanResourcesTitle": "Human Resources",
+        "localUnitsServicesTitle": "Services",
         "localUnitsFormAddress": "Address",
         "localUnitsFormLocality": "Locality",
         "localUnitsFormPostCode": "Post code",
@@ -19,9 +21,12 @@
         "localUnitsFormEmail": "Local unit email",
         "localUnitsFormWebsite": "Local unit website",
         "localUnitsFormType": "Local unit type",
+        "localUnitsVisibility": "Visibility",
         "localUnitsFormAffiliation": "Affiliation",
         "localUnitsFormOtherAffiliation": "Other Affiliation",
         "localUnitsFormFunctionality": "Functionality",
+        "localUnitsFormHealthFacilityType": "Health Facility type",
+        "localUnitsFormOtherFacilityType": "Other Facility type",
         "localUnitsFormHospitalType": "Hospital type",
         "localUnitsFormTeachingHospital": "Teaching Hospital",
         "localUnitsFormInPatientCapacity": "In-patient capacity",
@@ -35,7 +40,7 @@
         "localUnitsFormBloodServices": "Blood Services",
         "localUnitsFormProfessionalTrainingFacilities": "Professional training facilities",
         "localUnitsFormGeneralMedicalServices": "General medical services",
-        "localUnitsFormSpecialisation": "Specialisation",
+        "localUnitsFormSpecialist": "Specialist",
         "localUnitsFormSpecializedMedicalService": "Specialized medical beyond primary level",
         "localUnitsFormMaximumCapacity": "Maximum capacity",
         "localUnitsFormNumberOfIsolationRooms": "Number of isolation rooms",
@@ -52,6 +57,7 @@
         "localUnitsFormNursingAid": "Nursing aid",
         "localUnitsFormMidwife": "Midwife",
         "localUnitsFormOtherMedicalHeal": "Other medical heal",
+        "localUnitsFormOtherProfiles": "Other profiles",
         "localUnitsFormCommentsNS": "Comments by the NS",
         "localUnitsFormSubmitButtonLabel": "Submit"
     }
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/AddEditLocalUnitsModal/AddEditLocalUnitsForm/index.tsx b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/AddEditLocalUnitsModal/AddEditLocalUnitsForm/index.tsx
index 57fd02ec30..34e6bf8a9e 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/AddEditLocalUnitsModal/AddEditLocalUnitsForm/index.tsx
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/AddEditLocalUnitsModal/AddEditLocalUnitsForm/index.tsx
@@ -12,7 +12,10 @@ import {
     TextInput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
-import { stringNameSelector } from '@ifrc-go/ui/utils';
+import {
+    stringNameSelector,
+    stringValueSelector,
+} from '@ifrc-go/ui/utils';
 import {
     getErrorObject,
     getErrorString,
@@ -20,6 +23,7 @@ import {
     useFormObject,
 } from '@togglecorp/toggle-form';
 
+import useGlobalEnums from '#hooks/domain/useGlobalEnums';
 import useAlert from '#hooks/useAlert';
 import { CountryOutletContext } from '#utils/outletContext';
 import {
@@ -35,6 +39,7 @@ import schema, {
 
 import i18n from './i18n.json';
 import styles from './styles.module.css';
+import { isDefined, isNotDefined } from '@togglecorp/fujs';
 
 type HealthLocalUnitFormFields = PartialLocalUnits['health'];
 type LocalUnitsOptionsType = GoApiResponse<'/api/v2/local-units-options/'>;
@@ -45,20 +50,27 @@ type LocalUnitHealthFacility = NonNullable<LocalUnitsOptionsType['health_facilit
 type LocalUnitBloodServices = NonNullable<LocalUnitsOptionsType['blood_services']>[number];
 type LocalUnitProfessionalTraining = NonNullable<LocalUnitsOptionsType['professional_training_facilities']>[number];
 type LocalUnitGeneralMedical = NonNullable<LocalUnitsOptionsType['general_medical_services']>[number];
+type LocalUnitPrimaryHealthCareCenter = NonNullable<LocalUnitsOptionsType['primary_health_care_center']>[number];
+type VisibilityOptions = NonNullable<GoApiResponse<'/api/v2/global-enums/'>['api_visibility_choices']>[number]
 
 const localUnitTypeCodeSelector = (localUnit: LocalUnitType) => localUnit.code;
 const localUnitCoverageLevelSelector = (localUnit: LocalUnitCoverage) => localUnit.level;
 const localUnitAffiliationCodeSelector = (localUnit: LocalUnitAffiliation) => localUnit.code;
 const localUnitHealthFacilityCodeSelector = (localUnit: LocalUnitHealthFacility) => localUnit.code;
+const LocalUnitPrimaryHealthCareCenterCodeSelector = (
+    localUnit: LocalUnitPrimaryHealthCareCenter,
+) => localUnit.code;
 const localUnitBloodServicesCodeSelector = (localUnit: LocalUnitBloodServices) => localUnit.code;
 const LocalUnitProfessionalTrainingCodeSelector = (
     localUnit: LocalUnitProfessionalTraining,
 ) => localUnit.code;
 const localUnitGeneralMedicalCodeSelector = (localUnit: LocalUnitGeneralMedical) => localUnit.code;
+const VisibilityOptions = (option: VisibilityOptions) => option.key;
 
 interface Props {
     viewMode?: boolean;
     localUnitsOptions?: LocalUnitsOptionsType;
+    onLocalUnitTypeClick: (type?: string) => void;
 }
 
 const defaultHealthValue = {};
@@ -67,9 +79,11 @@ function AddEditLocalUnitsForm(props: Props) {
     const {
         viewMode = false,
         localUnitsOptions,
+        onLocalUnitTypeClick,
     } = props;
     const alert = useAlert();
     const strings = useTranslation(i18n);
+    const { api_visibility_choices: visibilityOptions } = useGlobalEnums();
     const { countryId } = useOutletContext<CountryOutletContext>();
     const {
         value,
@@ -129,6 +143,21 @@ function AddEditLocalUnitsForm(props: Props) {
         [validate, setError, addLocalUnits, countryId],
     );
 
+    const handleLocalUnitType = useCallback(
+        (type?: number) => {
+            setFieldValue(type, 'type');
+            if (isNotDefined(localUnitsOptions)) {
+                return;
+            }
+            const selectedType = localUnitsOptions.type.find(
+                (opt) => opt.code === type,
+            );
+
+            onLocalUnitTypeClick(selectedType?.name);
+        },
+        [setFieldValue, localUnitsOptions, onLocalUnitTypeClick],
+    );
+
     const error = getErrorObject(formError);
     const healthFormError = getErrorObject(error?.health);
 
@@ -142,7 +171,7 @@ function AddEditLocalUnitsForm(props: Props) {
                     name="type"
                     options={localUnitsOptions?.type}
                     value={value.type}
-                    onChange={setFieldValue}
+                    onChange={handleLocalUnitType}
                     keySelector={localUnitTypeCodeSelector}
                     labelSelector={stringNameSelector}
                     readOnly={viewMode}
@@ -161,6 +190,46 @@ function AddEditLocalUnitsForm(props: Props) {
                     error={error?.subtype}
                 />
             </InputSection>
+            <InputSection
+                title={strings.localUnitsVisibility}
+                withAsteriskOnTitle
+            >
+                <SelectInput
+                    name="visibility_display"
+                    options={visibilityOptions}
+                    value={value.visibility_display}
+                    onChange={setFieldValue}
+                    keySelector={VisibilityOptions}
+                    labelSelector={stringValueSelector}
+                    readOnly={viewMode}
+                    error={error?.type}
+                />
+            </InputSection>
+            <InputSection
+                title={strings.localUnitsFormLocalUnitName}
+                description={strings.localUnitsFormLocalDescription}
+                withAsteriskOnTitle
+            >
+                <TextInput
+                    name="local_branch_name"
+                    value={value.local_branch_name}
+                    onChange={setFieldValue}
+                    readOnly={viewMode}
+                    error={error?.local_branch_name}
+                />
+            </InputSection>
+            <InputSection
+                title={strings.localUnitsFormLocalUnitName}
+                description={strings.localUnitsFormEnglishDescription}
+            >
+                <TextInput
+                    name="english_branch_name"
+                    value={value.english_branch_name}
+                    onChange={setFieldValue}
+                    readOnly={viewMode}
+                    error={error?.english_branch_name}
+                />
+            </InputSection>
             {value.type === TYPE_HEALTH_CARE ? (
                 <>
                     <InputSection
@@ -180,7 +249,6 @@ function AddEditLocalUnitsForm(props: Props) {
                     </InputSection>
                     <InputSection
                         title={strings.localUnitsFormOtherAffiliation}
-                        withAsteriskOnTitle
                     >
                         <TextInput
                             name="other_affiliation"
@@ -205,80 +273,9 @@ function AddEditLocalUnitsForm(props: Props) {
                             error={healthFormError?.functionality}
                         />
                     </InputSection>
-                    <InputSection
-                        title={strings.localUnitsFormHospitalType}
-                    >
-                        <SelectInput
-                            name="health_facility_type"
-                            options={localUnitsOptions?.health_facility_type}
-                            value={value.health?.health_facility_type}
-                            onChange={onHealthFieldChange}
-                            keySelector={localUnitHealthFacilityCodeSelector}
-                            labelSelector={stringNameSelector}
-                            readOnly={viewMode}
-                            error={healthFormError?.health_facility_type}
-                        />
-                    </InputSection>
-                    <InputSection
-                        title={strings.localUnitsFormTeachingHospital}
-                    >
-                        <BooleanInput
-                            name="is_teaching_hospital"
-                            value={value.health?.is_teaching_hospital}
-                            onChange={onHealthFieldChange}
-                            readOnly={viewMode}
-                            error={healthFormError?.is_teaching_hospital}
-                        />
-                    </InputSection>
-                    <InputSection
-                        title={strings.localUnitsFormInPatientCapacity}
-                    >
-                        <BooleanInput
-                            name="is_in_patient_capacity"
-                            value={value.health?.is_in_patient_capacity}
-                            onChange={onHealthFieldChange}
-                            readOnly={viewMode}
-                            error={healthFormError?.is_in_patient_capacity}
-                        />
-                    </InputSection>
-                    <InputSection
-                        title={strings.localUnitsFormIsolationRoomsWards}
-                    >
-                        <BooleanInput
-                            name="is_isolation_rooms_wards"
-                            value={value.health?.is_isolation_rooms_wards}
-                            onChange={onHealthFieldChange}
-                            readOnly={viewMode}
-                            error={healthFormError?.is_isolation_rooms_wards}
-                        />
-                    </InputSection>
                 </>
             ) : (
                 <>
-                    <InputSection
-                        title={strings.localUnitsFormLocalUnitName}
-                        description={strings.localUnitsFormLocalDescription}
-                    >
-                        <TextInput
-                            name="local_branch_name"
-                            value={value.local_branch_name}
-                            onChange={setFieldValue}
-                            readOnly={viewMode}
-                            error={error?.local_branch_name}
-                        />
-                    </InputSection>
-                    <InputSection
-                        title={strings.localUnitsFormLocalUnitName}
-                        description={strings.localUnitsFormEnglishDescription}
-                    >
-                        <TextInput
-                            name="english_branch_name"
-                            value={value.english_branch_name}
-                            onChange={setFieldValue}
-                            readOnly={viewMode}
-                            error={error?.english_branch_name}
-                        />
-                    </InputSection>
                     <InputSection
                         title={strings.localUnitsFormCoverage}
                     >
@@ -296,6 +293,7 @@ function AddEditLocalUnitsForm(props: Props) {
                     <InputSection
                         title={strings.localUnitsFormFocalPerson}
                         description={strings.localUnitsFormLocalDescription}
+                        withAsteriskOnTitle
                     >
                         <TextInput
                             name="focal_person_loc"
@@ -463,6 +461,7 @@ function AddEditLocalUnitsForm(props: Props) {
                             </InputSection>
                             <InputSection
                                 title={strings.localUnitsFormFocalPointEmail}
+                                withAsteriskOnTitle
                             >
                                 <TextInput
                                     name="focal_point_email"
@@ -490,112 +489,122 @@ function AddEditLocalUnitsForm(props: Props) {
             {value.type === TYPE_HEALTH_CARE && (
                 <>
                     <Container
-                        heading={strings.localUnitsSpecialtiesTitle}
+                        heading={strings.localUnitsFacilityCategoryTitle}
                         withHeaderBorder
                         childrenContainerClassName={styles.addressContainer}
                     >
                         <div>
                             <InputSection
-                                title={strings.localUnitsFormSpecialties}
+                                title={strings.localUnitsFormHealthFacilityType}
+                                withAsteriskOnTitle
                             >
-                                <TextInput
-                                    name="speciality"
-                                    value={value.health?.speciality}
+                                <SelectInput
+                                    name="health_facility_type"
+                                    options={localUnitsOptions?.health_facility_type}
+                                    value={value.health?.health_facility_type}
                                     onChange={onHealthFieldChange}
+                                    keySelector={localUnitHealthFacilityCodeSelector}
+                                    labelSelector={stringNameSelector}
                                     readOnly={viewMode}
-                                    error={healthFormError?.speciality}
+                                    error={healthFormError?.health_facility_type}
                                 />
                             </InputSection>
                             <InputSection
-                                title={strings.localUnitsFormOtherServices}
+                                title={strings.localUnitsFormOtherFacilityType}
                             >
                                 <TextInput
-                                    name="other_services"
-                                    value={value.health?.other_services}
+                                    name="other_facility_type"
+                                    value={value.health?.other_facility_type}
                                     onChange={onHealthFieldChange}
                                     readOnly={viewMode}
-                                    error={healthFormError?.other_services}
+                                    error={healthFormError?.other_facility_type}
                                 />
                             </InputSection>
                             <InputSection
-                                title={strings.localUnitsFormBloodServices}
+                                title={strings.localUnitsFormHealthFacilityType}
                             >
-                                <MultiSelectInput
-                                    name="blood_services"
-                                    options={localUnitsOptions?.blood_services}
-                                    value={value.health?.blood_services}
+                                <SelectInput
+                                    name="primary_health_care_center"
+                                    options={localUnitsOptions?.primary_health_care_center}
+                                    value={value.health?.primary_health_care_center}
                                     onChange={onHealthFieldChange}
-                                    keySelector={localUnitBloodServicesCodeSelector}
+                                    keySelector={LocalUnitPrimaryHealthCareCenterCodeSelector}
                                     labelSelector={stringNameSelector}
                                     readOnly={viewMode}
-                                    error={getErrorString(healthFormError?.blood_services)}
+                                    error={healthFormError?.primary_health_care_center}
                                 />
                             </InputSection>
                             <InputSection
-                                title={strings.localUnitsFormProfessionalTrainingFacilities}
+                                title={strings.localUnitsFormSpecialties}
                             >
-                                <MultiSelectInput
-                                    name="professional_training_facilities"
-                                    options={localUnitsOptions?.professional_training_facilities}
-                                    value={value.health?.professional_training_facilities}
+                                <TextInput
+                                    name="speciality"
+                                    value={value.health?.speciality}
                                     onChange={onHealthFieldChange}
-                                    keySelector={LocalUnitProfessionalTrainingCodeSelector}
-                                    labelSelector={stringNameSelector}
                                     readOnly={viewMode}
-                                    error={getErrorString(
-                                        healthFormError?.professional_training_facilities,
-                                    )}
+                                    error={healthFormError?.speciality}
                                 />
                             </InputSection>
+                        </div>
+                        <div>
                             <InputSection
-                                title={strings.localUnitsFormGeneralMedicalServices}
+                                title={strings.localUnitsFormHospitalType}
+                                withAsteriskOnTitle
                             >
-                                <MultiSelectInput
-                                    name="general_medical_services"
-                                    options={localUnitsOptions?.general_medical_services}
-                                    value={value.health?.general_medical_services}
+                                <SelectInput
+                                    name="hospital_type"
+                                    options={localUnitsOptions?.hospital_type}
+                                    value={value.health?.hospital_type}
                                     onChange={onHealthFieldChange}
-                                    keySelector={localUnitGeneralMedicalCodeSelector}
+                                    keySelector={LocalUnitPrimaryHealthCareCenterCodeSelector}
                                     labelSelector={stringNameSelector}
                                     readOnly={viewMode}
-                                    error={getErrorString(
-                                        healthFormError?.general_medical_services,
-                                    )}
+                                    error={healthFormError?.hospital_type}
                                 />
                             </InputSection>
                             <InputSection
-                                title={strings.localUnitsFormSpecialisation}
+                                title={strings.localUnitsFormTeachingHospital}
+                                withAsteriskOnTitle
                             >
-                                <SelectInput
-                                    name="specialist"
-                                    options={localUnitsOptions?.specialized_medical_services}
-                                    value={value.health?.specialist}
+                                <BooleanInput
+                                    name="is_teaching_hospital"
+                                    value={value.health?.is_teaching_hospital}
                                     onChange={onHealthFieldChange}
-                                    keySelector={localUnitGeneralMedicalCodeSelector}
-                                    labelSelector={stringNameSelector}
                                     readOnly={viewMode}
-                                    error={getErrorString(
-                                        healthFormError?.specialist,
-                                    )}
+                                    error={healthFormError?.is_teaching_hospital}
                                 />
                             </InputSection>
                             <InputSection
-                                title={strings.localUnitsFormSpecializedMedicalService}
+                                title={strings.localUnitsFormInPatientCapacity}
+                                withAsteriskOnTitle
                             >
-                                <MultiSelectInput
-                                    name="specialized_medical_beyond_primary_level"
-                                    options={localUnitsOptions?.specialized_medical_services}
-                                    value={value.health?.specialized_medical_beyond_primary_level}
+                                <BooleanInput
+                                    name="is_in_patient_capacity"
+                                    value={value.health?.is_in_patient_capacity}
                                     onChange={onHealthFieldChange}
-                                    keySelector={LocalUnitProfessionalTrainingCodeSelector}
-                                    labelSelector={stringNameSelector}
                                     readOnly={viewMode}
-                                    error={getErrorString(
-                                        healthFormError?.specialized_medical_beyond_primary_level,
-                                    )}
+                                    error={healthFormError?.is_in_patient_capacity}
+                                />
+                            </InputSection>
+                            <InputSection
+                                title={strings.localUnitsFormIsolationRoomsWards}
+                                withAsteriskOnTitle
+                            >
+                                <BooleanInput
+                                    name="is_isolation_rooms_wards"
+                                    value={value.health?.is_isolation_rooms_wards}
+                                    onChange={onHealthFieldChange}
+                                    readOnly={viewMode}
+                                    error={healthFormError?.is_isolation_rooms_wards}
                                 />
                             </InputSection>
                         </div>
+                    </Container>
+                    <Container
+                        heading={strings.localUnitsFacilityCapacityTitle}
+                        withHeaderBorder
+                        childrenContainerClassName={styles.addressContainer}
+                    >
                         <div>
                             <InputSection
                                 title={strings.localUnitsFormMaximumCapacity}
@@ -649,6 +658,8 @@ function AddEditLocalUnitsForm(props: Props) {
                                     )}
                                 />
                             </InputSection>
+                        </div>
+                        <div>
                             <InputSection
                                 title={strings.localUnitsFormAmbulanceTypeA}
                             >
@@ -690,6 +701,91 @@ function AddEditLocalUnitsForm(props: Props) {
                             </InputSection>
                         </div>
                     </Container>
+                    <Container
+                        heading={strings.localUnitsServicesTitle}
+                        withHeaderBorder
+                        childrenContainerClassName={styles.addressContainer}
+                    >
+                        <div>
+                            <InputSection
+                                title={strings.localUnitsFormGeneralMedicalServices}
+                            >
+                                <MultiSelectInput
+                                    name="general_medical_services"
+                                    options={localUnitsOptions?.general_medical_services}
+                                    value={value.health?.general_medical_services}
+                                    onChange={onHealthFieldChange}
+                                    keySelector={localUnitGeneralMedicalCodeSelector}
+                                    labelSelector={stringNameSelector}
+                                    readOnly={viewMode}
+                                    error={getErrorString(
+                                        healthFormError?.general_medical_services,
+                                    )}
+                                />
+                            </InputSection>
+                            <InputSection
+                                title={strings.localUnitsFormSpecializedMedicalService}
+                                withAsteriskOnTitle
+                            >
+                                <MultiSelectInput
+                                    name="specialized_medical_beyond_primary_level"
+                                    options={localUnitsOptions?.specialized_medical_services}
+                                    value={value.health?.specialized_medical_beyond_primary_level}
+                                    onChange={onHealthFieldChange}
+                                    keySelector={LocalUnitProfessionalTrainingCodeSelector}
+                                    labelSelector={stringNameSelector}
+                                    readOnly={viewMode}
+                                    error={getErrorString(
+                                        healthFormError?.specialized_medical_beyond_primary_level,
+                                    )}
+                                />
+                            </InputSection>
+                            <InputSection
+                                title={strings.localUnitsFormOtherServices}
+                            >
+                                <TextInput
+                                    name="other_services"
+                                    value={value.health?.other_services}
+                                    onChange={onHealthFieldChange}
+                                    readOnly={viewMode}
+                                    error={healthFormError?.other_services}
+                                />
+                            </InputSection>
+                        </div>
+                        <div>
+                            <InputSection
+                                title={strings.localUnitsFormBloodServices}
+                                withAsteriskOnTitle
+                            >
+                                <MultiSelectInput
+                                    name="blood_services"
+                                    options={localUnitsOptions?.blood_services}
+                                    value={value.health?.blood_services}
+                                    onChange={onHealthFieldChange}
+                                    keySelector={localUnitBloodServicesCodeSelector}
+                                    labelSelector={stringNameSelector}
+                                    readOnly={viewMode}
+                                    error={getErrorString(healthFormError?.blood_services)}
+                                />
+                            </InputSection>
+                            <InputSection
+                                title={strings.localUnitsFormProfessionalTrainingFacilities}
+                            >
+                                <MultiSelectInput
+                                    name="professional_training_facilities"
+                                    options={localUnitsOptions?.professional_training_facilities}
+                                    value={value.health?.professional_training_facilities}
+                                    onChange={onHealthFieldChange}
+                                    keySelector={LocalUnitProfessionalTrainingCodeSelector}
+                                    labelSelector={stringNameSelector}
+                                    readOnly={viewMode}
+                                    error={getErrorString(
+                                        healthFormError?.professional_training_facilities,
+                                    )}
+                                />
+                            </InputSection>
+                        </div>
+                    </Container>
                     <Container
                         heading={strings.localUnitsHumanResourcesTitle}
                         withHeaderBorder
@@ -722,6 +818,19 @@ function AddEditLocalUnitsForm(props: Props) {
                                     )}
                                 />
                             </InputSection>
+                            <InputSection
+                                title={strings.localUnitsFormSpecialist}
+                            >
+                                <NumberInput
+                                    name="specialist"
+                                    value={value.health?.specialist}
+                                    onChange={onHealthFieldChange}
+                                    readOnly={viewMode}
+                                    error={getErrorString(
+                                        healthFormError?.specialist,
+                                    )}
+                                />
+                            </InputSection>
                             <InputSection
                                 title={strings.localUnitsFormResidentsDoctor}
                             >
@@ -802,6 +911,17 @@ function AddEditLocalUnitsForm(props: Props) {
                                     )}
                                 />
                             </InputSection>
+                            <InputSection
+                                title={strings.localUnitsFormOtherProfiles}
+                            >
+                                <TextInput
+                                    name="other_profiles"
+                                    value={value.health?.other_profiles}
+                                    onChange={onHealthFieldChange}
+                                    readOnly={viewMode}
+                                    error={healthFormError?.other_profiles}
+                                />
+                            </InputSection>
                         </div>
                     </Container>
                     <InputSection
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/AddEditLocalUnitsModal/AddEditLocalUnitsForm/schema.ts b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/AddEditLocalUnitsModal/AddEditLocalUnitsForm/schema.ts
index 948aeec1fc..52a1e45c4b 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/AddEditLocalUnitsModal/AddEditLocalUnitsForm/schema.ts
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/AddEditLocalUnitsModal/AddEditLocalUnitsForm/schema.ts
@@ -1,5 +1,6 @@
 import {
     addCondition,
+    lengthSmallerThanCondition,
     nullValue,
     type ObjectSchema,
     type PartialForm,
@@ -38,13 +39,24 @@ const schema: LocalUnitsFormSchema = {
     fields: (formValue): LocalUnitsFormSchemaFields => {
         let formFields: LocalUnitsFormSchemaFields = {
             type: { required: true },
+            visibility_display: { required: true },
             location: {},
             subtype: {},
-            local_branch_name: {},
-            english_branch_name: {},
+            local_branch_name: {
+                required: true,
+                validations: [lengthSmallerThanCondition(200)],
+            },
+            english_branch_name: {
+                validations: [lengthSmallerThanCondition(200)],
+            },
             level: {},
-            focal_person_en: {},
-            focal_person_loc: {},
+            focal_person_en: {
+                validations: [lengthSmallerThanCondition(200)],
+            },
+            focal_person_loc: {
+                validations: [lengthSmallerThanCondition(200)],
+                required: true,
+            },
             source_en: {},
             address_en: {},
             address_loc: {},
@@ -70,22 +82,28 @@ const schema: LocalUnitsFormSchema = {
                                 functionality: { required: true },
                                 health_facility_type: { required: true },
                                 other_facility_type: {},
-                                other_affiliation: { required: true },
-                                is_teaching_hospital: {},
-                                is_in_patient_capacity: {},
-                                is_isolation_rooms_wards: {},
-                                // address
-                                focal_point_email: {},
-                                focal_point_position: {},
-                                focal_point_phone_number: {},
-                                // Specialities and capacity
-                                // ??
-                                specialized_medical_beyond_primary_level: {},
-                                // ??
+                                other_affiliation: {
+                                    validations: [lengthSmallerThanCondition(500)],
+                                },
+                                is_teaching_hospital: { required: true },
+                                is_in_patient_capacity: { required: true },
+                                is_isolation_rooms_wards: { required: true },
+                                focal_point_email: {
+                                    required: true,
+                                    validations: [lengthSmallerThanCondition(50)],
+                                },
+                                focal_point_position: {
+                                    validations: [lengthSmallerThanCondition(50)],
+                                },
+                                focal_point_phone_number: {
+                                    validations: [lengthSmallerThanCondition(50)],
+                                },
+                                hospital_type: { required: true },
+                                specialized_medical_beyond_primary_level: { required: true },
                                 other_services: {},
-                                blood_services: {},
+                                blood_services: { required: true },
                                 professional_training_facilities: {},
-                                general_medical_services: {},
+                                general_medical_services: { required: true },
                                 speciality: {},
                                 maximum_capacity: {},
                                 number_of_isolation_rooms: {},
@@ -94,8 +112,7 @@ const schema: LocalUnitsFormSchema = {
                                 ambulance_type_a: {},
                                 ambulance_type_b: {},
                                 ambulance_type_c: {},
-                                // Human resources
-                                total_number_of_human_resource: {},
+                                total_number_of_human_resource: { required: true },
                                 general_practitioner: {},
                                 specialist: {},
                                 residents_doctor: {},
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/AddEditLocalUnitsModal/index.tsx b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/AddEditLocalUnitsModal/index.tsx
index 6bbc8d8c7f..ede0a2ff19 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/AddEditLocalUnitsModal/index.tsx
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/AddEditLocalUnitsModal/index.tsx
@@ -1,3 +1,4 @@
+import { useState } from 'react';
 import { Modal } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import { resolveToString } from '@ifrc-go/ui/utils';
@@ -22,6 +23,12 @@ function AddEditLocalUnitsModal(props: Props) {
         url: '/api/v2/local-units-options/',
     });
 
+    const [localUnitType, setLocalUnitType] = useState<string | undefined>('Administrative');
+
+    const handleLocalUnitType = (type?: string) => {
+        setLocalUnitType(type);
+    };
+
     return (
         <Modal
             childrenContainerClassName={styles.addEditModal}
@@ -29,13 +36,14 @@ function AddEditLocalUnitsModal(props: Props) {
                 strings.localUnitsModalHeading,
                 {
                     // FIXME Pass local unit type
-                    type: 'Administrative',
+                    type: localUnitType,
                 },
             )}
             onClose={onClose}
             size="xl"
         >
             <AddEditLocalUnitsForm
+                onLocalUnitTypeClick={handleLocalUnitType}
                 localUnitsOptions={localUnitsOptions}
             />
         </Modal>
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/index.tsx b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/index.tsx
index caac158f5b..48a9499645 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/index.tsx
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/index.tsx
@@ -1,5 +1,4 @@
 import { useState } from 'react';
-import { useOutletContext } from 'react-router-dom';
 import {
     Button,
     Container,
@@ -15,7 +14,6 @@ import {
 import { _cs } from '@togglecorp/fujs';
 
 import useAuth from '#hooks/domain/useAuth';
-import { type CountryOutletContext } from '#utils/outletContext';
 
 import AddEditLocalUnitsModal from './AddEditLocalUnitsModal';
 import LocalUnitsMap from './LocalUnitsMap';