diff --git a/cypress/e2e/facility_spec/facility_creation.cy.ts b/cypress/e2e/facility_spec/facility_creation.cy.ts
new file mode 100644
index 00000000000..a62f4ec77c5
--- /dev/null
+++ b/cypress/e2e/facility_spec/facility_creation.cy.ts
@@ -0,0 +1,67 @@
+import { LoginPage } from "../../pageObject/auth/LoginPage";
+import { FacilityCreation } from "../../pageObject/facility/FacilityCreation";
+import { generatePhoneNumber } from "../../utils/commonUtils";
+import { generateFacilityData } from "../../utils/facilityData";
+
+describe("Facility Management", () => {
+  const loginPage = new LoginPage();
+  const facilityPage = new FacilityCreation();
+  const testFacility = generateFacilityData();
+  const phoneNumber = generatePhoneNumber();
+
+  beforeEach(() => {
+    cy.clearLocalStorage();
+    cy.saveLocalStorage();
+    cy.visit("/login");
+  });
+
+  afterEach(() => {
+    cy.saveLocalStorage();
+  });
+
+  it("Create a new facility using the admin role", () => {
+    // Login
+    loginPage.loginByRole("admin");
+    // Navigate to facility creation
+    facilityPage.navigateToFacilities();
+    facilityPage.clickAddFacility();
+
+    // Fill form
+    facilityPage.fillBasicDetails(
+      testFacility.name,
+      testFacility.type,
+      testFacility.description,
+    );
+
+    facilityPage.selectFeatures(testFacility.features);
+
+    facilityPage.fillContactDetails(
+      phoneNumber,
+      testFacility.pincode,
+      testFacility.address,
+    );
+
+    facilityPage.fillLocationDetails(
+      testFacility.coordinates.latitude,
+      testFacility.coordinates.longitude,
+    );
+
+    // Submit and verify
+    facilityPage.makePublicFacility();
+    facilityPage.submitFacilityCreationForm();
+    facilityPage.verifySuccessMessage();
+
+    // Search for the facility and verify in card
+    facilityPage.searchFacility(testFacility.name);
+    facilityPage.verifyFacilityNameInCard(testFacility.name);
+  });
+
+  it("Should show validation errors for required fields", () => {
+    loginPage.loginByRole("nurse");
+
+    facilityPage.navigateToFacilities();
+    facilityPage.clickAddFacility();
+    facilityPage.submitFacilityCreationForm();
+    facilityPage.verifyValidationErrors();
+  });
+});
diff --git a/cypress/pageObject/auth/LoginPage.ts b/cypress/pageObject/auth/LoginPage.ts
index ada53b61d3a..8509b2b448a 100644
--- a/cypress/pageObject/auth/LoginPage.ts
+++ b/cypress/pageObject/auth/LoginPage.ts
@@ -7,13 +7,6 @@ export class LoginPage {
     return cy.intercept("POST", this.routes.login).as("loginRequest");
   }
 
-  verifyLoginResponse() {
-    return cy
-      .wait("@loginRequest")
-      .its("response.statusCode")
-      .should("eq", 200);
-  }
-
   // Add selectors for existing elements
   private readonly usernameInput = "[data-cy=username]";
   private readonly passwordInput = "[data-cy=password]";
diff --git a/cypress/pageObject/facility/FacilityCreation.ts b/cypress/pageObject/facility/FacilityCreation.ts
new file mode 100644
index 00000000000..ec7863834bf
--- /dev/null
+++ b/cypress/pageObject/facility/FacilityCreation.ts
@@ -0,0 +1,100 @@
+export class FacilityCreation {
+  // Navigation
+  navigateToFacilities() {
+    cy.get('[data-cy="organization-list"]').should("be.visible");
+    cy.verifyAndClickElement('[data-cy="organization-list"]', "Kerala");
+    cy.get('[data-testid="org-nav-facilities"]').should("be.visible").click();
+  }
+
+  clickAddFacility() {
+    cy.get('[data-cy="add-facility-button"]').should("be.visible").click();
+  }
+
+  // Individual field methods
+  enterFacilityName(name: string) {
+    cy.get('[data-cy="facility-name"]').type(name);
+  }
+
+  selectFacilityType() {
+    cy.clickAndSelectOption(
+      '[data-cy="facility-type"]',
+      "Primary Health Centres",
+    );
+  }
+
+  enterDescription(description: string) {
+    cy.get('[data-cy="facility-description"]').type(description);
+  }
+
+  enterPhoneNumber(phone: string) {
+    cy.get('[data-cy="facility-phone"]').type(phone);
+  }
+
+  enterPincode(pincode: string) {
+    cy.get('[data-cy="facility-pincode"]').type(pincode);
+  }
+
+  enterAddress(address: string) {
+    cy.get('[data-cy="facility-address"]').type(address);
+  }
+
+  enterLatitude(latitude: string) {
+    cy.get('[data-cy="facility-latitude"]').type(latitude);
+  }
+
+  enterLongitude(longitude: string) {
+    cy.get('[data-cy="facility-longitude"]').type(longitude);
+  }
+
+  // Combined methods using individual functions
+  fillBasicDetails(name: string, _facilityType: string, description: string) {
+    this.enterFacilityName(name);
+    this.selectFacilityType();
+    this.enterDescription(description);
+  }
+
+  selectFeatures(features: string[]) {
+    cy.clickAndMultiSelectOption("#facility-features", features);
+  }
+
+  fillContactDetails(phone: string, pincode: string, address: string) {
+    this.enterPhoneNumber(phone);
+    this.enterPincode(pincode);
+    this.enterAddress(address);
+  }
+
+  fillLocationDetails(latitude: string, longitude: string) {
+    this.enterLatitude(latitude);
+    this.enterLongitude(longitude);
+  }
+
+  makePublicFacility() {
+    cy.get('[data-cy="make-facility-public"]').click();
+  }
+
+  submitFacilityCreationForm() {
+    cy.clickSubmitButton("Create Facility");
+  }
+
+  // Verification Methods
+  verifySuccessMessage() {
+    cy.verifyNotification("Facility created successfully");
+  }
+
+  verifyValidationErrors() {
+    cy.verifyErrorMessage("Name is required");
+    cy.verifyErrorMessage("Facility type is required");
+    cy.verifyErrorMessage("Address is required");
+    cy.verifyErrorMessage(
+      "Phone number must start with +91 followed by 10 digits",
+    );
+  }
+
+  searchFacility(facilityName: string) {
+    cy.get('[data-cy="search-facility"]').type(facilityName);
+  }
+
+  verifyFacilityNameInCard(facilityName: string) {
+    cy.get('[data-cy="facility-cards"]').should("contain", facilityName);
+  }
+}
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 54bc3be2666..d4098de2fac 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -113,8 +113,11 @@ Cypress.Commands.add(
   },
 );
 
-Cypress.Commands.add("verifyNotification", (text) => {
-  return cy.get(".pnotify-container").should("exist").contains(text);
+Cypress.Commands.add("verifyNotification", (text: string) => {
+  return cy
+    .get("li[data-sonner-toast] div[data-title]")
+    .should("exist")
+    .contains(text);
 });
 
 Cypress.Commands.add("clearAllFilters", () => {
diff --git a/cypress/utils/commonUtils.ts b/cypress/utils/commonUtils.ts
new file mode 100644
index 00000000000..5e2037dc123
--- /dev/null
+++ b/cypress/utils/commonUtils.ts
@@ -0,0 +1,11 @@
+export function generatePhoneNumber(): string {
+  // First digit should be 6, 7, 8, or 9 for Indian mobile numbers
+  const validFirstDigits = [6, 7, 8, 9];
+  const firstDigit =
+    validFirstDigits[Math.floor(Math.random() * validFirstDigits.length)];
+
+  // Generate remaining 9 digits
+  const remainingDigits = Math.random().toString().slice(2, 11);
+
+  return `${firstDigit}${remainingDigits}`;
+}
diff --git a/cypress/utils/facilityData.ts b/cypress/utils/facilityData.ts
new file mode 100644
index 00000000000..9f1463ffd6e
--- /dev/null
+++ b/cypress/utils/facilityData.ts
@@ -0,0 +1,180 @@
+interface FacilityTestData {
+  name: string;
+  type: string;
+  description: string;
+  address: string;
+  pincode: string;
+  coordinates: {
+    latitude: string;
+    longitude: string;
+  };
+  features: string[];
+}
+
+const FACILITY_FEATURES = [
+  "CT Scan",
+  "Maternity Care",
+  "X-Ray",
+  "Neonatal Care",
+  "Operation Theater",
+  "Blood Bank",
+  "Emergency Services",
+];
+
+// Facility type prefixes
+const facilityPrefixes = [
+  "GHC", // Government Hospital
+  "PHC", // Primary Health Center
+  "CHC", // Community Health Center
+  "THC", // Taluk Hospital
+  "DH", // District Hospital
+];
+
+// Special institution prefixes
+const specialPrefixes = [
+  "Saint Maria",
+  "Holy Cross",
+  "Little Flower",
+  "Mar Sleeva",
+  "Saint Thomas",
+];
+
+// Ernakulam district locations with real coordinates
+const locations = [
+  {
+    name: "Aluva",
+    pincode: "683101",
+    coordinates: { latitude: "10.1004", longitude: "76.3570" },
+  },
+  {
+    name: "Angamaly",
+    pincode: "683572",
+    coordinates: { latitude: "10.1960", longitude: "76.3860" },
+  },
+  {
+    name: "Kalady",
+    pincode: "683574",
+    coordinates: { latitude: "10.1682", longitude: "76.4410" },
+  },
+  {
+    name: "Perumbavoor",
+    pincode: "683542",
+    coordinates: { latitude: "10.1071", longitude: "76.4750" },
+  },
+  {
+    name: "Kothamangalam",
+    pincode: "686691",
+    coordinates: { latitude: "10.0558", longitude: "76.6280" },
+  },
+  {
+    name: "Muvattupuzha",
+    pincode: "686661",
+    coordinates: { latitude: "9.9894", longitude: "76.5790" },
+  },
+  {
+    name: "Piravom",
+    pincode: "686664",
+    coordinates: { latitude: "9.8730", longitude: "76.4920" },
+  },
+  {
+    name: "Kolenchery",
+    pincode: "682311",
+    coordinates: { latitude: "9.9811", longitude: "76.4007" },
+  },
+  {
+    name: "Tripunithura",
+    pincode: "682301",
+    coordinates: { latitude: "9.9486", longitude: "76.3289" },
+  },
+  {
+    name: "Kakkanad",
+    pincode: "682030",
+    coordinates: { latitude: "10.0158", longitude: "76.3419" },
+  },
+  {
+    name: "Edappally",
+    pincode: "682024",
+    coordinates: { latitude: "10.0236", longitude: "76.3097" },
+  },
+  {
+    name: "Kaloor",
+    pincode: "682017",
+    coordinates: { latitude: "9.9894", longitude: "76.2998" },
+  },
+  {
+    name: "Fort Kochi",
+    pincode: "682001",
+    coordinates: { latitude: "9.9639", longitude: "76.2432" },
+  },
+  {
+    name: "Mattancherry",
+    pincode: "682002",
+    coordinates: { latitude: "9.9585", longitude: "76.2574" },
+  },
+  {
+    name: "Vytilla",
+    pincode: "682019",
+    coordinates: { latitude: "9.9712", longitude: "76.3186" },
+  },
+  {
+    name: "Palarivattom",
+    pincode: "682025",
+    coordinates: { latitude: "10.0070", longitude: "76.3050" },
+  },
+  {
+    name: "Thevara",
+    pincode: "682013",
+    coordinates: { latitude: "9.9312", longitude: "76.2891" },
+  },
+  {
+    name: "Thrikkakara",
+    pincode: "682021",
+    coordinates: { latitude: "10.0316", longitude: "76.3421" },
+  },
+  {
+    name: "Kalamassery",
+    pincode: "683104",
+    coordinates: { latitude: "10.0558", longitude: "76.3213" },
+  },
+  {
+    name: "Eloor",
+    pincode: "683501",
+    coordinates: { latitude: "10.0583", longitude: "76.2833" },
+  },
+];
+
+function generateFacilityName(): string {
+  const useSpecialPrefix = Math.random() < 0.2; // 20% chance for special prefix
+  const location = locations[Math.floor(Math.random() * locations.length)];
+
+  if (useSpecialPrefix) {
+    const specialPrefix =
+      specialPrefixes[Math.floor(Math.random() * specialPrefixes.length)];
+    return `${specialPrefix} GHC ${location.name}`;
+  } else {
+    const prefix =
+      facilityPrefixes[Math.floor(Math.random() * facilityPrefixes.length)];
+    return `${prefix} ${location.name}`;
+  }
+}
+
+export function generateFacilityData(): FacilityTestData {
+  const location = locations[Math.floor(Math.random() * locations.length)];
+  const name = generateFacilityName();
+
+  // Randomly select 2-4 features from the available options
+  const shuffledFeatures = [...FACILITY_FEATURES].sort(
+    () => Math.random() - 0.5,
+  );
+  const numberOfFeatures = Math.floor(Math.random() * 3) + 2; // Random number between 2 and 4
+
+  return {
+    name,
+    type: "General Hospital",
+    description: `Healthcare facility serving the ${location.name} region with modern medical facilities and experienced staff`,
+    address: `${name} Building, Main Road, ${location.name}`,
+    pincode: location.pincode,
+    coordinates: location.coordinates,
+    features: shuffledFeatures.slice(0, numberOfFeatures),
+  };
+}
diff --git a/public/locale/en.json b/public/locale/en.json
index 5008b13f928..d5498dbe0f6 100644
--- a/public/locale/en.json
+++ b/public/locale/en.json
@@ -923,6 +923,7 @@
   "external_identifier": "External Identifier",
   "facilities": "Facilities",
   "facility": "Facility",
+  "facility_added_successfully": "Facility created successfully",
   "facility_consent_requests_page_title": "Patient Consent List",
   "facility_district_name": "Facility/District Name",
   "facility_district_pincode": "Facility/District/Pincode",
diff --git a/src/components/Facility/CreateFacilityForm.tsx b/src/components/Facility/CreateFacilityForm.tsx
index 8ad9887d2ef..ed5c87caabc 100644
--- a/src/components/Facility/CreateFacilityForm.tsx
+++ b/src/components/Facility/CreateFacilityForm.tsx
@@ -177,13 +177,17 @@ export default function CreateFacilityForm({
                   <FormLabel>Facility Type</FormLabel>
                   <Select onValueChange={field.onChange} value={field.value}>
                     <FormControl>
-                      <SelectTrigger>
+                      <SelectTrigger data-cy="facility-type">
                         <SelectValue placeholder="Select facility type" />
                       </SelectTrigger>
                     </FormControl>
                     <SelectContent>
                       {FACILITY_TYPES.map((type) => (
-                        <SelectItem key={type.text} value={type.text}>
+                        <SelectItem
+                          key={type.text}
+                          value={type.text}
+                          data-cy="facility-type-option"
+                        >
                           {type.text}
                         </SelectItem>
                       ))}
@@ -201,7 +205,11 @@ export default function CreateFacilityForm({
                 <FormItem>
                   <FormLabel>Facility Name</FormLabel>
                   <FormControl>
-                    <Input placeholder="Enter facility name" {...field} />
+                    <Input
+                      data-cy="facility-name"
+                      placeholder="Enter facility name"
+                      {...field}
+                    />
                   </FormControl>
                   <FormMessage />
                 </FormItem>
@@ -218,6 +226,7 @@ export default function CreateFacilityForm({
                 <FormControl>
                   <Textarea
                     {...field}
+                    data-cy="facility-description"
                     placeholder="Describe your facility (Markdown supported)"
                     className="h-24"
                   />
@@ -243,6 +252,7 @@ export default function CreateFacilityForm({
                     optionValue={(o) => o.id}
                     onChange={handleFeatureChange}
                     error={form.formState.errors.features?.message}
+                    id="facility-features"
                   />
                 </FormControl>
                 <FormMessage />
@@ -262,7 +272,11 @@ export default function CreateFacilityForm({
                 <FormItem>
                   <FormLabel>Phone Number</FormLabel>
                   <FormControl>
-                    <Input placeholder="+91XXXXXXXXXX" {...field} />
+                    <Input
+                      data-cy="facility-phone"
+                      placeholder="+91XXXXXXXXXX"
+                      {...field}
+                    />
                   </FormControl>
                   <FormMessage />
                 </FormItem>
@@ -276,7 +290,11 @@ export default function CreateFacilityForm({
                 <FormItem>
                   <FormLabel>Pincode</FormLabel>
                   <FormControl>
-                    <Input placeholder="Enter pincode" {...field} />
+                    <Input
+                      data-cy="facility-pincode"
+                      placeholder="Enter pincode"
+                      {...field}
+                    />
                   </FormControl>
                   <FormMessage />
                 </FormItem>
@@ -293,6 +311,7 @@ export default function CreateFacilityForm({
                 <FormControl>
                   <Textarea
                     {...field}
+                    data-cy="facility-address"
                     placeholder="Enter complete address"
                     className="h-20"
                   />
@@ -314,6 +333,7 @@ export default function CreateFacilityForm({
               onClick={handleGetCurrentLocation}
               disabled={isGettingLocation}
               className="flex items-center gap-2"
+              data-cy="get-location-button"
             >
               {isGettingLocation ? (
                 <>
@@ -339,6 +359,7 @@ export default function CreateFacilityForm({
                   <FormControl>
                     <Input
                       {...field}
+                      data-cy="facility-latitude"
                       placeholder="Enter latitude"
                       disabled={isGettingLocation}
                       className={isGettingLocation ? "animate-pulse" : ""}
@@ -358,6 +379,7 @@ export default function CreateFacilityForm({
                   <FormControl>
                     <Input
                       {...field}
+                      data-cy="facility-longitude"
                       placeholder="Enter longitude"
                       disabled={isGettingLocation}
                       className={isGettingLocation ? "animate-pulse" : ""}
@@ -382,6 +404,7 @@ export default function CreateFacilityForm({
                   <Checkbox
                     checked={field.value}
                     onCheckedChange={field.onChange}
+                    data-cy="make-facility-public"
                   />
                 </FormControl>
                 <div className="space-y-1 leading-none">
@@ -418,7 +441,12 @@ export default function CreateFacilityForm({
           )}
         </div>
 
-        <Button type="submit" className="w-full" disabled={isPending}>
+        <Button
+          type="submit"
+          className="w-full"
+          disabled={isPending}
+          data-cy="submit-facility"
+        >
           {isPending ? (
             <>
               <CareIcon
diff --git a/src/pages/Organization/OrganizationFacilities.tsx b/src/pages/Organization/OrganizationFacilities.tsx
index 0717e682921..3a2713f6e86 100644
--- a/src/pages/Organization/OrganizationFacilities.tsx
+++ b/src/pages/Organization/OrganizationFacilities.tsx
@@ -69,10 +69,14 @@ export default function OrganizationFacilities({
               })
             }
             className="max-w-sm"
+            data-cy="search-facility"
           />
         </div>
 
-        <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+        <div
+          className="grid gap-4 md:grid-cols-2 lg:grid-cols-3"
+          data-cy="facility-cards"
+        >
           {isLoading ? (
             Array.from({ length: 6 }).map((_, i) => (
               <Card key={i} className="overflow-hidden">
diff --git a/src/pages/Organization/components/AddFacilitySheet.tsx b/src/pages/Organization/components/AddFacilitySheet.tsx
index 30cb6bd4e31..4474baaffe8 100644
--- a/src/pages/Organization/components/AddFacilitySheet.tsx
+++ b/src/pages/Organization/components/AddFacilitySheet.tsx
@@ -26,7 +26,7 @@ export default function AddFacilitySheet({ organizationId }: Props) {
   return (
     <Sheet open={open} onOpenChange={setOpen}>
       <SheetTrigger asChild>
-        <Button variant="outline">
+        <Button variant="outline" data-cy="add-facility-button">
           <CareIcon icon="l-plus" className="mr-2 h-4 w-4" />
           Add Facility
         </Button>
diff --git a/src/pages/Organization/components/OrganizationLayout.tsx b/src/pages/Organization/components/OrganizationLayout.tsx
index ff38dcbe4ba..b2ebf3b6e22 100644
--- a/src/pages/Organization/components/OrganizationLayout.tsx
+++ b/src/pages/Organization/components/OrganizationLayout.tsx
@@ -179,6 +179,7 @@ export default function OrganizationLayout({
             .map((item) => (
               <MenubarMenu key={item.path}>
                 <MenubarTrigger
+                  data-testid={`org-nav-${item.title.toLowerCase()}`}
                   className={`${
                     path === item.path
                       ? "font-medium text-primary-700 bg-gray-100"
diff --git a/src/pages/UserDashboard.tsx b/src/pages/UserDashboard.tsx
index 6cff07e4591..97fdd91db50 100644
--- a/src/pages/UserDashboard.tsx
+++ b/src/pages/UserDashboard.tsx
@@ -104,7 +104,10 @@ export default function UserDashboard() {
       {organizations.length > 0 && (
         <section className="space-y-3 md:space-y-4">
           <h2 className="text-lg font-semibold px-1">Your Organizations</h2>
-          <div className="grid gap-3 md:gap-4 grid-cols-1 sm:grid-cols-2 lg:grid-cols-3">
+          <div
+            className="grid gap-3 md:gap-4 grid-cols-1 sm:grid-cols-2 lg:grid-cols-3"
+            data-cy="organization-list"
+          >
             {organizations.map((org) => (
               <Link key={org.id} href={`/organization/${org.id}`}>
                 <Card className="transition-all hover:shadow-md hover:border-primary/20">