diff --git a/public/locale/en.json b/public/locale/en.json
index b0c3404f084..28a2245f470 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -331,6 +331,7 @@
   "add_insurance_details": "Add Insurance Details",
   "add_location": "Add Location",
   "add_new_beds": "Add New Bed(s)",
+  "add_new_facility": "Add New Facility",
   "add_new_patient": "Add New Patient",
   "add_new_user": "Add New User",
   "add_notes": "Add notes",
@@ -685,6 +686,7 @@
   "create_new_abha_address": "Create New ABHA Address",
   "create_new_abha_profile": "Don't have an ABHA Number",
   "create_new_asset": "Create New Asset",
+  "create_new_facility": "Create a new facility and add it to the organization.",
   "create_new_tag": "Create New Tag",
   "create_position_preset": "Create a new position preset",
   "create_position_preset_description": "Creates a new position preset in Care from the current position of the camera for the given name",
@@ -699,6 +701,7 @@
   "created_date": "Created Date",
   "created_on": "Created On",
   "creating": "Creating...",
+  "creating_facility": "Creating Facility...",
   "criticality": "Criticality",
   "csv_file_in_the_specified_format": "Select a CSV file in the specified format",
   "current_address": "Current Address",
@@ -812,6 +815,7 @@
   "edit_avatar_permission_error": "You do not have permissions to edit the avatar of this user",
   "edit_caution_note": "A new prescription will be added to the consultation with the edited details and the current prescription will be discontinued.",
   "edit_cover_photo": "Edit Cover Photo",
+  "edit_facility": "Edit Facility",
   "edit_history": "Edit History",
   "edit_policy": "Edit Insurance Policy",
   "edit_policy_description": "Add or edit patient's insurance details",
@@ -1070,7 +1074,9 @@
   "geolocation_is_not_supported_by_this_browser": "Geolocation is not supported by this browser",
   "get_auth_methods": "Get Available Authentication Methods",
   "get_auth_mode_error": "Could not find any supported authentication methods, Please try again with a different authentication method",
+  "get_current_location": "Get Current Location",
   "get_tests": "Get Tests",
+  "getting_location": "Getting Location...",
   "goal": "Our goal is to continuously improve the quality and accessibility of public healthcare services using digital tools.",
   "granted_on": "Granted On",
   "has_allergies": "Has Allergies",
@@ -1239,6 +1245,7 @@
   "local_ip_address_example": "e.g. 192.168.0.123",
   "location": "Location",
   "location_beds_empty": "No beds available in this location",
+  "location_details": "Location Details",
   "location_management": "Location Management",
   "location_updated_successfully": "Location updated successfully",
   "log_lab_results": "Log Lab Results",
@@ -2059,6 +2066,7 @@
   "update_asset_service_record": "Update Asset Service Record",
   "update_available": "Update Available",
   "update_bed": "Update Bed",
+  "update_existing_facility": "Update the details of the existing facility.",
   "update_facility": "Update Facility",
   "update_facility_middleware_success": "Facility middleware updated successfully",
   "update_log": "Update Log",
@@ -2078,6 +2086,7 @@
   "updated_on": "Updated On",
   "updates": "Updates",
   "updating": "Updating...",
+  "updating_facility": "Updating Facility...",
   "upload": "Upload",
   "upload_an_image": "Upload an image",
   "upload_file": "Upload File",
@@ -2167,6 +2176,7 @@
   "view_users": "View Users",
   "village": "Village",
   "virtual_nursing_assistant": "Virtual Nursing Assistant",
+  "visibility_settings": "Visibility Settings",
   "vitals": "Vitals",
   "vitals_monitor": "Vitals Monitor",
   "vitals_present": "Vitals Monitor present",
diff --git a/src/Routers/routes/FacilityRoutes.tsx b/src/Routers/routes/FacilityRoutes.tsx
index 44637fdbcf8..655d809bd33 100644
--- a/src/Routers/routes/FacilityRoutes.tsx
+++ b/src/Routers/routes/FacilityRoutes.tsx
@@ -1,6 +1,5 @@
 import { Redirect } from "raviger";
 
-import { FacilityCreate } from "@/components/Facility/FacilityCreate";
 import { FacilityHome } from "@/components/Facility/FacilityHome";
 import FacilityUsers from "@/components/Facility/FacilityUsers";
 import ResourceCreate from "@/components/Resource/ResourceCreate";
@@ -12,10 +11,7 @@ import FacilityOrganizationView from "@/pages/FacilityOrganization/FacilityOrgan
 
 const FacilityRoutes: AppRoutes = {
   "/facility": () => <Redirect to="/" />,
-  "/facility/create": () => <FacilityCreate />,
-  "/facility/:facilityId/update": ({ facilityId }) => (
-    <FacilityCreate facilityId={facilityId} />
-  ),
+
   "/facility/:facilityId": ({ facilityId }) => (
     <FacilityHome facilityId={facilityId} />
   ),
diff --git a/src/Utils/featureFlags.tsx b/src/Utils/featureFlags.tsx
index 98d1cbebbf7..e4952783f3b 100644
--- a/src/Utils/featureFlags.tsx
+++ b/src/Utils/featureFlags.tsx
@@ -1,11 +1,10 @@
 import { createContext, useContext, useEffect, useState } from "react";
 
-import { FacilityModel } from "@/components/Facility/models";
-
 import useAuthUser from "@/hooks/useAuthUser";
 
 import routes from "@/Utils/request/api";
 import useTanStackQueryInstead from "@/Utils/request/useQuery";
+import { FacilityData } from "@/types/facility/facility";
 
 export type FeatureFlag = "SCRIBE_ENABLED"; // "HCX_ENABLED" | "ABDM_ENABLED" |
 
@@ -48,9 +47,9 @@ export const FeatureFlagsProvider = (props: { children: React.ReactNode }) => {
   );
 };
 
-export const useFeatureFlags = (facility?: FacilityModel | string) => {
+export const useFeatureFlags = (facility?: FacilityData | string) => {
   const [facilityObject, setFacilityObject] = useState<
-    FacilityModel | undefined
+    FacilityData | undefined
   >(typeof facility === "string" ? undefined : facility);
 
   const context = useContext(FeatureFlagsContext);
diff --git a/src/Utils/request/api.tsx b/src/Utils/request/api.tsx
index eafc48e3c81..c05bc3be748 100644
--- a/src/Utils/request/api.tsx
+++ b/src/Utils/request/api.tsx
@@ -196,7 +196,7 @@ const routes = {
   getPermittedFacility: {
     path: "/api/v1/facility/{id}/",
     method: "GET",
-    TRes: Type<FacilityModel>(),
+    TRes: Type<FacilityData>(),
   },
 
   getAnyFacility: {
diff --git a/src/Utils/utils.ts b/src/Utils/utils.ts
index 5b6af0ac5a6..df4905709bd 100644
--- a/src/Utils/utils.ts
+++ b/src/Utils/utils.ts
@@ -1,5 +1,6 @@
 import { differenceInMinutes, format } from "date-fns";
 import html2canvas from "html2canvas";
+import { toast } from "sonner";
 
 import { AREACODES, IN_LANDLINE_AREA_CODES } from "@/common/constants";
 import phoneCodesJson from "@/common/static/countryPhoneAndFlags.json";
@@ -112,6 +113,10 @@ export const getPincodeDetails = async (pincode: string, apiKey: string) => {
     `https://api.data.gov.in/resource/6176ee09-3d56-4a3b-8115-21841576b2f6?api-key=${apiKey}&format=json&filters[pincode]=${pincode}&limit=1`,
   );
   const data = await response.json();
+  if (!data.records || data.records.length === 0) {
+    toast.error("Invalid pincode");
+    return null;
+  }
   return data.records[0];
 };
 
diff --git a/src/components/Facility/FacilityCreate.tsx b/src/components/Facility/FacilityCreate.tsx
deleted file mode 100644
index 59b87633a8f..00000000000
--- a/src/components/Facility/FacilityCreate.tsx
+++ /dev/null
@@ -1,521 +0,0 @@
-import {
-  Popover,
-  PopoverButton,
-  PopoverPanel,
-  Transition,
-} from "@headlessui/react";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useQuery } from "@tanstack/react-query";
-import { navigate } from "raviger";
-import { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { useTranslation } from "react-i18next";
-import { toast } from "sonner";
-import * as z from "zod";
-
-import Card from "@/CAREUI/display/Card";
-import CareIcon from "@/CAREUI/icons/CareIcon";
-
-import { Button } from "@/components/ui/button";
-import { Checkbox } from "@/components/ui/checkbox";
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/components/ui/select";
-import { Textarea } from "@/components/ui/textarea";
-
-import GLocationPicker from "@/components/Common/GLocationPicker";
-import Loading from "@/components/Common/Loading";
-import Page from "@/components/Common/Page";
-import { FacilityRequest } from "@/components/Facility/models";
-import { PhoneNumberValidator } from "@/components/Form/FieldValidators";
-import PhoneNumberFormField from "@/components/Form/FormFields/PhoneNumberFormField";
-import { MultiSelectFormField } from "@/components/Form/FormFields/SelectFormField";
-import TextAreaFormField from "@/components/Form/FormFields/TextAreaFormField";
-import TextFormField from "@/components/Form/FormFields/TextFormField";
-
-import useAppHistory from "@/hooks/useAppHistory";
-
-import { FACILITY_FEATURE_TYPES, FACILITY_TYPES } from "@/common/constants";
-import {
-  phonePreg,
-  validateLatitude,
-  validateLongitude,
-  validatePincode,
-} from "@/common/validation";
-
-import routes from "@/Utils/request/api";
-import query from "@/Utils/request/query";
-import request from "@/Utils/request/request";
-import { parsePhoneNumber } from "@/Utils/utils";
-import OrganizationSelector from "@/pages/Organization/components/OrganizationSelector";
-
-interface FacilityProps {
-  facilityId?: string;
-}
-export const FacilityCreate = (props: FacilityProps) => {
-  const { t } = useTranslation();
-  const { facilityId } = props;
-  const [isLoading, setIsLoading] = useState(false);
-  const { goBack } = useAppHistory();
-
-  const facilityFormSchema = z.object({
-    facility_type: z.string().min(1, { message: t("required") }),
-    name: z.string().min(1, { message: t("required") }),
-    description: z.string().optional(),
-    features: z.array(z.number()).default([]),
-    pincode: z.string().refine(validatePincode, {
-      message: t("invalid_pincode"),
-    }),
-    geo_organization: z.string().min(1, { message: t("required") }),
-    address: z.string().min(1, { message: t("required") }),
-    phone_number: z
-      .string()
-      .min(1, { message: t("required") })
-      .refine(
-        (val: string) => {
-          if (
-            !PhoneNumberValidator(["mobile", "landline"])(val) === undefined ||
-            !phonePreg(val)
-          ) {
-            return false;
-          }
-          return true;
-        },
-        {
-          message: t("invalid_phone_number"),
-        },
-      ),
-    latitude: z
-      .string()
-      .min(1, { message: t("required") })
-      .refine((val) => !val || validateLatitude(val), {
-        message: t("latitude_invalid"),
-      }),
-    longitude: z
-      .string()
-      .min(1, { message: t("required") })
-      .refine((val) => !val || validateLongitude(val), {
-        message: t("longitude_invalid"),
-      }),
-    is_public: z.boolean().default(false),
-  });
-
-  type FacilityFormValues = z.infer<typeof facilityFormSchema>;
-
-  const { data: facilityData } = useQuery({
-    queryKey: ["facility", facilityId],
-    queryFn: query(routes.getPermittedFacility, {
-      pathParams: { id: facilityId || "" },
-    }),
-    enabled: !!facilityId,
-  });
-
-  const form = useForm<FacilityFormValues>({
-    resolver: zodResolver(facilityFormSchema),
-    defaultValues: {
-      facility_type: "",
-      name: "",
-      description: "",
-      features: [],
-      pincode: "",
-      geo_organization: "",
-      address: "",
-      phone_number: "",
-      latitude: "",
-      longitude: "",
-      is_public: false,
-    },
-  });
-
-  // Update form when facility data is loaded
-  useEffect(() => {
-    if (facilityData) {
-      form.reset({
-        facility_type: facilityData.facility_type,
-        name: facilityData.name,
-        description: facilityData.description || "",
-        features: facilityData.features || [],
-        pincode: facilityData.pincode?.toString() || "",
-        geo_organization: facilityData.geo_organization,
-        address: facilityData.address,
-        phone_number: facilityData.phone_number,
-        latitude: facilityData.latitude?.toString() || "",
-        longitude: facilityData.longitude?.toString() || "",
-        is_public: facilityData.is_public,
-      });
-    }
-  }, [facilityData, form]);
-
-  const handleLocationChange = (location: google.maps.LatLng | undefined) => {
-    if (location) {
-      form.setValue("latitude", location.lat().toFixed(7));
-      form.setValue("longitude", location.lng().toFixed(7));
-    }
-  };
-
-  const handleSelectCurrentLocation = (
-    setCenter: (lat: number, lng: number) => void,
-  ) => {
-    if (navigator.geolocation) {
-      navigator.geolocation.getCurrentPosition((position) => {
-        form.setValue("latitude", String(position.coords.latitude));
-        form.setValue("longitude", String(position.coords.longitude));
-        setCenter?.(position.coords.latitude, position.coords.longitude);
-      });
-    }
-  };
-
-  const handleFeatureChange = (value: any) => {
-    const { value: features }: { value: Array<number> } = value;
-    form.setValue("features", features);
-  };
-
-  const onSubmit = async (data: FacilityFormValues) => {
-    setIsLoading(true);
-    try {
-      const requestData: FacilityRequest = {
-        ...data,
-        phone_number: parsePhoneNumber(data.phone_number),
-      };
-
-      const { res, data: responseData } = facilityId
-        ? await request(routes.updateFacility, {
-            body: requestData,
-            pathParams: { id: facilityId },
-          })
-        : await request(routes.createFacility, {
-            body: requestData,
-          });
-
-      if (res?.ok && responseData) {
-        toast.success(
-          facilityId
-            ? t("facility_updated_success")
-            : t("facility_added_successfully"),
-        );
-        navigate(`/facility/${responseData.id}`);
-      }
-    } catch (error) {
-      console.error(error);
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  return (
-    <Page
-      title={facilityId ? "Update Facility" : "Create Facility"}
-      crumbsReplacements={{
-        [facilityId || "????"]: { name: form.watch("name") },
-      }}
-    >
-      <Card className="mt-4">
-        <div className="md:p-4">
-          <Form {...form}>
-            <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
-              <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
-                <FormField
-                  control={form.control}
-                  name="facility_type"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>{t("facility_type")}</FormLabel>
-                      <Select
-                        onValueChange={field.onChange}
-                        value={field.value}
-                      >
-                        <FormControl>
-                          <SelectTrigger>
-                            <SelectValue placeholder="Select facility type" />
-                          </SelectTrigger>
-                        </FormControl>
-                        <SelectContent>
-                          {FACILITY_TYPES.map((type) => (
-                            <SelectItem key={type.text} value={type.text}>
-                              {type.text}
-                            </SelectItem>
-                          ))}
-                        </SelectContent>
-                      </Select>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <FormField
-                  control={form.control}
-                  name="name"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>{t("facility_name")}</FormLabel>
-                      <FormControl>
-                        <Input {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-              </div>
-
-              <FormField
-                control={form.control}
-                name="description"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>{t("description")}</FormLabel>
-                    <FormControl>
-                      <Textarea
-                        {...field}
-                        placeholder={t("markdown_supported")}
-                      />
-                    </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-
-              <FormField
-                control={form.control}
-                name="features"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>{t("features")}</FormLabel>
-                    <FormControl>
-                      <MultiSelectFormField
-                        name={field.name}
-                        value={field.value}
-                        placeholder={t("features")}
-                        options={FACILITY_FEATURE_TYPES}
-                        optionLabel={(o) => o.name}
-                        optionValue={(o) => o.id}
-                        onChange={handleFeatureChange}
-                        error={form.formState.errors.features?.message}
-                      />
-                    </FormControl>
-                  </FormItem>
-                )}
-              />
-              <div>
-                <FormField
-                  control={form.control}
-                  name="pincode"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>{t("pincode")}</FormLabel>
-                      <FormControl>
-                        <TextFormField
-                          {...field}
-                          required
-                          onChange={(value) => {
-                            field.onChange(value.value);
-                          }}
-                          error={form.formState.errors.pincode?.message}
-                        />
-                      </FormControl>
-                    </FormItem>
-                  )}
-                />
-              </div>
-              <div className="col-span-2 grid grid-cols-2 gap-5">
-                <OrganizationSelector
-                  required={true}
-                  onChange={(value) => form.setValue("geo_organization", value)}
-                />
-              </div>
-
-              <div className="grid grid-cols-1 sm:grid-cols-5 gap-3">
-                <FormField
-                  control={form.control}
-                  name="address"
-                  render={({ field }) => (
-                    <FormItem className="sm:col-span-3">
-                      <FormLabel>{t("address")}</FormLabel>
-                      <FormControl>
-                        <TextAreaFormField
-                          {...field}
-                          required
-                          onChange={(value) => {
-                            field.onChange(value.value);
-                          }}
-                        />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-                <FormField
-                  control={form.control}
-                  name="phone_number"
-                  render={({ field }) => (
-                    <FormItem className="sm:col-span-2">
-                      <FormControl>
-                        <PhoneNumberFormField
-                          label={
-                            <FormLabel>
-                              {t("emergency_contact_number")}
-                            </FormLabel>
-                          }
-                          {...field}
-                          types={["mobile", "landline"]}
-                          onChange={(value) => {
-                            field.onChange(value.value);
-                          }}
-                          error={form.formState.errors.phone_number?.message}
-                        />
-                      </FormControl>
-                    </FormItem>
-                  )}
-                />
-              </div>
-              <div className="flex flex-row items-center gap-3">
-                <FormField
-                  control={form.control}
-                  name="latitude"
-                  render={({ field }) => (
-                    <FormItem className="flex-1">
-                      <FormLabel>{t("location")}</FormLabel>
-                      <FormControl>
-                        <TextFormField
-                          className="flex-1"
-                          {...field}
-                          placeholder="Latitude"
-                          onChange={(value) => {
-                            field.onChange(value.value);
-                          }}
-                          error={form.formState.errors.latitude?.message}
-                        />
-                      </FormControl>
-                    </FormItem>
-                  )}
-                />
-
-                <div className="flex flex-col justify-center md:block">
-                  <Popover id="map-popover" className="relative">
-                    <>
-                      <PopoverButton>
-                        <Button
-                          variant="primary"
-                          type="button"
-                          id="facility-location-button"
-                          className="tooltip p-2 rounded-3xl"
-                        >
-                          <CareIcon icon="l-map-marker" className="text-xl" />
-                          <span className="tooltip-text tooltip-bottom">
-                            Select location from map
-                          </span>
-                        </Button>
-                      </PopoverButton>
-
-                      <Transition
-                        enter="transition ease-out duration-200"
-                        enterFrom="opacity-0 translate-y-1"
-                        enterTo="opacity-100 translate-y-0"
-                        leave="transition ease-in duration-150"
-                        leaveFrom="opacity-100 translate-y-0"
-                        leaveTo="opacity-0 translate-y-1"
-                      >
-                        <PopoverPanel className="absolute -right-36 bottom-10 sm:-right-48">
-                          <GLocationPicker
-                            lat={Number(form.getValues("latitude"))}
-                            lng={Number(form.getValues("longitude"))}
-                            handleOnChange={handleLocationChange}
-                            handleOnClose={() => null}
-                            handleOnSelectCurrentLocation={
-                              handleSelectCurrentLocation
-                            }
-                          />
-                        </PopoverPanel>
-                      </Transition>
-                    </>
-                  </Popover>
-                </div>
-                <FormField
-                  control={form.control}
-                  name="longitude"
-                  render={({ field }) => (
-                    <FormItem className="flex-1">
-                      <FormLabel>{t("location")}</FormLabel>
-                      <FormControl>
-                        <TextFormField
-                          className="flex-1"
-                          {...field}
-                          placeholder="Longitude"
-                          onChange={(value) => {
-                            field.onChange(value.value);
-                          }}
-                          error={form.formState.errors.longitude?.message}
-                        />
-                      </FormControl>
-                    </FormItem>
-                  )}
-                />
-              </div>
-
-              {/* Visibility Settings */}
-              <div className="space-y-4 rounded-lg border p-4">
-                <h3 className="text-lg font-medium">Visibility Settings</h3>
-                <FormField
-                  control={form.control}
-                  name="is_public"
-                  render={({ field }) => (
-                    <FormItem className="flex flex-row items-start space-x-3 space-y-0 rounded-md border p-4 bg-muted/5">
-                      <FormControl>
-                        <Checkbox
-                          checked={field.value}
-                          onCheckedChange={field.onChange}
-                        />
-                      </FormControl>
-                      <div className="space-y-1 leading-none">
-                        <FormLabel className="text-base">
-                          Make this facility public
-                        </FormLabel>
-                        <p className="text-sm text-muted-foreground">
-                          When enabled, this facility will be visible to the
-                          public and can be discovered by anyone using the
-                          platform
-                        </p>
-                      </div>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-              </div>
-
-              <div className="mt-6 flex flex-col-reverse justify-end gap-3 sm:flex-row">
-                <Button
-                  variant="outline"
-                  onClick={() => goBack()}
-                  type="button"
-                >
-                  {t("cancel")}
-                </Button>
-                <Button variant="primary" type="submit" disabled={isLoading}>
-                  {isLoading ? (
-                    <Loading />
-                  ) : facilityId ? (
-                    t("update_facility")
-                  ) : (
-                    t("save_facility")
-                  )}
-                </Button>
-              </div>
-            </form>
-          </Form>
-        </div>
-      </Card>
-    </Page>
-  );
-};
diff --git a/src/components/Facility/CreateFacilityForm.tsx b/src/components/Facility/FacilityForm.tsx
similarity index 73%
rename from src/components/Facility/CreateFacilityForm.tsx
rename to src/components/Facility/FacilityForm.tsx
index 718da1d2318..dd8611fc2f0 100644
--- a/src/components/Facility/CreateFacilityForm.tsx
+++ b/src/components/Facility/FacilityForm.tsx
@@ -1,6 +1,8 @@
+import careConfig from "@careConfig";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { useState } from "react";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { t } from "i18next";
+import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
@@ -39,9 +41,14 @@ import {
 
 import routes from "@/Utils/request/api";
 import mutate from "@/Utils/request/mutate";
-import { parsePhoneNumber } from "@/Utils/utils";
+import query from "@/Utils/request/query";
+import { getPincodeDetails, parsePhoneNumber } from "@/Utils/utils";
 import OrganizationSelector from "@/pages/Organization/components/OrganizationSelector";
 import { BaseFacility } from "@/types/facility/facility";
+import { Organization } from "@/types/organization/organization";
+import { useFetchOrganizationByName } from "@/types/organization/organizationApi";
+
+import { FacilityModel } from "./models";
 
 const facilityFormSchema = z.object({
   facility_type: z.string().min(1, "Facility type is required"),
@@ -49,6 +56,7 @@ const facilityFormSchema = z.object({
   description: z.string().optional(),
   features: z.array(z.number()).default([]),
   pincode: z.string().refine(validatePincode, "Invalid pincode"),
+  geo_organization: z.string().min(1, t("organization_required")).optional(),
   address: z.string().min(1, "Address is required"),
   phone_number: z
     .string()
@@ -69,18 +77,19 @@ const facilityFormSchema = z.object({
 
 type FacilityFormValues = z.infer<typeof facilityFormSchema>;
 
-interface Props {
-  organizationId: string;
+interface FacilityProps {
+  organizationId?: string;
+  facilityId?: string;
   onSubmitSuccess?: () => void;
 }
 
-export default function CreateFacilityForm({
-  organizationId,
-  onSubmitSuccess,
-}: Props) {
+export default function FacilityForm(props: FacilityProps) {
   const { t } = useTranslation();
   const queryClient = useQueryClient();
   const [isGettingLocation, setIsGettingLocation] = useState(false);
+  const { facilityId, onSubmitSuccess } = props;
+  const [selectedLevels, setSelectedLevels] = useState<Organization[]>([]);
+  const [pincode, setPincode] = useState("");
 
   const form = useForm<FacilityFormValues>({
     resolver: zodResolver(facilityFormSchema),
@@ -90,6 +99,7 @@ export default function CreateFacilityForm({
       description: "",
       features: [],
       pincode: "",
+      geo_organization: "",
       address: "",
       phone_number: "+91",
       latitude: "",
@@ -106,24 +116,44 @@ export default function CreateFacilityForm({
       form.reset();
       onSubmitSuccess?.();
     },
-    onError: (error: Error) => {
-      const errorData = error.cause as { errors: { msg: string[] } };
-      if (errorData?.errors?.msg) {
-        errorData.errors.msg.forEach((msg) => {
-          toast.error(msg);
-        });
-      } else {
-        toast.error(t("facility_add_error"));
-      }
+  });
+
+  const { mutate: updateFacility, isPending: isUpdatePending } = useMutation({
+    mutationFn: mutate(routes.updateFacility, {
+      pathParams: { id: facilityId || "" },
+    }),
+    onSuccess: (_data: FacilityModel) => {
+      toast.success(t("facility_updated_successfully"));
+      queryClient.invalidateQueries({ queryKey: ["organizationFacilities"] });
+      form.reset();
+      onSubmitSuccess?.();
     },
   });
 
-  const onSubmit = (data: FacilityFormValues) => {
-    createFacility({
+  const { data: facilityData } = useQuery({
+    queryKey: ["facility", facilityId],
+    queryFn: query(routes.getPermittedFacility, {
+      pathParams: { id: facilityId || "" },
+    }),
+    enabled: !!facilityId,
+  });
+
+  const onSubmit: (data: FacilityFormValues) => void = (
+    data: FacilityFormValues,
+  ) => {
+    const requestData = {
       ...data,
       phone_number: parsePhoneNumber(data.phone_number),
-      geo_organization: organizationId,
-    });
+      geo_organization: data?.geo_organization
+        ? JSON.parse(data.geo_organization)?.id
+        : undefined,
+    };
+
+    if (facilityId) {
+      updateFacility(requestData);
+    } else {
+      createFacility(requestData);
+    }
   };
 
   const handleFeatureChange = (value: any) => {
@@ -131,6 +161,25 @@ export default function CreateFacilityForm({
     form.setValue("features", features);
   };
 
+  // Update form when facility data is loaded
+  useEffect(() => {
+    if (facilityData) {
+      form.reset({
+        facility_type: facilityData.facility_type,
+        name: facilityData.name,
+        description: facilityData.description || "",
+        features: facilityData.features || [],
+        pincode: facilityData.pincode?.toString() || "",
+        geo_organization: JSON.stringify(facilityData?.geo_organization) || "",
+        address: facilityData.address,
+        phone_number: facilityData.phone_number,
+        latitude: facilityData.latitude?.toString() || "",
+        longitude: facilityData.longitude?.toString() || "",
+        is_public: facilityData.is_public,
+      });
+    }
+  }, [facilityData, form]);
+
   const handleGetCurrentLocation = () => {
     if (navigator.geolocation) {
       setIsGettingLocation(true);
@@ -145,19 +194,48 @@ export default function CreateFacilityForm({
           setIsGettingLocation(false);
           toast.error(t("unable_to_get_location") + error.message);
         },
-        { timeout: 10000 }, // 10 second timeout
+        { timeout: 10000 },
       );
     } else {
       toast.error(t("geolocation_is_not_supported_by_this_browser"));
     }
   };
 
+  const { data: pincodeData } = useQuery({
+    queryKey: ["pincodeDetails", pincode],
+    queryFn: () => getPincodeDetails(pincode, careConfig.govDataApiKey),
+    enabled:
+      validatePincode(pincode) &&
+      Number(pincode) !== Number(facilityData?.pincode),
+  });
+  const { statename: stateName, districtname: districtName } =
+    pincodeData || {};
+
+  const { data: stateOrg } = useFetchOrganizationByName(stateName);
+  const { data: districtOrg } = useFetchOrganizationByName(
+    districtName,
+    stateOrg?.id,
+  );
+
+  useEffect(() => {
+    if (stateOrg && districtOrg) {
+      setSelectedLevels([stateOrg, districtOrg]);
+    } else {
+      setSelectedLevels([]);
+    }
+  }, [stateOrg, districtOrg]);
+
+  const handlePincodeChange = (value: string) => {
+    setPincode(value);
+    setSelectedLevels([]);
+  };
+
   return (
     <Form {...form}>
       <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-8">
         {/* Basic Information */}
         <div className="space-y-4 rounded-lg border p-4">
-          <h3 className="text-lg font-medium">Basic Information</h3>
+          <h3 className="text-lg font-medium">{t("basic_info")}</h3>
           <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
             <FormField
               control={form.control}
@@ -253,7 +331,7 @@ export default function CreateFacilityForm({
 
         {/* Contact Information */}
         <div className="space-y-4 rounded-lg border p-4">
-          <h3 className="text-lg font-medium">Contact Information</h3>
+          <h3 className="text-lg font-medium">{t("contact_info")}</h3>
           <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
             <FormField
               control={form.control}
@@ -285,7 +363,29 @@ export default function CreateFacilityForm({
                     <Input
                       data-cy="facility-pincode"
                       placeholder="Enter pincode"
+                      maxLength={6}
                       {...field}
+                      onChange={(e) => {
+                        field.onChange(e);
+                        handlePincodeChange(e.target.value);
+                      }}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              name="geo_organization"
+              render={({ field }) => (
+                <FormItem className="md:col-span-2 grid-cols-1 grid md:grid-cols-2 gap-5">
+                  <FormControl>
+                    <OrganizationSelector
+                      value={field.value}
+                      parentSelectedLevels={selectedLevels}
+                      onChange={field.onChange}
+                      required
                     />
                   </FormControl>
                   <FormMessage />
@@ -317,7 +417,7 @@ export default function CreateFacilityForm({
         {/* Location Information */}
         <div className="space-y-4 rounded-lg border p-4">
           <div className="flex items-center justify-between">
-            <h3 className="text-lg font-medium">Location Details</h3>
+            <h3 className="text-lg font-medium">{t("location_details")}</h3>
             <Button
               type="button"
               variant="outline"
@@ -330,12 +430,12 @@ export default function CreateFacilityForm({
               {isGettingLocation ? (
                 <>
                   <CareIcon icon="l-spinner" className="h-4 w-4 animate-spin" />
-                  Getting Location...
+                  {t("getting_location")}
                 </>
               ) : (
                 <>
                   <CareIcon icon="l-location-point" className="h-4 w-4" />
-                  Get Current Location
+                  {t("get_current_location")}
                 </>
               )}
             </Button>
@@ -386,7 +486,7 @@ export default function CreateFacilityForm({
 
         {/* Visibility Settings */}
         <div className="space-y-4 rounded-lg border p-4">
-          <h3 className="text-lg font-medium">Visibility Settings</h3>
+          <h3 className="text-lg font-medium">{t("visibility_settings")}</h3>
           <FormField
             control={form.control}
             name="is_public"
@@ -412,43 +512,36 @@ export default function CreateFacilityForm({
               </FormItem>
             )}
           />
-
-          {!organizationId && (
-            <FormField
-              name="geo_organization"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Organization</FormLabel>
-                  <FormControl>
-                    <OrganizationSelector
-                      value={field.value}
-                      onChange={field.onChange}
-                      required
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-          )}
         </div>
 
         <Button
           type="submit"
           className="w-full"
-          disabled={isPending}
-          data-cy="submit-facility"
+          disabled={facilityId ? isUpdatePending : isPending}
+          data-cy={facilityId ? "update-facility" : "submit-facility"}
         >
-          {isPending ? (
+          {facilityId ? (
+            isUpdatePending ? (
+              <>
+                <CareIcon
+                  icon="l-spinner"
+                  className="mr-2 h-4 w-4 animate-spin"
+                />
+                {t("updating_facility")}
+              </>
+            ) : (
+              t("update_facility")
+            )
+          ) : isPending ? (
             <>
               <CareIcon
                 icon="l-spinner"
                 className="mr-2 h-4 w-4 animate-spin"
               />
-              Creating Facility...
+              {t("creating_facility")}
             </>
           ) : (
-            "Create Facility"
+            t("create_facility")
           )}
         </Button>
       </form>
diff --git a/src/components/Facility/FacilityHome.tsx b/src/components/Facility/FacilityHome.tsx
index 1dbaf401e40..8fe87a6d78f 100644
--- a/src/components/Facility/FacilityHome.tsx
+++ b/src/components/Facility/FacilityHome.tsx
@@ -31,6 +31,7 @@ import request from "@/Utils/request/request";
 import uploadFile from "@/Utils/request/uploadFile";
 import { getAuthorizationHeader } from "@/Utils/request/utils";
 import { sleep } from "@/Utils/utils";
+import EditFacilitySheet from "@/pages/Organization/components/EditFacilitySheet";
 import { FacilityData } from "@/types/facility/facility";
 import type {
   Organization,
@@ -234,6 +235,7 @@ export const FacilityHome = ({ facilityId }: Props) => {
                       <DropdownMenuContent align="end" className="w-56">
                         {hasPermissionToEditCoverImage && (
                           <DropdownMenuItem
+                            className="cursor-pointer"
                             onClick={() => setEditCoverImage(true)}
                           >
                             <Settings className="mr-2 h-4 w-4" />
@@ -241,12 +243,13 @@ export const FacilityHome = ({ facilityId }: Props) => {
                           </DropdownMenuItem>
                         )}
                         <DropdownMenuItem
-                          onClick={() =>
-                            navigate(`/facility/${facilityId}/update`)
-                          }
+                          className=" cursor-pointer"
+                          onSelect={(e) => {
+                            e.preventDefault();
+                          }}
                         >
                           <Settings className="mr-2 h-4 w-4" />
-                          {t("update_facility")}
+                          <EditFacilitySheet facilityId={facilityId} />
                         </DropdownMenuItem>
                         {/* TODO: get permissions from backend */}
                         {/* {hasPermissionToDeleteFacility && (
diff --git a/src/pages/Appointments/AppointmentDetail.tsx b/src/pages/Appointments/AppointmentDetail.tsx
index 93ba489a65d..cfcec8c2bef 100644
--- a/src/pages/Appointments/AppointmentDetail.tsx
+++ b/src/pages/Appointments/AppointmentDetail.tsx
@@ -46,7 +46,6 @@ import { Separator } from "@/components/ui/separator";
 
 import Loading from "@/components/Common/Loading";
 import Page from "@/components/Common/Page";
-import { FacilityModel } from "@/components/Facility/models";
 
 import routes from "@/Utils/request/api";
 import mutate from "@/Utils/request/mutate";
@@ -61,6 +60,7 @@ import {
   formatAppointmentSlotTime,
   printAppointment,
 } from "@/pages/Appointments/utils";
+import { FacilityData } from "@/types/facility/facility";
 import {
   Appointment,
   AppointmentStatuses,
@@ -207,7 +207,7 @@ const AppointmentDetails = ({
   facility,
 }: {
   appointment: Appointment;
-  facility: FacilityModel;
+  facility: FacilityData;
 }) => {
   const { patient, user } = appointment;
   const { t } = useTranslation();
diff --git a/src/pages/Appointments/components/AppointmentTokenCard.tsx b/src/pages/Appointments/components/AppointmentTokenCard.tsx
index 9f563852a82..7dc65f84c3f 100644
--- a/src/pages/Appointments/components/AppointmentTokenCard.tsx
+++ b/src/pages/Appointments/components/AppointmentTokenCard.tsx
@@ -4,17 +4,16 @@ import { useTranslation } from "react-i18next";
 import { Card } from "@/components/ui/card";
 import { Label } from "@/components/ui/label";
 
-import { FacilityModel } from "@/components/Facility/models";
-
 import { formatName, formatPatientAge } from "@/Utils/utils";
 import { formatAppointmentSlotTime } from "@/pages/Appointments/utils";
 import { getFakeTokenNumber } from "@/pages/Scheduling/utils";
+import { FacilityData } from "@/types/facility/facility";
 import { Appointment } from "@/types/scheduling/schedule";
 
 interface Props {
   id?: string;
   appointment: Appointment;
-  facility: FacilityModel;
+  facility: FacilityData;
 }
 
 const AppointmentTokenCard = ({ id, appointment, facility }: Props) => {
diff --git a/src/pages/Appointments/utils.ts b/src/pages/Appointments/utils.ts
index 4b131e50382..2ff300cd8b8 100644
--- a/src/pages/Appointments/utils.ts
+++ b/src/pages/Appointments/utils.ts
@@ -10,8 +10,6 @@ import {
 import { TFunction } from "i18next";
 import { toast } from "sonner";
 
-import { FacilityModel } from "@/components/Facility/models";
-
 import query from "@/Utils/request/query";
 import {
   dateQueryString,
@@ -20,6 +18,7 @@ import {
   getMonthStartAndEnd,
 } from "@/Utils/utils";
 import { getFakeTokenNumber } from "@/pages/Scheduling/utils";
+import { FacilityData } from "@/types/facility/facility";
 import {
   Appointment,
   AvailabilityHeatmapResponse,
@@ -142,7 +141,7 @@ export const printAppointment = ({
   appointment,
 }: {
   t: TFunction;
-  facility: FacilityModel;
+  facility: FacilityData;
   appointment: Appointment;
 }) => {
   const patient = appointment.patient;
diff --git a/src/pages/Organization/OrganizationFacilities.tsx b/src/pages/Organization/OrganizationFacilities.tsx
index 82055af8caf..7cf6c3ba269 100644
--- a/src/pages/Organization/OrganizationFacilities.tsx
+++ b/src/pages/Organization/OrganizationFacilities.tsx
@@ -17,6 +17,7 @@ import query from "@/Utils/request/query";
 import { BaseFacility } from "@/types/facility/facility";
 
 import AddFacilitySheet from "./components/AddFacilitySheet";
+import EditFacilitySheet from "./components/EditFacilitySheet";
 import OrganizationLayout from "./components/OrganizationLayout";
 
 interface Props {
@@ -114,62 +115,65 @@ export default function OrganizationFacilities({
             </Card>
           ) : (
             facilities?.results?.map((facility: BaseFacility) => (
-              <Link
+              <Card
                 key={facility.id}
-                href={`/facility/${facility.id}`}
-                className="block"
+                className="h-full hover:border-primary/50 transition-colors overflow-hidden"
               >
-                <Card className="h-full hover:border-primary/50 transition-colors overflow-hidden">
-                  <div className="relative h-48 bg-gray-100">
-                    {facility.read_cover_image_url ? (
-                      <img
-                        src={facility.read_cover_image_url}
-                        alt={facility.name}
-                        className="w-full h-full object-cover"
-                      />
-                    ) : (
-                      <div className="w-full h-full flex items-center justify-center overflow-hidden">
-                        <Avatar name={facility.name} />
-                      </div>
-                    )}
-                  </div>
-                  <CardContent className="p-6">
-                    <div className="flex flex-col h-full">
-                      <div className="flex items-start justify-between">
-                        <div>
-                          <h3 className="text-md font-medium text-gray-900">
-                            {facility.name}
-                          </h3>
-                          <div className="font-medium">
-                            {facility.facility_type}
-                          </div>
+                <div className="relative h-48 bg-gray-100">
+                  {facility.read_cover_image_url ? (
+                    <img
+                      src={facility.read_cover_image_url}
+                      alt={facility.name}
+                      className="w-full h-full object-cover"
+                    />
+                  ) : (
+                    <div className="w-full h-full flex items-center justify-center overflow-hidden">
+                      <Avatar name={facility.name} />
+                    </div>
+                  )}
+                </div>
+                <CardContent className="p-6">
+                  <div className="flex flex-col h-full">
+                    <div className="flex items-start justify-between">
+                      <div>
+                        <h3 className="text-md font-medium text-gray-900">
+                          {facility.name}
+                        </h3>
+                        <div className="font-medium">
+                          {facility.facility_type}
                         </div>
                       </div>
                     </div>
-                  </CardContent>
-                  <CardFooter className="flex justify-end">
-                    <Link
-                      href={`/facility/${facility.id}`}
-                      className="text-sm text-primary hover:underline"
+                  </div>
+                </CardContent>
+                <CardFooter className="flex justify-between">
+                  <div className="flex items-center text-primary cursor-pointer">
+                    <CareIcon icon="l-edit" className="mr-1 h-4 w-4" />
+                    <p className="hover:underline text-underline-offset-[4px] text-decoration-thickness-[2px]">
+                      <EditFacilitySheet
+                        organizationId={id}
+                        facilityId={facility.id}
+                      />
+                    </p>
+                  </div>
+                  <div>
+                    <Button
+                      variant="link"
+                      size="icon"
+                      className="text-primary"
+                      asChild
                     >
-                      View Facility
-                      <Button
-                        variant="ghost"
-                        size="icon"
-                        className="shrink-0"
-                        asChild
+                      <Link
+                        href={`/facility/${facility.id}`}
+                        className="text-sm w-full hover:underline"
                       >
-                        <div>
-                          <CareIcon
-                            icon="l-arrow-up-right"
-                            className="h-4 w-4"
-                          />
-                        </div>
-                      </Button>
-                    </Link>
-                  </CardFooter>
-                </Card>
-              </Link>
+                        {t("view_facility")}
+                        <CareIcon icon="l-arrow-up-right" className="h-4 w-4" />
+                      </Link>
+                    </Button>
+                  </div>
+                </CardFooter>
+              </Card>
             ))
           )}
         </div>
diff --git a/src/pages/Organization/components/AddFacilitySheet.tsx b/src/pages/Organization/components/AddFacilitySheet.tsx
index 4474baaffe8..33bd5d40f6f 100644
--- a/src/pages/Organization/components/AddFacilitySheet.tsx
+++ b/src/pages/Organization/components/AddFacilitySheet.tsx
@@ -1,4 +1,5 @@
 import { useQueryClient } from "@tanstack/react-query";
+import { t } from "i18next";
 import { useState } from "react";
 
 import CareIcon from "@/CAREUI/icons/CareIcon";
@@ -13,7 +14,7 @@ import {
   SheetTrigger,
 } from "@/components/ui/sheet";
 
-import CreateFacilityForm from "@/components/Facility/CreateFacilityForm";
+import FacilityForm from "@/components/Facility/FacilityForm";
 
 interface Props {
   organizationId: string;
@@ -28,18 +29,16 @@ export default function AddFacilitySheet({ organizationId }: Props) {
       <SheetTrigger asChild>
         <Button variant="outline" data-cy="add-facility-button">
           <CareIcon icon="l-plus" className="mr-2 h-4 w-4" />
-          Add Facility
+          {t("add_facility")}
         </Button>
       </SheetTrigger>
       <SheetContent className="w-full sm:max-w-2xl overflow-y-auto">
         <SheetHeader>
-          <SheetTitle>Add New Facility</SheetTitle>
-          <SheetDescription>
-            Create a new facility and add it to the organization.
-          </SheetDescription>
+          <SheetTitle>{t("add_new_facility")}</SheetTitle>
+          <SheetDescription>{t("create_new_facility")}</SheetDescription>
         </SheetHeader>
         <div className="mt-6">
-          <CreateFacilityForm
+          <FacilityForm
             organizationId={organizationId}
             onSubmitSuccess={() => {
               setOpen(false);
diff --git a/src/pages/Organization/components/EditFacilitySheet.tsx b/src/pages/Organization/components/EditFacilitySheet.tsx
new file mode 100644
index 00000000000..8f09002e3db
--- /dev/null
+++ b/src/pages/Organization/components/EditFacilitySheet.tsx
@@ -0,0 +1,49 @@
+import { useQueryClient } from "@tanstack/react-query";
+import { t } from "i18next";
+import { useState } from "react";
+
+import {
+  Sheet,
+  SheetContent,
+  SheetDescription,
+  SheetHeader,
+  SheetTitle,
+  SheetTrigger,
+} from "@/components/ui/sheet";
+
+import FacilityForm from "@/components/Facility/FacilityForm";
+
+interface Props {
+  organizationId?: string;
+  facilityId: string;
+}
+
+export default function EditFacilitySheet({ facilityId }: Props) {
+  const queryClient = useQueryClient();
+  const [open, setOpen] = useState(false);
+
+  return (
+    <Sheet open={open} onOpenChange={setOpen}>
+      <SheetTrigger asChild>
+        <p className="text-sm" data-cy="edit-facility-button">
+          {t("edit_facility")}
+        </p>
+      </SheetTrigger>
+      <SheetContent className="w-full sm:max-w-2xl overflow-y-auto">
+        <SheetHeader>
+          <SheetTitle>{t("edit_facility")}</SheetTitle>
+          <SheetDescription>{t("update_existing_facility")}</SheetDescription>
+        </SheetHeader>
+        <div className="mt-6">
+          <FacilityForm
+            facilityId={facilityId}
+            onSubmitSuccess={() => {
+              setOpen(false);
+              queryClient.invalidateQueries({ queryKey: ["currentUser"] });
+            }}
+          />
+        </div>
+      </SheetContent>
+    </Sheet>
+  );
+}
diff --git a/src/pages/Organization/components/OrganizationSelector.tsx b/src/pages/Organization/components/OrganizationSelector.tsx
index 286940c87f9..7d0c2683bc9 100644
--- a/src/pages/Organization/components/OrganizationSelector.tsx
+++ b/src/pages/Organization/components/OrganizationSelector.tsx
@@ -1,6 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
 import { t } from "i18next";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 
 import CareIcon from "@/CAREUI/icons/CareIcon";
 
@@ -9,14 +9,18 @@ import { Button } from "@/components/ui/button";
 import { Label } from "@/components/ui/label";
 
 import query from "@/Utils/request/query";
-import { Organization } from "@/types/organization/organization";
+import {
+  Organization,
+  OrganizationParent,
+} from "@/types/organization/organization";
 import organizationApi from "@/types/organization/organizationApi";
 
 interface OrganizationSelectorProps {
-  value?: string;
+  value?: Organization | string;
   onChange: (value: string) => void;
   required?: boolean;
   authToken?: string;
+  parentSelectedLevels?: Organization[];
 }
 
 interface AutoCompleteOption {
@@ -26,10 +30,30 @@ interface AutoCompleteOption {
 
 // TODO: Rename to GovtOrganizationSelector
 export default function OrganizationSelector(props: OrganizationSelectorProps) {
-  const { onChange, required } = props;
+  const { value, onChange, required, parentSelectedLevels } = props;
   const [selectedLevels, setSelectedLevels] = useState<Organization[]>([]);
   const [searchQuery, setSearchQuery] = useState("");
 
+  useEffect(() => {
+    if (value && parentSelectedLevels?.length == 0) {
+      const parsedValue = typeof value === "string" ? JSON.parse(value) : value;
+
+      if (typeof parsedValue === "object") {
+        const levels: Organization[] = [];
+        let current: OrganizationParent = parsedValue;
+
+        while (current.parent) {
+          levels.unshift(current as Organization);
+          current = current.parent;
+        }
+
+        setSelectedLevels(levels);
+      }
+    } else if (parentSelectedLevels) {
+      setSelectedLevels(parentSelectedLevels);
+    }
+  }, [value, parentSelectedLevels]);
+
   const headers = props.authToken
     ? {
         headers: {
@@ -149,7 +173,7 @@ export default function OrganizationSelector(props: OrganizationSelectorProps) {
             )}
           </Label>
           <Autocomplete
-            value=""
+            value={""}
             options={getOrganizationOptions(
               selectedLevels.length === 0
                 ? getAllOrganizations?.results
diff --git a/src/types/facility/facility.ts b/src/types/facility/facility.ts
index 4a14964e34a..4f16fea257c 100644
--- a/src/types/facility/facility.ts
+++ b/src/types/facility/facility.ts
@@ -1,3 +1,5 @@
+import { FeatureFlag } from "@/Utils/featureFlags";
+
 import { Organization } from "../organization/organization";
 
 export interface BaseFacility {
@@ -26,6 +28,9 @@ export interface FacilityData {
   read_cover_image_url?: string;
   features: number[];
   geo_organization: Organization;
+  latitude: number;
+  longitude: number;
+  facility_flags?: FeatureFlag[];
   pincode: string;
   is_public: boolean;
 }
diff --git a/src/types/organization/organizationApi.ts b/src/types/organization/organizationApi.ts
index 5e90f0b26b5..7d5bba97bcd 100644
--- a/src/types/organization/organizationApi.ts
+++ b/src/types/organization/organizationApi.ts
@@ -1,10 +1,13 @@
+import { useQuery } from "@tanstack/react-query";
+
 import { HttpMethod, Type } from "@/Utils/request/api";
+import query from "@/Utils/request/query";
 import { PaginatedResponse } from "@/Utils/request/types";
 
 import { Patient } from "../emr/newPatient";
 import { Organization, OrganizationUserRole } from "./organization";
 
-export default {
+const organizationApi = {
   listMine: {
     path: "/api/v1/organization/mine/",
     method: HttpMethod.GET,
@@ -58,3 +61,23 @@ export default {
     TRes: Type<Organization>(),
   },
 };
+
+export function useFetchOrganizationByName(name: string, parentId?: string) {
+  return useQuery({
+    queryKey: ["organization", name, parentId],
+    queryFn: async () => {
+      const data = await query(organizationApi.list, {
+        queryParams: {
+          org_type: "govt",
+          parent: parentId || "",
+          name: name,
+        },
+      })({ signal: new AbortController().signal });
+
+      return data.results?.[0] || null;
+    },
+    enabled: name != undefined,
+  });
+}
+
+export default organizationApi;