diff --git a/cypress/e2e/auth_spec/ForgotPassword.cy.ts b/cypress/e2e/auth_spec/ForgotPassword.cy.ts
deleted file mode 100644
index c1b1db7ecad..00000000000
--- a/cypress/e2e/auth_spec/ForgotPassword.cy.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-describe("Forgot Password", () => {
-  beforeEach(() => {
-    cy.awaitUrl("/", true);
-    cy.get("button").contains("Forgot password?").click().wait(100);
-  });
-
-  it("Send Password Reset Link", () => {
-    cy.get("input[id='forgot_username']").type("dummy_user_1");
-    cy.contains("Send Reset Link").click().wait(1000);
-    cy.contains("Password Reset Email Sent").should("exist");
-  });
-
-  it("Go to Login page", () => {
-    cy.get("button").contains("Back to login").click();
-    cy.url().should("contain", "/");
-  });
-});
diff --git a/cypress/e2e/auth_spec/auth.cy.ts b/cypress/e2e/auth_spec/auth.cy.ts
deleted file mode 100644
index b2bd7b634c0..00000000000
--- a/cypress/e2e/auth_spec/auth.cy.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-describe("Authorisation/Authentication", () => {
-  beforeEach(() => {
-    cy.awaitUrl("/", true);
-  });
-
-  it("Try login as admin with correct password", () => {
-    cy.loginByApi("devdistrictadmin", "Coronasafe@123");
-    cy.awaitUrl("/facility");
-    cy.get("#user-profile-name").click();
-    cy.get("#sign-out-button").contains("Sign Out").click();
-    cy.url().should("include", "/");
-  });
-
-  it("Try login as admin with incorrect password", () => {
-    cy.log("Logging in the user: devdistrictadmin:Coronasafe@123");
-
-    cy.awaitUrl("/", true);
-    cy.get("input[id='username']").type("devdistrictadmin");
-    cy.get("input[id='password']").type("coronasafe@123");
-    cy.get("button").contains("Login").click();
-    cy.contains("No active account").should("exist");
-  });
-});
diff --git a/cypress/e2e/facility_spec/FacilityManage.cy.ts b/cypress/e2e/facility_spec/FacilityManage.cy.ts
index 10074e81166..02c14958ccf 100644
--- a/cypress/e2e/facility_spec/FacilityManage.cy.ts
+++ b/cypress/e2e/facility_spec/FacilityManage.cy.ts
@@ -1,5 +1,3 @@
-import { v4 as uuidv4 } from "uuid";
-
 import FacilityPage from "../../pageobject/Facility/FacilityCreation";
 import FacilityManage from "../../pageobject/Facility/FacilityManage";
 import LoginPage from "../../pageobject/Login/LoginPage";
@@ -14,11 +12,10 @@ describe("Facility Manage Functions", () => {
   const facilityUpdatedMiddleware = "updated.coronasafe.live";
   const facilityMiddlewareSuccessfullNotification =
     "Facility middleware updated successfully";
-  const facilityHfridUpdateButton = "Link Health Facility";
-  const facilityHfridToastNotificationText =
-    /Health Facility config updated successfully|Health ID registration failed/;
-  const facilityHfrId = "IN180000018";
-  const facilityUpdatedHfrId = uuidv4();
+  // const facilityHfridUpdateButton = "Link Health Facility";
+  // const facilityHfridToastNotificationText = /Health Facility config updated successfully|Health ID registration failed/;
+  // const facilityHfrId = "IN180000018";
+  // const facilityUpdatedHfrId = uuidv4();
   const doctorCapacity = "5";
   const doctorModifiedCapacity = "7";
   const totalCapacity = "100";
@@ -79,36 +76,37 @@ describe("Facility Manage Functions", () => {
     facilityManage.verifyMiddlewareAddressValue(facilityUpdatedMiddleware);
   });
 
-  it("Configure Facility Health ID", () => {
-    facilityPage.clickManageFacilityDropdown();
-    facilityManage.clickFacilityConfigureButton();
-    // verify mandatory field error message
-    facilityManage.clearHfrId();
-    facilityManage.clickButtonWithText(facilityHfridUpdateButton);
-    facilityManage.checkErrorMessageVisibility(
-      "Health Facility Id is required",
-    );
-    // add facility health ID and verify notification
-    facilityManage.typeHfrId(facilityHfrId);
-    facilityManage.clickButtonWithText(facilityHfridUpdateButton);
-    facilityManage.verifySuccessMessageVisibilityAndContent(
-      facilityHfridToastNotificationText,
-      true,
-    );
-    // update the existing middleware
-    facilityPage.clickManageFacilityDropdown();
-    facilityManage.clickFacilityConfigureButton();
-    facilityManage.typeHfrId(facilityUpdatedHfrId);
-    facilityManage.clickButtonWithText(facilityHfridUpdateButton);
-    facilityManage.verifySuccessMessageVisibilityAndContent(
-      facilityHfridToastNotificationText,
-      true,
-    );
-    // verify its reflection
-    facilityPage.clickManageFacilityDropdown();
-    facilityManage.clickFacilityConfigureButton();
-    facilityManage.verifyHfrIdValue(facilityUpdatedHfrId);
-  });
+  // TODO: enable this test after configuring testing specs for plugs
+  // it("Configure Facility Health ID", () => {
+  //   facilityPage.clickManageFacilityDropdown();
+  //   facilityManage.clickFacilityConfigureButton();
+  //   // verify mandatory field error message
+  //   facilityManage.clearHfrId();
+  //   facilityManage.clickButtonWithText(facilityHfridUpdateButton);
+  //   facilityManage.checkErrorMessageVisibility(
+  //     "Health Facility Id is required",
+  //   );
+  //   // add facility health ID and verify notification
+  //   facilityManage.typeHfrId(facilityHfrId);
+  //   facilityManage.clickButtonWithText(facilityHfridUpdateButton);
+  //   facilityManage.verifySuccessMessageVisibilityAndContent(
+  //     facilityHfridToastNotificationText,
+  //     true,
+  //   );
+  //   // update the existing middleware
+  //   facilityPage.clickManageFacilityDropdown();
+  //   facilityManage.clickFacilityConfigureButton();
+  //   facilityManage.typeHfrId(facilityUpdatedHfrId);
+  //   facilityManage.clickButtonWithText(facilityHfridUpdateButton);
+  //   facilityManage.verifySuccessMessageVisibilityAndContent(
+  //     facilityHfridToastNotificationText,
+  //     true,
+  //   );
+  //   // verify its reflection
+  //   facilityPage.clickManageFacilityDropdown();
+  //   facilityManage.clickFacilityConfigureButton();
+  //   facilityManage.verifyHfrIdValue(facilityUpdatedHfrId);
+  // });
 
   it("Modify doctor capacity in Facility detail page", () => {
     // Add a doctor capacity
diff --git a/cypress/e2e/homepage_spec/UserLogin.cy.ts b/cypress/e2e/homepage_spec/UserLogin.cy.ts
new file mode 100644
index 00000000000..ab00bd80ff1
--- /dev/null
+++ b/cypress/e2e/homepage_spec/UserLogin.cy.ts
@@ -0,0 +1,48 @@
+import LoginPage from "pageobject/Login/LoginPage";
+
+const loginPage = new LoginPage();
+const userName = "dummy_user_1";
+const forgotPasswordHeading = "Forgot password?";
+
+describe("User login workflow with correct and incorrect passwords", () => {
+  beforeEach(() => {
+    cy.awaitUrl("/", true);
+  });
+
+  it("Log in as admin with correct password", () => {
+    loginPage.loginManuallyAsDistrictAdmin();
+    loginPage.interceptFacilityReq();
+    loginPage.verifyFacilityReq();
+    loginPage.ensureLoggedIn();
+    loginPage.clickSignOutBtn();
+    loginPage.verifyLoginPageUrl();
+  });
+
+  it("Display an error when logging in as admin with incorrect password", () => {
+    loginPage.interceptLoginReq();
+    loginPage.loginManuallyAsDistrictAdmin(false);
+    loginPage.verifyLoginReq();
+    cy.verifyNotification("No active account found with the given credentials");
+    cy.closeNotification();
+  });
+});
+
+describe("Reset user's password using email", () => {
+  beforeEach(() => {
+    cy.awaitUrl("/", true);
+  });
+
+  it("Send a password reset link and navigate back to the login page", () => {
+    loginPage.clickForgotPasswordButton(forgotPasswordHeading);
+    loginPage.verifyForgotPasswordHeading([forgotPasswordHeading]);
+    loginPage.fillUserNameInForgotPasswordForm(userName);
+    loginPage.interceptResetLinkReq();
+    loginPage.clickSendResetLinkBtn();
+    loginPage.verifyResetLinkReq();
+    cy.verifyNotification("Password Reset Email Sent");
+    cy.closeNotification();
+    loginPage.clickBackButton();
+    loginPage.verifyLoginPageUrl();
+    loginPage.verifyLoginButtonPresence();
+  });
+});
diff --git a/cypress/e2e/auth_spec/redirect.cy.ts b/cypress/e2e/homepage_spec/redirect.cy.ts
similarity index 100%
rename from cypress/e2e/auth_spec/redirect.cy.ts
rename to cypress/e2e/homepage_spec/redirect.cy.ts
diff --git a/cypress/e2e/patient_spec/PatientInvestigation.cy.ts b/cypress/e2e/patient_spec/PatientInvestigation.cy.ts
index 380adf2c37e..7426890d5a6 100644
--- a/cypress/e2e/patient_spec/PatientInvestigation.cy.ts
+++ b/cypress/e2e/patient_spec/PatientInvestigation.cy.ts
@@ -7,7 +7,7 @@ describe("Patient Investigation Creation from Patient consultation page", () =>
   const loginPage = new LoginPage();
   const patientPage = new PatientPage();
   const patientInvestigation = new PatientInvestigation();
-  const patientName = "Dummy Patient 12";
+  const patientName = "Dummy Patient 14";
 
   before(() => {
     loginPage.loginAsDistrictAdmin();
diff --git a/cypress/e2e/users_spec/UsersManage.cy.ts b/cypress/e2e/users_spec/UsersManage.cy.ts
index 9ed4fe34ec7..8899d951175 100644
--- a/cypress/e2e/users_spec/UsersManage.cy.ts
+++ b/cypress/e2e/users_spec/UsersManage.cy.ts
@@ -7,10 +7,12 @@ describe("Manage User", () => {
   const loginPage = new LoginPage();
   const userPage = new UserPage();
   const manageUserPage = new ManageUserPage();
-  const usernametolinkfacilitydoc1 = "dummydoctor4";
-  const usernametolinkfacilitydoc2 = "dummydoctor5";
-  const usernametolinkfacilitydoc3 = "dummydoctor6";
-  const usernametolinkskill = "devdoctor";
+  const usernameToLinkFacilitydoc1 = "dummydoctor4";
+  const usernameToLinkFacilitydoc2 = "dummydoctor5";
+  const usernameToLinkFacilitydoc3 = "dummydoctor6";
+  const usernameToLinkSkill = "devdoctor";
+  const firstNameUserSkill = "Dev";
+  const lastNameUserSkill = "Doctor";
   const userCreationPage = new UserCreationPage();
   const usernameforworkinghour = "devdistrictadmin";
   const usernamerealname = "Dummy Doctor";
@@ -53,8 +55,11 @@ describe("Manage User", () => {
 
   it("linking skills for a doctor users and verify its reflection in doctor connect", () => {
     // select a doctor user and link and unlink same skill twice and verify the badge is only shown once in doctor connect
-    userPage.typeInSearchInput(usernametolinkskill);
-    userPage.checkUsernameText(usernametolinkskill);
+    userPage.clickAdvancedFilters();
+    userPage.typeInFirstName(firstNameUserSkill);
+    userPage.typeInLastName(lastNameUserSkill);
+    userPage.applyFilter();
+    userPage.checkUsernameText(usernameToLinkSkill);
     manageUserPage.clicklinkedskillbutton();
     manageUserPage.selectSkillFromDropdown(linkedskill);
     manageUserPage.clickAddSkillButton();
@@ -94,8 +99,8 @@ describe("Manage User", () => {
 
   it("linking and unlinking facility for multiple users, and confirm reflection in user cards and doctor connect", () => {
     // verify the user doesn't have any home facility
-    userPage.typeInSearchInput(usernametolinkfacilitydoc1);
-    userPage.checkUsernameText(usernametolinkfacilitydoc1);
+    userPage.typeInSearchInput(usernameToLinkFacilitydoc1);
+    userPage.checkUsernameText(usernameToLinkFacilitydoc1);
     manageUserPage.assertHomeFacility("No Home Facility");
     //  Link a new facility and ensure it is under linked facility - doctor username (1)
     manageUserPage.clickFacilitiesTab();
@@ -107,8 +112,8 @@ describe("Manage User", () => {
     manageUserPage.clickCloseSlideOver();
     //  Link a new facility and ensure it is under home facility - doctor username (2)
     userPage.clearSearchInput();
-    userPage.typeInSearchInput(usernametolinkfacilitydoc2);
-    userPage.checkUsernameText(usernametolinkfacilitydoc2);
+    userPage.typeInSearchInput(usernameToLinkFacilitydoc2);
+    userPage.checkUsernameText(usernameToLinkFacilitydoc2);
     manageUserPage.clickFacilitiesTab();
     manageUserPage.selectFacilityFromDropdown(facilitytolinkusername);
     manageUserPage.clickLinkFacility();
@@ -118,13 +123,13 @@ describe("Manage User", () => {
     manageUserPage.clickCloseSlideOver();
     //  verify the home facility doctor id have reflection in user card
     userPage.clearSearchInput();
-    userPage.typeInSearchInput(usernametolinkfacilitydoc2);
-    userPage.checkUsernameText(usernametolinkfacilitydoc2);
+    userPage.typeInSearchInput(usernameToLinkFacilitydoc2);
+    userPage.checkUsernameText(usernameToLinkFacilitydoc2);
     manageUserPage.assertHomeFacility(facilitytolinkusername);
     // Link a new facility and unlink the facility from the doctor username (3)
     userPage.clearSearchInput();
-    userPage.typeInSearchInput(usernametolinkfacilitydoc3);
-    userPage.checkUsernameText(usernametolinkfacilitydoc3);
+    userPage.typeInSearchInput(usernameToLinkFacilitydoc3);
+    userPage.checkUsernameText(usernameToLinkFacilitydoc3);
     manageUserPage.clickFacilitiesTab();
     manageUserPage.selectFacilityFromDropdown(facilitytolinkusername);
     manageUserPage.clickLinkFacility();
diff --git a/cypress/pageobject/Login/LoginPage.ts b/cypress/pageobject/Login/LoginPage.ts
index 38b8aeee2af..07eb4486d17 100644
--- a/cypress/pageobject/Login/LoginPage.ts
+++ b/cypress/pageobject/Login/LoginPage.ts
@@ -13,16 +13,20 @@ class LoginPage {
     cy.loginByApi("staffdev", "Coronasafe@123");
   }
 
-  loginManuallyAsDistrictAdmin(): void {
+  loginManuallyAsDistrictAdmin(isCorrectCredentials: boolean = true): void {
     cy.get("input[id='username']").type("devdistrictadmin");
-    cy.get("input[id='password']").type("Coronasafe@123");
-    cy.get("button").contains("Login").click();
+    if (isCorrectCredentials) {
+      cy.get("input[id='password']").type("Coronasafe@123");
+    } else {
+      cy.get("input[id='password']").type("Corona");
+    }
+    cy.submitButton("Login");
   }
 
   loginManuallyAsNurse(): void {
     cy.get("input[id='username']").click().type("dummynurse1");
     cy.get("input[id='password']").click().type("Coronasafe@123");
-    cy.get("button").contains("Login").click();
+    cy.submitButton("Login");
   }
 
   login(username: string, password: string): void {
@@ -38,6 +42,58 @@ class LoginPage {
   clickSignOutBtn(): void {
     cy.verifyAndClickElement("#sign-out-button", "Sign Out");
   }
+
+  fillUserNameInForgotPasswordForm(userName: string): void {
+    cy.get("#forgot_username").type(userName);
+  }
+
+  clickSendResetLinkBtn(): void {
+    cy.verifyAndClickElement("#send-reset-link-btn", "Send Reset Link");
+  }
+
+  verifyLoginPageUrl(): void {
+    cy.url().should("include", "/");
+  }
+
+  clickBackButton(): void {
+    cy.verifyAndClickElement("#back-to-login-btn", "Back to login");
+  }
+
+  clickForgotPasswordButton(text: string): void {
+    cy.verifyAndClickElement("#forgot-pass-btn", text);
+  }
+
+  interceptFacilityReq(): void {
+    cy.intercept("GET", "**/api/v1/facility/**").as("getFacilities");
+  }
+
+  verifyFacilityReq(): void {
+    cy.wait("@getFacilities").its("response.statusCode").should("eq", 200);
+  }
+
+  interceptLoginReq(): void {
+    cy.intercept("POST", "**/api/v1/auth/login").as("userLogin");
+  }
+
+  verifyLoginReq(): void {
+    cy.wait("@userLogin").its("response.statusCode").should("eq", 401);
+  }
+
+  interceptResetLinkReq(): void {
+    cy.intercept("POST", "**/api/v1/password_reset").as("resetLink");
+  }
+
+  verifyResetLinkReq(): void {
+    cy.wait("@resetLink").its("response.statusCode").should("eq", 200);
+  }
+
+  verifyLoginButtonPresence(): void {
+    cy.verifyContentPresence("#login-button", ["Login"]);
+  }
+
+  verifyForgotPasswordHeading(text: string[]): void {
+    cy.verifyContentPresence("#forgot-password-heading", text);
+  }
 }
 
 export default LoginPage;
diff --git a/src/App.tsx b/src/App.tsx
index 62a173c8409..d3fec38dbed 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -11,23 +11,27 @@ import HistoryAPIProvider from "@/Providers/HistoryAPIProvider";
 import Routers from "@/Routers";
 import { FeatureFlagsProvider } from "@/Utils/featureFlags";
 
+import { PubSubProvider } from "./Utils/pubsubContext";
+
 const App = () => {
   return (
     <Suspense fallback={<Loading />}>
-      <PluginEngine>
-        <HistoryAPIProvider>
-          <AuthUserProvider unauthorized={<Routers.SessionRouter />}>
-            <FeatureFlagsProvider>
-              <Routers.AppRouter />
-            </FeatureFlagsProvider>
-          </AuthUserProvider>
+      <PubSubProvider>
+        <PluginEngine>
+          <HistoryAPIProvider>
+            <AuthUserProvider unauthorized={<Routers.SessionRouter />}>
+              <FeatureFlagsProvider>
+                <Routers.AppRouter />
+              </FeatureFlagsProvider>
+            </AuthUserProvider>
 
-          {/* Integrations */}
-          <Integrations.Sentry disabled={!import.meta.env.PROD} />
-          <Integrations.Plausible />
-        </HistoryAPIProvider>
-        <Toaster />
-      </PluginEngine>
+            {/* Integrations */}
+            <Integrations.Sentry disabled={!import.meta.env.PROD} />
+            <Integrations.Plausible />
+          </HistoryAPIProvider>
+          <Toaster />
+        </PluginEngine>
+      </PubSubProvider>
     </Suspense>
   );
 };
diff --git a/src/Routers/AppRouter.tsx b/src/Routers/AppRouter.tsx
index c8f6fbec83e..686094c9be1 100644
--- a/src/Routers/AppRouter.tsx
+++ b/src/Routers/AppRouter.tsx
@@ -4,8 +4,6 @@ import { useEffect, useState } from "react";
 
 import IconIndex from "@/CAREUI/icons/Index";
 
-import ABDMFacilityRecords from "@/components/ABDM/ABDMFacilityRecords";
-import HealthInformation from "@/components/ABDM/HealthInformation";
 import {
   DesktopSidebar,
   MobileSidebar,
@@ -60,13 +58,6 @@ const Routes: AppRoutes = {
   "/notifications/:id": ({ id }) => <ShowPushNotification id={id} />,
   "/notice_board": () => <NoticeBoard />,
 
-  "/abdm/health-information/:id": ({ id }) => (
-    <HealthInformation artefactId={id} />
-  ),
-  "/facility/:facilityId/abdm": ({ facilityId }) => (
-    <ABDMFacilityRecords facilityId={facilityId} />
-  ),
-
   "/session-expired": () => <SessionExpired />,
   "/not-found": () => <Error404 />,
   "/icons": () => <IconIndex />,
diff --git a/src/Utils/pubsubContext.tsx b/src/Utils/pubsubContext.tsx
new file mode 100644
index 00000000000..f1e76850913
--- /dev/null
+++ b/src/Utils/pubsubContext.tsx
@@ -0,0 +1,81 @@
+import { createContext, useContext, useState } from "react";
+
+export type Handler = (message: unknown) => Promise<void>;
+export type PubSubContext = {
+  subscribe: (topic: string, handler: Handler) => void;
+  unsubscribe: (topic: string, handler: Handler) => void;
+  publish: (topic: string, message: unknown) => void;
+  subscribers: Record<string, Set<Handler>>;
+  setSubscribers: React.Dispatch<
+    React.SetStateAction<Record<string, Set<Handler>>>
+  >;
+};
+
+const PubSubContext = createContext<PubSubContext | null>(null);
+
+export const PubSubProvider = ({ children }: { children: React.ReactNode }) => {
+  const [subscribers, setSubscribers] = useState<Record<string, Set<Handler>>>(
+    {},
+  );
+
+  const subscribe = (topic: string, handler: Handler) => {
+    setSubscribers((prev) => ({
+      ...prev,
+      [topic]: new Set([...(prev[topic] || []), handler]),
+    }));
+  };
+
+  const unsubscribe = (topic: string, handler: Handler) => {
+    setSubscribers((prev) => {
+      const handlers = prev[topic];
+      if (!handlers) {
+        return prev;
+      }
+
+      const newHandlers = new Set(handlers);
+      newHandlers.delete(handler);
+
+      if (newHandlers.size === 0) {
+        const { [topic]: _, ...rest } = prev;
+        return rest;
+      }
+
+      return {
+        ...prev,
+        [topic]: newHandlers,
+      };
+    });
+  };
+
+  const publish = (topic: string, message: unknown) => {
+    if (!subscribers[topic]) {
+      return;
+    }
+
+    subscribers[topic].forEach(async (handler) => {
+      try {
+        await handler(message);
+      } catch (error) {
+        console.error(`Handler failed for topic ${topic}:`, error);
+      }
+    });
+  };
+
+  return (
+    <PubSubContext.Provider
+      value={{ subscribe, unsubscribe, publish, subscribers, setSubscribers }}
+    >
+      {children}
+    </PubSubContext.Provider>
+  );
+};
+
+export const usePubSub = () => {
+  const context = useContext(PubSubContext);
+
+  if (!context) {
+    throw new Error("usePubSub must be used within PubSubProvider");
+  }
+
+  return context;
+};
diff --git a/src/Utils/request/api.tsx b/src/Utils/request/api.tsx
index e1777364b3f..d6d30dfce85 100644
--- a/src/Utils/request/api.tsx
+++ b/src/Utils/request/api.tsx
@@ -1,14 +1,3 @@
-import { AbhaNumberModel } from "@/components/ABDM/types/abha";
-import {
-  ConsentRequestModel,
-  CreateConsentTBody,
-} from "@/components/ABDM/types/consent";
-import {
-  IHealthFacility,
-  IcreateHealthFacilityTBody,
-  IpartialUpdateHealthFacilityTBody,
-} from "@/components/ABDM/types/health-facility";
-import { HealthInformationModel } from "@/components/ABDM/types/health-information";
 import {
   AssetBedBody,
   AssetBedModel,
@@ -1347,246 +1336,6 @@ const routes = {
     TBody: Type<AssetServiceUpdate>(),
   },
 
-  abdm: {
-    consent: {
-      list: {
-        path: "/api/abdm/consent/",
-        method: "GET",
-        TRes: Type<PaginatedResponse<ConsentRequestModel>>(),
-      },
-
-      create: {
-        path: "/api/abdm/consent/",
-        method: "POST",
-        TRes: Type<ConsentRequestModel>(),
-        TBody: Type<CreateConsentTBody>(),
-      },
-
-      get: {
-        path: "/api/abdm/consent/{id}/",
-        method: "GET",
-      },
-
-      checkStatus: {
-        path: "/api/abdm/v3/hiu/consent_request_status/",
-        method: "POST",
-        TBody: Type<{
-          consent_request: string;
-        }>(),
-        TRes: Type<{
-          detail: string;
-        }>(),
-      },
-    },
-
-    healthInformation: {
-      get: {
-        path: "/api/abdm/health_information/{artefactId}",
-        method: "GET",
-        TRes: Type<HealthInformationModel>(),
-      },
-    },
-
-    healthFacility: {
-      list: {
-        path: "/api/abdm/health_facility/",
-        method: "GET",
-      },
-
-      create: {
-        path: "/api/abdm/health_facility/",
-        method: "POST",
-        TRes: Type<IHealthFacility>(),
-        TBody: Type<IcreateHealthFacilityTBody>(),
-      },
-
-      get: {
-        path: "/api/abdm/health_facility/{facility_id}/",
-        method: "GET",
-        TRes: Type<IHealthFacility>(),
-      },
-
-      update: {
-        path: "/api/abdm/health_facility/{facility_id}/",
-        method: "PUT",
-        TRes: Type<IHealthFacility>(),
-        TBody: Type<IcreateHealthFacilityTBody>(),
-      },
-
-      partialUpdate: {
-        path: "/api/abdm/health_facility/{facility_id}/",
-        method: "PATCH",
-        TRes: Type<IHealthFacility>(),
-        TBody: Type<IpartialUpdateHealthFacilityTBody>(),
-      },
-
-      registerAsService: {
-        path: "/api/abdm/health_facility/{facility_id}/register_service/",
-        method: "POST",
-        TRes: Type<IHealthFacility>(),
-        TBody: Type<IcreateHealthFacilityTBody>(),
-      },
-    },
-
-    abhaNumber: {
-      get: {
-        path: "/api/abdm/abha_number/{abhaNumberId}/",
-        method: "GET",
-        TRes: Type<AbhaNumberModel>(),
-      },
-      create: {
-        path: "/api/abdm/abha_number/",
-        method: "POST",
-        TBody: Type<Partial<AbhaNumberModel>>(),
-        TRes: Type<AbhaNumberModel>(),
-      },
-    },
-
-    healthId: {
-      abhaCreateSendAadhaarOtp: {
-        path: "/api/abdm/v3/health_id/create/send_aadhaar_otp/",
-        method: "POST",
-        TBody: Type<{
-          aadhaar: string;
-          transaction_id?: string;
-        }>(),
-        TRes: Type<{
-          transaction_id: string;
-          detail: string;
-        }>(),
-      },
-
-      abhaCreateVerifyAadhaarOtp: {
-        path: "/api/abdm/v3/health_id/create/verify_aadhaar_otp/",
-        method: "POST",
-        TBody: Type<{
-          transaction_id: string;
-          otp: string;
-          mobile: string;
-        }>(),
-        TRes: Type<{
-          transaction_id: string;
-          detail: string;
-          is_new: boolean;
-          abha_number: AbhaNumberModel;
-        }>(),
-      },
-
-      abhaCreateLinkMobileNumber: {
-        path: "/api/abdm/v3/health_id/create/link_mobile_number/",
-        method: "POST",
-        TBody: Type<{
-          transaction_id: string;
-          mobile: string;
-        }>(),
-        TRes: Type<{
-          transaction_id: string;
-          detail: string;
-        }>(),
-      },
-
-      abhaCreateVerifyMobileNumber: {
-        path: "/api/abdm/v3/health_id/create/verify_mobile_otp/",
-        method: "POST",
-        TBody: Type<{
-          transaction_id: string;
-          otp: string;
-        }>(),
-        TRes: Type<{
-          transaction_id: string;
-          detail: string;
-        }>(),
-      },
-
-      abhaCreateAbhaAddressSuggestion: {
-        path: "/api/abdm/v3/health_id/create/abha_address_suggestion/",
-        method: "POST",
-        TBody: Type<{
-          transaction_id: string;
-        }>(),
-        TRes: Type<{
-          transaction_id: string;
-          abha_addresses: string[];
-        }>(),
-      },
-
-      abhaCreateEnrolAbhaAddress: {
-        path: "/api/abdm/v3/health_id/create/enrol_abha_address/",
-        method: "POST",
-        TBody: Type<{
-          transaction_id: string;
-          abha_address: string;
-        }>(),
-        TRes: Type<{
-          detail?: string;
-          transaction_id: string;
-          health_id: string;
-          preferred_abha_address: string;
-          abha_number: AbhaNumberModel;
-        }>(),
-      },
-
-      linkAbhaNumberAndPatient: {
-        path: "/api/abdm/v3/health_id/link_patient/",
-        method: "POST",
-        TBody: Type<{
-          abha_number: string;
-          patient: string;
-        }>(),
-        TRes: Type<{
-          detail: string;
-        }>(),
-      },
-
-      abhaLoginCheckAuthMethods: {
-        path: "/api/abdm/v3/health_id/login/check_auth_methods/",
-        method: "POST",
-        TBody: Type<{
-          abha_address: string;
-        }>(),
-        TRes: Type<{
-          abha_number: string;
-          auth_methods: string[];
-        }>(),
-      },
-
-      abhaLoginSendOtp: {
-        path: "/api/abdm/v3/health_id/login/send_otp/",
-        method: "POST",
-        TBody: Type<{
-          type: "abha-number" | "abha-address" | "mobile" | "aadhaar";
-          value: string;
-          otp_system: "abdm" | "aadhaar";
-        }>(),
-        TRes: Type<{
-          transaction_id: string;
-          detail: string;
-        }>(),
-      },
-
-      abhaLoginVerifyOtp: {
-        path: "/api/abdm/v3/health_id/login/verify_otp/",
-        method: "POST",
-        TBody: Type<{
-          type: "abha-number" | "abha-address" | "mobile" | "aadhaar";
-          otp: string;
-          transaction_id: string;
-          otp_system: "abdm" | "aadhaar";
-        }>(),
-        TRes: Type<{
-          abha_number: AbhaNumberModel;
-          created: boolean;
-        }>(),
-      },
-
-      getAbhaCard: {
-        path: "/api/abdm/v3/health_id/abha_card",
-        method: "GET",
-        TRes: Type<Blob>(),
-      },
-    },
-  },
-
   // Prescription endpoints
 
   listPrescriptions: {
diff --git a/src/common/constants.tsx b/src/common/constants.tsx
index b917ea1aa68..857796d7c88 100644
--- a/src/common/constants.tsx
+++ b/src/common/constants.tsx
@@ -1,6 +1,5 @@
 import { IconName } from "@/CAREUI/icons/CareIcon";
 
-import { ConsentHIType, ConsentPurpose } from "@/components/ABDM/types/consent";
 import { SortOption } from "@/components/Common/SortDropdown";
 import {
   PatientCategory,
@@ -8,10 +7,10 @@ import {
 } from "@/components/Facility/models";
 import { PhoneNumberValidator } from "@/components/Form/FieldValidators";
 
-import { SchemaType } from "@/common/schemaParser";
-
 import { dateQueryString } from "@/Utils/utils";
 
+import { SchemaType } from "./schemaParser";
+
 export const RESULTS_PER_PAGE_LIMIT = 14;
 export const PAGINATION_LIMIT = 36;
 
@@ -1142,26 +1141,6 @@ export const AssetImportSchema: SchemaType = {
   },
 };
 
-// ABDM
-export const ABDM_CONSENT_PURPOSE = [
-  "CAREMGT",
-  "BTG",
-  "PUBHLTH",
-  "HPAYMT",
-  "DSRCH",
-  "PATRQT",
-] as ConsentPurpose[];
-
-export const ABDM_HI_TYPE = [
-  "Prescription",
-  "DiagnosticReport",
-  "OPConsultation",
-  "DischargeSummary",
-  "ImmunizationRecord",
-  "HealthDocumentRecord",
-  "WellnessRecord",
-] as ConsentHIType[];
-
 export const USER_TYPES_MAP = {
   Pharmacist: "Pharmacist",
   Volunteer: "Volunteer",
diff --git a/src/components/ABDM/ABDMFacilityRecords.tsx b/src/components/ABDM/ABDMFacilityRecords.tsx
deleted file mode 100644
index ef3a1da8ab4..00000000000
--- a/src/components/ABDM/ABDMFacilityRecords.tsx
+++ /dev/null
@@ -1,202 +0,0 @@
-import { Link } from "raviger";
-import { useTranslation } from "react-i18next";
-
-import CareIcon from "@/CAREUI/icons/CareIcon";
-
-import ButtonV2 from "@/components/Common/ButtonV2";
-import Loading from "@/components/Common/Loading";
-import Page from "@/components/Common/Page";
-
-import routes from "@/Utils/request/api";
-import useQuery from "@/Utils/request/useQuery";
-import { classNames, formatDateTime } from "@/Utils/utils";
-
-interface IProps {
-  facilityId: string;
-}
-
-const TableHeads = [
-  "consent__patient",
-  "consent__status",
-  "created_on",
-  "updated_on",
-  "consent__hi_range",
-  "expires_on",
-  "consent__hi_types",
-];
-
-export default function ABDMFacilityRecords({ facilityId }: IProps) {
-  const { t } = useTranslation();
-
-  const {
-    data: consentsResult,
-    loading,
-    refetch,
-  } = useQuery(routes.abdm.consent.list, {
-    query: { facility: facilityId, ordering: "-created_date" },
-  });
-
-  if (loading) {
-    return <Loading />;
-  }
-
-  return (
-    <Page title={t("facility_consent_requests_page_title")}>
-      <div className="px-4 sm:px-6 lg:px-8">
-        <div className="sm:flex sm:items-center"></div>
-        <div className="mt-8 flow-root">
-          <div className="-mx-4 -my-2 overflow-x-auto sm:-mx-6 lg:-mx-8">
-            <div className="inline-block min-w-full py-2 align-middle sm:px-6 lg:px-8">
-              <div className="overflow-hidden shadow ring-1 ring-black ring-opacity-5 sm:rounded-lg">
-                <table className="min-w-full table-fixed divide-y divide-secondary-300">
-                  <thead className="bg-secondary-50">
-                    <tr>
-                      {TableHeads.map((head) => (
-                        <th
-                          scope="col"
-                          className="px-3 py-3.5 text-center text-sm font-semibold text-secondary-900"
-                        >
-                          {t(head)}
-                        </th>
-                      ))}
-                      <th
-                        scope="col"
-                        className="sticky right-0 top-0 py-3.5 pl-3 pr-4 sm:pr-6"
-                      >
-                        <ButtonV2
-                          onClick={() => refetch()}
-                          ghost
-                          className="max-w-2xl text-sm text-secondary-700 hover:text-secondary-900"
-                        >
-                          <CareIcon icon="l-refresh" /> {t("refresh")}
-                        </ButtonV2>
-                        <span className="sr-only">{t("view")}</span>
-                      </th>
-                    </tr>
-                  </thead>
-                  <tbody className="divide-y divide-secondary-200 bg-white">
-                    {consentsResult?.results.map((consent) => (
-                      <tr key={consent.id}>
-                        <td className="px-3 py-4 text-center text-sm">
-                          {consent.patient_abha_object?.name}
-                          <p className="text-secondary-600">
-                            ({consent.patient_abha})
-                          </p>
-                        </td>
-
-                        <td className="px-3 py-4 text-center text-sm capitalize">
-                          {new Date(
-                            consent.consent_artefacts?.[0]?.expiry ??
-                              consent.expiry,
-                          ) < new Date()
-                            ? t("consent__status__EXPIRED")
-                            : t(
-                                `consent__status__${
-                                  consent.consent_artefacts?.[0]?.status ??
-                                  consent.status
-                                }`,
-                              )}
-                        </td>
-
-                        <td className="px-3 py-4 text-center text-sm">
-                          {formatDateTime(consent.created_date)}
-                        </td>
-
-                        <td className="px-3 py-4 text-center text-sm">
-                          {consent.status === "EXPIRED" ||
-                          new Date(
-                            consent.consent_artefacts?.[0]?.expiry ??
-                              consent.expiry,
-                          ) < new Date() ? (
-                            <p className="flex flex-col items-center gap-1">
-                              {formatDateTime(
-                                consent.consent_artefacts?.[0]?.expiry ??
-                                  consent.expiry,
-                              )}
-                              <span className="text-sm text-secondary-600">
-                                {t("expired_on")}
-                              </span>
-                            </p>
-                          ) : consent.status === "REQUESTED" ? (
-                            "-"
-                          ) : (
-                            <p className="flex flex-col items-center gap-1">
-                              {formatDateTime(consent.modified_date)}
-                              <span className="text-sm text-secondary-600">
-                                {t(`${consent.status.toLowerCase()}_on`)}
-                              </span>
-                            </p>
-                          )}
-                        </td>
-
-                        <td className="px-3 py-4 text-center text-sm">
-                          {formatDateTime(
-                            consent.consent_artefacts?.[0]?.from_time ??
-                              consent.from_time,
-                          )}{" "}
-                          <br />
-                          {formatDateTime(
-                            consent.consent_artefacts?.[0]?.to_time ??
-                              consent.to_time,
-                          )}
-                        </td>
-
-                        <td className="px-3 py-4 text-center text-sm">
-                          {formatDateTime(
-                            consent.consent_artefacts?.[0]?.expiry ??
-                              consent.expiry,
-                          )}
-                        </td>
-
-                        <td className="px-3 py-4 text-center text-sm">
-                          <div className="flex flex-wrap items-center justify-center">
-                            {(
-                              consent.consent_artefacts?.[0]?.hi_types ??
-                              consent.hi_types
-                            )?.map((hiType) => (
-                              <span className="mb-2 mr-2 rounded-full bg-secondary-100 px-2 py-1 text-xs font-medium text-secondary-600">
-                                {t(`consent__hi_type__${hiType}`)}
-                              </span>
-                            ))}
-                          </div>
-                        </td>
-
-                        <td className="sticky right-0 whitespace-nowrap bg-white py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
-                          <div className="flex flex-col items-center justify-center gap-2">
-                            <Link
-                              key={consent.id}
-                              href={`/abdm/health-information/${consent.id}`}
-                              className={classNames(
-                                (consent.consent_artefacts?.[0]?.status ??
-                                  consent.status) === "GRANTED" &&
-                                  new Date(
-                                    consent.consent_artefacts?.[0]?.expiry ??
-                                      consent.expiry,
-                                  ) > new Date()
-                                  ? "cursor-pointer text-primary-600 hover:text-primary-900"
-                                  : "pointer-events-none cursor-not-allowed text-secondary-600 opacity-70",
-                              )}
-                            >
-                              {t("view")}
-                            </Link>
-                          </div>
-                        </td>
-                      </tr>
-                    ))}
-                  </tbody>
-                </table>
-              </div>
-            </div>
-            {consentsResult?.results.length === 0 && (
-              <div className="flex min-h-[12rem] items-center justify-center p-4">
-                <p className="text-2xl font-bold text-secondary-600">
-                  {t("no_records_found")}
-                </p>
-              </div>
-            )}
-          </div>
-        </div>
-      </div>
-    </Page>
-  );
-}
diff --git a/src/components/ABDM/ABDMRecordsTab.tsx b/src/components/ABDM/ABDMRecordsTab.tsx
deleted file mode 100644
index 3b6f2493fb4..00000000000
--- a/src/components/ABDM/ABDMRecordsTab.tsx
+++ /dev/null
@@ -1,205 +0,0 @@
-import dayjs from "dayjs";
-import { Link } from "raviger";
-import { useTranslation } from "react-i18next";
-
-import CareIcon from "@/CAREUI/icons/CareIcon";
-
-import {
-  ConsentArtefactModel,
-  ConsentRequestModel,
-} from "@/components/ABDM/types/consent";
-import ButtonV2 from "@/components/Common/ButtonV2";
-import Loading from "@/components/Common/Loading";
-
-import * as Notification from "@/Utils/Notifications";
-import routes from "@/Utils/request/api";
-import request from "@/Utils/request/request";
-import useQuery from "@/Utils/request/useQuery";
-import { classNames, formatName } from "@/Utils/utils";
-
-interface IConsentArtefactCardProps {
-  artefact: ConsentArtefactModel;
-}
-
-function ConsentArtefactCard({ artefact }: IConsentArtefactCardProps) {
-  const { t } = useTranslation();
-
-  return (
-    <Link
-      href={`/abdm/health-information/${artefact.id}`}
-      className="w-full cursor-pointer overflow-hidden bg-white shadow sm:rounded-lg"
-    >
-      <div className="flex flex-col items-center justify-between gap-4 px-4 py-5 sm:flex-row sm:gap-0 sm:px-6">
-        <div className="flex flex-col items-center">
-          <h5 className="font-semibold leading-6 text-secondary-900">
-            {artefact.hip}
-          </h5>
-          <p className="mt-1 max-w-2xl text-sm text-secondary-500">
-            {t("created_on")} {dayjs(artefact.created_date).fromNow()}
-          </p>
-        </div>
-        <div className="flex flex-col items-center">
-          <h6 className="mt-1 leading-6 text-secondary-700">
-            {artefact.status}
-          </h6>
-          <h6 className="mt-1 leading-6 text-secondary-700">
-            {dayjs(artefact.from_time).format("MMM DD YYYY")} -{" "}
-            {dayjs(artefact.to_time).format("MMM DD YYYY")}
-          </h6>
-          <p className="mt-1 max-w-2xl text-sm text-secondary-500">
-            {t("expires_on")} {dayjs(artefact.expiry).fromNow()}
-          </p>
-        </div>
-      </div>
-      <div className="flex flex-wrap items-center justify-center border-t border-secondary-200 px-4 py-5 sm:gap-4">
-        {artefact.hi_types.map((hiType) => {
-          return (
-            <div
-              key={hiType}
-              className="flex items-center justify-center rounded-full bg-secondary-600 px-4 py-1.5 text-xs font-medium text-white"
-            >
-              {t(`consent__hi_type__${hiType}`)}
-            </div>
-          );
-        })}
-      </div>
-    </Link>
-  );
-}
-
-interface IConsentRequestCardProps {
-  consent: ConsentRequestModel;
-}
-
-function ConsentRequestCard({ consent }: IConsentRequestCardProps) {
-  const { t } = useTranslation();
-
-  return (
-    <div className="overflow-hidden bg-white shadow sm:rounded-lg">
-      <div className="flex flex-col items-center justify-between gap-4 px-4 py-5 sm:flex-row sm:gap-0 sm:px-6">
-        <div className="flex flex-col items-center">
-          <h5 className="font-semibold leading-6 text-secondary-900">
-            {t(`consent__purpose__${consent.purpose}`)}
-          </h5>
-          <h6 className="mt-1 leading-6 text-secondary-700">
-            {formatName(consent.requester)}
-          </h6>
-        </div>
-        <div className="flex flex-col items-center">
-          <h6 className="mt-1 leading-6 text-secondary-700">
-            {dayjs(consent.from_time).format("MMM DD YYYY")} -{" "}
-            {dayjs(consent.to_time).format("MMM DD YYYY")}
-          </h6>
-          <p className="mt-1 max-w-2xl text-sm text-secondary-500">
-            {t("expires_on")} {dayjs(consent.expiry).fromNow()}
-          </p>
-        </div>
-        <div className="flex flex-col items-center">
-          <ButtonV2
-            onClick={async () => {
-              const { res, data } = await request(
-                routes.abdm.consent.checkStatus,
-                {
-                  body: {
-                    consent_request: consent.id,
-                  },
-                },
-              );
-
-              if (res?.status === 202) {
-                Notification.Success({
-                  msg: data?.detail ?? t("checking_consent_status"),
-                });
-                Notification.Warn({
-                  msg: t("async_operation_warning"),
-                });
-              }
-            }}
-            ghost
-            className="max-w-2xl text-sm text-secondary-700 hover:text-secondary-900"
-          >
-            <CareIcon icon="l-refresh" /> {t("check_status")}
-          </ButtonV2>
-          <p className="mt-1 max-w-2xl text-sm text-secondary-500">
-            {t("created_on")} {dayjs(consent.created_date).fromNow()}
-          </p>
-          <p className="mt-1 max-w-2xl text-sm text-secondary-500">
-            {t("modified_on")} {dayjs(consent.modified_date).fromNow()}
-          </p>
-        </div>
-      </div>
-      {consent.consent_artefacts?.length ? (
-        <div className="flex flex-wrap items-center justify-center border-t border-secondary-200 bg-secondary-50 px-4 py-5 sm:gap-4">
-          {consent.consent_artefacts?.map((artefact) => (
-            <ConsentArtefactCard key={artefact.id} artefact={artefact} />
-          ))}
-        </div>
-      ) : (
-        <div className="border-t border-secondary-200 bg-secondary-50 px-4 py-5 sm:gap-4">
-          <p className="text-center text-sm text-secondary-800">
-            {consent.status === "REQUESTED"
-              ? t("consent_request_waiting_approval")
-              : t("consent_request_rejected")}
-          </p>
-        </div>
-      )}
-      <div className="flex flex-wrap items-center justify-center border-t border-secondary-200 px-4 py-5 sm:gap-4">
-        {consent.hi_types.map((hiType) => {
-          return (
-            <div
-              key={hiType}
-              className={classNames(
-                "flex items-center justify-center rounded-full px-4 py-1.5 text-xs font-medium text-white",
-                consent.consent_artefacts?.length
-                  ? "bg-secondary-400"
-                  : "bg-secondary-600",
-              )}
-            >
-              {t(`consent__hi_type__${hiType}`)}
-            </div>
-          );
-        })}
-      </div>
-    </div>
-  );
-}
-
-interface IProps {
-  patientId: string;
-}
-
-export default function ABDMRecordsTab({ patientId }: IProps) {
-  const { t } = useTranslation();
-
-  const { data, loading } = useQuery(routes.abdm.consent.list, {
-    query: {
-      patient: patientId,
-      ordering: "-created_date",
-    },
-  });
-
-  if (loading) {
-    <Loading />;
-  }
-
-  if (!data?.results.length) {
-    return (
-      <div className="mt-12 flex flex-col items-center justify-center gap-2.5">
-        <p className="font-semibold text-secondary-600">
-          {t("no_records_found")}
-        </p>
-        <p className="text-sm text-secondary-600">
-          {t("raise_consent_request")}
-        </p>
-      </div>
-    );
-  }
-
-  return (
-    <div className="mt-6 flex flex-col gap-6">
-      {data?.results.map((record) => {
-        return <ConsentRequestCard key={record.id} consent={record} />;
-      })}
-    </div>
-  );
-}
diff --git a/src/components/ABDM/ABHAProfileModal.tsx b/src/components/ABDM/ABHAProfileModal.tsx
deleted file mode 100644
index 3fc874ca86e..00000000000
--- a/src/components/ABDM/ABHAProfileModal.tsx
+++ /dev/null
@@ -1,164 +0,0 @@
-import { QRCodeSVG } from "qrcode.react";
-import { useRef } from "react";
-import { useTranslation } from "react-i18next";
-
-import CareIcon from "@/CAREUI/icons/CareIcon";
-
-import { AbhaNumberModel } from "@/components/ABDM/types/abha";
-import DialogModal from "@/components/Common/Dialog";
-
-import * as Notify from "@/Utils/Notifications";
-import routes from "@/Utils/request/api";
-import request from "@/Utils/request/request";
-import { formatDateTime } from "@/Utils/utils";
-
-interface IProps {
-  patientId?: string;
-  abha?: AbhaNumberModel;
-  show: boolean;
-  onClose: () => void;
-}
-
-const ABHAProfileModal = ({ patientId, show, onClose, abha }: IProps) => {
-  const { t } = useTranslation();
-
-  const printRef = useRef(null);
-
-  const downloadAbhaCard = async (type: "pdf" | "png") => {
-    if (!patientId || !abha?.abha_number) return;
-
-    Notify.Success({ msg: t("downloading_abha_card") });
-
-    const { res, data } = await request(routes.abdm.healthId.getAbhaCard, {
-      query: { abha_id: abha?.abha_number },
-    });
-
-    if (res?.status === 200 && data) {
-      const imageUrl = URL.createObjectURL(data);
-
-      if (type === "png") {
-        const downloadLink = document.createElement("a");
-        downloadLink.href = imageUrl;
-        downloadLink.download = "abha.png";
-        downloadLink.click();
-        URL.revokeObjectURL(imageUrl);
-      } else {
-        const printWindow = window.open("", "_blank");
-        const htmlPopup = `
-            <html>
-              <head>
-                <title>Print Image</title>
-                <style>
-                @media print {
-                  @page {
-                    size: landscape;
-                  }
-                  body, html { margin: 0; padding: 0; display: flex; justify-content: center; align-items: center; height: 100%; }
-                }
-                </style>
-              </head>
-              <body>
-                <embed width="100%" height="100%" src="${imageUrl}" type="image/png"></embed>
-              </body>
-            </html>
-          `;
-        printWindow?.document.write(htmlPopup);
-        printWindow?.document.close();
-        printWindow?.addEventListener("load", () => {
-          printWindow?.print();
-          URL.revokeObjectURL(imageUrl);
-        });
-      }
-    }
-  };
-
-  return (
-    <DialogModal
-      title={
-        <div className="flex items-center justify-between">
-          <h4>{t("abha_profile")}</h4>
-          <div className="flex items-center gap-2">
-            <CareIcon
-              onClick={() => downloadAbhaCard("pdf")}
-              icon="l-print"
-              className="cursor-pointer"
-            />
-            <CareIcon
-              onClick={() => downloadAbhaCard("png")}
-              icon="l-import"
-              className="cursor-pointer"
-            />
-          </div>
-        </div>
-      }
-      show={show}
-      onClose={onClose}
-      className="max-w-[500px]"
-      fixedWidth={false}
-    >
-      <div
-        ref={printRef}
-        id="section-to-print"
-        className="print flex flex-col gap-4 border-black sm:flex-row print:w-full print:border"
-      >
-        <div className="flex-1 sm:aspect-square sm:h-40 sm:flex-auto">
-          <QRCodeSVG
-            className="h-full w-full border border-black p-1"
-            value={JSON.stringify({
-              hidn: abha?.abha_number,
-              phr: abha?.health_id,
-              name: abha?.name,
-              gender: abha?.gender,
-              dob: abha?.date_of_birth,
-              address: abha?.address,
-              "state name": abha?.state,
-              "dist name": abha?.district,
-            })}
-          />
-        </div>
-        <div className="flex flex-wrap gap-4">
-          {[
-            {
-              label: t("full_name"),
-              value:
-                abha?.name ||
-                `${abha?.first_name} ${abha?.middle_name} ${abha?.last_name}`,
-            },
-            { label: t("date_of_birth"), value: abha?.date_of_birth },
-            { label: t("gender"), value: abha?.gender },
-            { label: t("abha_number"), value: abha?.abha_number },
-            {
-              label: t("abha_address"),
-              value: abha?.health_id?.split("@")[0],
-            },
-            { label: t("email"), value: abha?.email },
-          ].map((item, index) =>
-            item.value ? (
-              <div key={index}>
-                <div className="text-xs text-secondary-700">{item.label}</div>
-                <div>{item.value}</div>
-              </div>
-            ) : null,
-          )}
-        </div>
-      </div>
-
-      <div className="mt-4 flex flex-col text-xs text-secondary-700">
-        {abha?.created_date && (
-          <div className="flex items-center gap-1">
-            <span>{t("created_on")}: </span>
-            <span>{formatDateTime(abha.created_date)}</span>
-          </div>
-        )}
-        {abha?.modified_date && (
-          <div className="flex items-center gap-1">
-            <span>{t("modified_on")}: </span>
-            <span>{formatDateTime(abha.modified_date)}</span>
-          </div>
-        )}
-      </div>
-    </DialogModal>
-  );
-};
-
-export default ABHAProfileModal;
diff --git a/src/components/ABDM/ConfigureHealthFacility.tsx b/src/components/ABDM/ConfigureHealthFacility.tsx
deleted file mode 100644
index ba3eb325dec..00000000000
--- a/src/components/ABDM/ConfigureHealthFacility.tsx
+++ /dev/null
@@ -1,243 +0,0 @@
-import { navigate } from "raviger";
-import { useReducer, useState } from "react";
-import { useTranslation } from "react-i18next";
-
-import { IHealthFacility } from "@/components/ABDM/types/health-facility";
-import { Submit } from "@/components/Common/ButtonV2";
-import Loading from "@/components/Common/Loading";
-import TextFormField from "@/components/Form/FormFields/TextFormField";
-import { FieldChangeEvent } from "@/components/Form/FormFields/Utils";
-
-import * as Notification from "@/Utils/Notifications";
-import routes from "@/Utils/request/api";
-import request from "@/Utils/request/request";
-import useQuery from "@/Utils/request/useQuery";
-import { classNames } from "@/Utils/utils";
-
-const initForm = {
-  health_facility: null as IHealthFacility | null,
-  hf_id: "",
-};
-
-const initialState = {
-  form: { ...initForm },
-  errors: {} as Partial<Record<keyof typeof initForm, string>>,
-};
-
-const FormReducer = (
-  state = initialState,
-  action:
-    | {
-        type: "set_form";
-        form: typeof initialState.form;
-      }
-    | {
-        type: "set_error";
-        errors: typeof initialState.errors;
-      },
-) => {
-  switch (action.type) {
-    case "set_form": {
-      return {
-        ...state,
-        form: action.form,
-      };
-    }
-    case "set_error": {
-      return {
-        ...state,
-        errors: action.errors,
-      };
-    }
-    default:
-      return state;
-  }
-};
-
-export interface IConfigureHealthFacilityProps {
-  facilityId: string;
-}
-
-export const ConfigureHealthFacility = (
-  props: IConfigureHealthFacilityProps,
-) => {
-  const { t } = useTranslation();
-
-  const [state, dispatch] = useReducer(FormReducer, initialState);
-  const { facilityId } = props;
-  const [isLoading, setIsLoading] = useState(false);
-
-  const { loading } = useQuery(routes.abdm.healthFacility.get, {
-    pathParams: { facility_id: facilityId },
-    silent: true,
-    onResponse(res) {
-      if (res.data) {
-        dispatch({
-          type: "set_form",
-          form: {
-            ...state.form,
-            health_facility: res.data,
-            hf_id: res.data.hf_id,
-          },
-        });
-      }
-    },
-  });
-
-  const handleSubmit = async (e: React.FormEvent) => {
-    e.preventDefault();
-    setIsLoading(true);
-
-    if (!state.form.hf_id) {
-      dispatch({
-        type: "set_error",
-        errors: { hf_id: t("health_facility__validation__hf_id_required") },
-      });
-      setIsLoading(false);
-      return;
-    }
-
-    let response = null;
-    let responseData = null;
-    if (state.form.hf_id === state.form.health_facility?.hf_id) {
-      const { res, data } = await request(
-        routes.abdm.healthFacility.registerAsService,
-        {
-          pathParams: {
-            facility_id: facilityId,
-          },
-        },
-      );
-      response = res;
-      responseData = data;
-    } else if (state.form.health_facility) {
-      const { res, data } = await request(
-        routes.abdm.healthFacility.partialUpdate,
-        {
-          pathParams: {
-            facility_id: facilityId,
-          },
-          body: {
-            hf_id: state.form.hf_id,
-          },
-        },
-      );
-      response = res;
-      responseData = data;
-    } else {
-      const { res, data } = await request(routes.abdm.healthFacility.create, {
-        body: {
-          facility: facilityId,
-          hf_id: state.form.hf_id,
-        },
-        silent: true,
-      });
-      response = res;
-      responseData = data;
-    }
-
-    if (response?.ok && responseData?.registered) {
-      Notification.Success({
-        msg: t("health_facility__config_update_success"),
-      });
-      navigate(`/facility/${facilityId}`);
-    } else {
-      if (responseData?.registered === false) {
-        Notification.Warn({
-          msg:
-            responseData?.detail ||
-            t("health_facility__config_registration_error"),
-        });
-        navigate(`/facility/${facilityId}`);
-      } else {
-        Notification.Error({
-          msg:
-            responseData?.detail || t("health_facility__config_update_error"),
-        });
-      }
-    }
-    setIsLoading(false);
-  };
-
-  const handleChange = (e: FieldChangeEvent<string>) => {
-    dispatch({
-      type: "set_form",
-      form: { ...state.form, [e.name]: e.value },
-    });
-  };
-
-  if (loading || isLoading) {
-    return <Loading />;
-  }
-
-  return (
-    <div className="cui-card mt-4">
-      <form onSubmit={handleSubmit}>
-        <div className="mt-2 grid grid-cols-1 gap-4">
-          <div>
-            <TextFormField
-              name="hf_id"
-              label={t("health_facility__hf_id")}
-              trailing={
-                <p
-                  className={classNames(
-                    "tooltip cursor-pointer text-sm",
-                    state.form.health_facility?.registered
-                      ? "text-primary-600 hover:text-primary-800"
-                      : "text-warning-600 hover:text-warning-800",
-                  )}
-                >
-                  {state.form.health_facility?.registered ? (
-                    <>
-                      <div className="tooltip-text -ml-20 -mt-36 flex w-48 flex-col gap-4 whitespace-break-spaces">
-                        <span className="text-secondary-100">
-                          {t("health_facility__registered_1.1")}{" "}
-                          <strong>
-                            {t("health_facility__registered_1.2")}
-                          </strong>
-                        </span>
-                        <span className="text-green-100">
-                          {t("health_facility__registered_2")}
-                        </span>
-                      </div>
-                      {t("health_facility__registered_3")}
-                    </>
-                  ) : (
-                    <>
-                      <div className="tooltip-text -ml-20 -mt-44 flex w-48 flex-col gap-4 whitespace-break-spaces">
-                        <span className="text-secondary-100">
-                          {t("health_facility__not_registered_1.1")}{" "}
-                          <strong>
-                            {t("health_facility__not_registered_1.2")}
-                          </strong>
-                        </span>
-                        <span className="text-warning-100">
-                          {t("health_facility__not_registered_2")}
-                        </span>
-                        {t("health_facility__not_registered_3")}
-                      </div>
-                    </>
-                  )}
-                </p>
-              }
-              required
-              value={state.form.hf_id}
-              onChange={handleChange}
-              error={state.errors?.hf_id}
-            />
-          </div>
-        </div>
-        <div className="flex flex-col gap-3 sm:flex-row sm:justify-end">
-          <Submit
-            onClick={handleSubmit}
-            disabled={
-              state.form.hf_id === state.form.health_facility?.hf_id &&
-              state.form.health_facility?.registered
-            }
-            label={t("health_facility__link")}
-          />
-        </div>
-      </form>
-    </div>
-  );
-};
diff --git a/src/components/ABDM/FetchRecordsModal.tsx b/src/components/ABDM/FetchRecordsModal.tsx
deleted file mode 100644
index 9433374f931..00000000000
--- a/src/components/ABDM/FetchRecordsModal.tsx
+++ /dev/null
@@ -1,246 +0,0 @@
-import dayjs from "dayjs";
-import { navigate } from "raviger";
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-
-import { AbhaNumberModel } from "@/components/ABDM/types/abha";
-import { ConsentHIType, ConsentPurpose } from "@/components/ABDM/types/consent";
-import ButtonV2 from "@/components/Common/ButtonV2";
-import DialogModal from "@/components/Common/Dialog";
-import DateFormField from "@/components/Form/FormFields/DateFormField";
-import DateRangeFormField from "@/components/Form/FormFields/DateRangeFormField";
-import {
-  MultiSelectFormField,
-  SelectFormField,
-} from "@/components/Form/FormFields/SelectFormField";
-import TextFormField from "@/components/Form/FormFields/TextFormField";
-
-import { useMessageListener } from "@/hooks/useMessageListener";
-
-import { ABDM_CONSENT_PURPOSE, ABDM_HI_TYPE } from "@/common/constants";
-
-import * as Notification from "@/Utils/Notifications";
-import routes from "@/Utils/request/api";
-import request from "@/Utils/request/request";
-
-const getDate = (value: string | Date) =>
-  (value && dayjs(value).isValid() && dayjs(value).toDate()) || undefined;
-
-interface IProps {
-  abha?: AbhaNumberModel;
-  show: boolean;
-  onClose: () => void;
-}
-
-export default function FetchRecordsModal({ abha, show, onClose }: IProps) {
-  const { t } = useTranslation();
-
-  const [idVerificationStatus, setIdVerificationStatus] = useState<
-    "pending" | "in-progress" | "verified" | "failed"
-  >("verified");
-  const [purpose, setPurpose] = useState<ConsentPurpose>("CAREMGT");
-  const [fromDate, setFromDate] = useState<Date>(
-    dayjs().subtract(30, "day").toDate(),
-  );
-  const [toDate, setToDate] = useState<Date>(dayjs().toDate());
-  const [isMakingConsentRequest, setIsMakingConsentRequest] = useState(false);
-  const [hiTypes, setHiTypes] = useState<ConsentHIType[]>([]);
-  const [expiryDate, setExpiryDate] = useState<Date>(
-    dayjs().add(30, "day").toDate(),
-  );
-  const [errors, setErrors] = useState<Record<string, string>>({});
-  // const notificationSubscriptionState = useNotificationSubscriptionState([
-  //   show,
-  // ]);
-
-  useMessageListener((data) => {
-    if (data.type === "MESSAGE" && data.from === "patients/on_find") {
-      if (data.message?.patient?.id === abha?.health_id) {
-        setIdVerificationStatus("verified");
-        setErrors({
-          ...errors,
-          health_id: "",
-        });
-      }
-    }
-  });
-
-  return (
-    <DialogModal
-      className="max-w-xl"
-      fixedWidth={false}
-      title={t("hi__fetch_records")}
-      show={show}
-      onClose={onClose}
-    >
-      {/* {["unsubscribed", "subscribed_on_other_device"].includes(
-        notificationSubscriptionState,
-      ) && (
-        <p className="my-4 text-sm text-warning-600">
-          <CareIcon icon="l-exclamation-triangle" className="h-4 w-4" />{" "}
-          Notifications needs to be enabled on this device to verify the
-          patient.
-        </p>
-      )} */}
-
-      <div className="flex items-center gap-3">
-        <TextFormField
-          value={abha?.health_id as string}
-          onChange={() => null}
-          disabled
-          label={t("consent_request__patient_identifier")}
-          name="health_id"
-          error={errors.health_id}
-          className="flex-1"
-        />
-
-        {/* <ButtonV2
-          onClick={async () => {
-            const { res } = await request(routes.abha.findPatient, {
-              body: {
-                id: abha?.health_id,
-              },
-              reattempts: 0,
-            });
-
-            if (res?.status) {
-              setIdVerificationStatus("in-progress");
-            }
-          }}
-          loading={idVerificationStatus === "in-progress"}
-          ghost={idVerificationStatus === "verified"}
-          disabled={
-            idVerificationStatus === "verified" ||
-            ["unsubscribed", "subscribed_on_other_device"].includes(
-              notificationSubscriptionState,
-            )
-          }
-          className={classNames(
-            "mt-1.5 !py-3",
-            idVerificationStatus === "verified" &&
-              "disabled:cursor-auto disabled:bg-transparent disabled:text-primary-600",
-          )}
-        >
-          {idVerificationStatus === "in-progress" && (
-            <CircularProgress className="!h-5 !w-5 !text-secondary-500" />
-          )}
-          {idVerificationStatus === "verified" && <CareIcon icon="l-check" />}
-          {
-            {
-              pending: "Verify Patient",
-              "in-progress": "Verifying",
-              verified: "Verified",
-              failed: "Retry",
-            }[idVerificationStatus]
-          }
-        </ButtonV2> */}
-      </div>
-      <SelectFormField
-        label={t("consent_request__purpose")}
-        errorClassName="hidden"
-        id="purpose"
-        name="purpose"
-        className="mb-6"
-        options={ABDM_CONSENT_PURPOSE}
-        optionLabel={(o) => t(`consent__purpose__${o}`)}
-        optionValue={(o) => o}
-        value={purpose}
-        onChange={({ value }) => setPurpose(value)}
-        required
-      />
-
-      <DateRangeFormField
-        name="health_records_range"
-        id="health_records_range"
-        value={{
-          start: getDate(fromDate),
-          end: getDate(toDate),
-        }}
-        onChange={(e) => {
-          setFromDate(e.value.start!);
-          setToDate(e.value.end!);
-        }}
-        label={t("consent_request__date_range")}
-        required
-      />
-
-      <MultiSelectFormField
-        name="hi_types"
-        options={ABDM_HI_TYPE}
-        label={t("consent_request__hi_types")}
-        placeholder={t("consent_request__hi_types_placeholder")}
-        labelSuffix={
-          hiTypes.length !== ABDM_HI_TYPE.length && (
-            <ButtonV2
-              ghost
-              onClick={() => {
-                setHiTypes(ABDM_HI_TYPE);
-              }}
-            >
-              {t("select_all")}
-            </ButtonV2>
-          )
-        }
-        value={hiTypes}
-        optionLabel={(option) => t(`consent__hi_type__${option}`)}
-        optionValue={(option) => option}
-        onChange={(e) => setHiTypes(e.value)}
-        required
-      />
-
-      <DateFormField
-        name="expiry_date"
-        id="expiry_date"
-        value={getDate(expiryDate)}
-        onChange={(e) => setExpiryDate(e.value!)}
-        label={t("consent_request__expiry")}
-        required
-        disablePast
-      />
-
-      <div className="mt-6 flex items-center justify-end">
-        <ButtonV2
-          onClick={async () => {
-            if (idVerificationStatus !== "verified") {
-              setErrors({
-                ...errors,
-                health_id: t("verify_patient_identifier"),
-              });
-
-              return;
-            }
-
-            setIsMakingConsentRequest(true);
-            const { res } = await request(routes.abdm.consent.create, {
-              body: {
-                patient_abha: abha?.health_id as string,
-                hi_types: hiTypes,
-                purpose,
-                from_time: fromDate,
-                to_time: toDate,
-                expiry: expiryDate,
-              },
-            });
-
-            if (res?.status === 201) {
-              Notification.Success({
-                msg: t("consent_requested_successfully"),
-              });
-
-              navigate(
-                `/facility/${abha?.patient_object?.facility}/abdm`,
-                // ?? `/facility/${abha?.patient_object?.facility}/patient/${abha?.patient_object?.id}/consultation/${abha?.patient_object?.last_consultation?.id}/abdm`,
-              );
-            }
-            setIsMakingConsentRequest(false);
-            onClose();
-          }}
-          disabled={idVerificationStatus !== "verified"}
-          loading={isMakingConsentRequest}
-        >
-          {t("request_consent")}
-        </ButtonV2>
-      </div>
-    </DialogModal>
-  );
-}
diff --git a/src/components/ABDM/HealthInformation.tsx b/src/components/ABDM/HealthInformation.tsx
deleted file mode 100644
index e147f050131..00000000000
--- a/src/components/ABDM/HealthInformation.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import { HIProfile } from "hi-profiles";
-import { useTranslation } from "react-i18next";
-
-import Loading from "@/components/Common/Loading";
-import Page from "@/components/Common/Page";
-
-import routes from "@/Utils/request/api";
-import useQuery from "@/Utils/request/useQuery";
-
-interface IProps {
-  artefactId: string;
-}
-
-export default function HealthInformation({ artefactId }: IProps) {
-  const { t } = useTranslation();
-
-  const { data, loading, error } = useQuery(routes.abdm.healthInformation.get, {
-    pathParams: { artefactId },
-    silent: true,
-  });
-
-  if (loading) {
-    return <Loading />;
-  }
-
-  const parseData = (data: string) => {
-    try {
-      return JSON.parse(data);
-    } catch (e) {
-      return JSON.parse(
-        data.replace(/"/g, '\\"').replace(/'/g, '"'), // eslint-disable-line
-      );
-    }
-  };
-
-  return (
-    <Page title={t("hi__page_title")}>
-      <div className="mt-10 flex flex-col items-center justify-center gap-6">
-        {!!error?.is_archived && (
-          <>
-            <h3 className="text-2xl font-semibold text-secondary-700">
-              {t("hi__record_archived__title")}
-            </h3>
-            <h5 className="mt-2 text-sm text-secondary-500">
-              {t("hi__record_archived_description")}
-            </h5>
-            <h4 className="mt-2 text-center text-secondary-500">
-              {t("hi__record_archived_on")}{" "}
-              {new Date(error?.archived_time as string).toLocaleString()} -{" "}
-              {error?.archived_reason as string}
-            </h4>
-          </>
-        )}
-        {error && !error?.is_archived && (
-          <>
-            <h3 className="text-2xl font-semibold text-secondary-700">
-              {t("hi__record_not_fetched_title")}
-            </h3>
-            <h5 className="mt-2 text-sm text-secondary-500">
-              {t("hi__record_not_fetched_description")}
-            </h5>
-            <h4 className="mt-2 text-secondary-500">
-              {t("hi__waiting_for_record")}
-            </h4>
-          </>
-        )}
-        {data?.data.map((item) => (
-          <HIProfile
-            key={item.care_context_reference}
-            bundle={parseData(item.content)}
-          />
-        ))}
-      </div>
-    </Page>
-  );
-}
diff --git a/src/components/ABDM/LinkAbhaNumber/CreateWithAadhaar.tsx b/src/components/ABDM/LinkAbhaNumber/CreateWithAadhaar.tsx
deleted file mode 100644
index d2697633bea..00000000000
--- a/src/components/ABDM/LinkAbhaNumber/CreateWithAadhaar.tsx
+++ /dev/null
@@ -1,740 +0,0 @@
-import { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-
-import useMultiStepForm, {
-  InjectedStepProps,
-} from "@/components/ABDM/LinkAbhaNumber/useMultiStepForm";
-import { AbhaNumberModel } from "@/components/ABDM/types/abha";
-import ButtonV2, { ButtonWithTimer } from "@/components/Common/ButtonV2";
-import CheckBoxFormField from "@/components/Form/FormFields/CheckBoxFormField";
-import OtpFormField from "@/components/Form/FormFields/OtpFormField";
-import PhoneNumberFormField from "@/components/Form/FormFields/PhoneNumberFormField";
-import TextFormField from "@/components/Form/FormFields/TextFormField";
-import { validateRule } from "@/components/Users/UserAdd";
-
-import * as Notify from "@/Utils/Notifications";
-import routes from "@/Utils/request/api";
-import request from "@/Utils/request/request";
-import { classNames } from "@/Utils/utils";
-
-const MAX_OTP_RESEND_ALLOWED = 2;
-
-type ICreateWithAadhaarProps = {
-  onSuccess: (abhaNumber: AbhaNumberModel) => void;
-};
-
-type Memory = {
-  aadhaarNumber: string;
-  mobileNumber: string;
-
-  isLoading: boolean;
-  validationError: string;
-
-  transactionId: string;
-  abhaNumber: AbhaNumberModel | null;
-
-  resendOtpCount: number;
-};
-
-export default function CreateWithAadhaar({
-  onSuccess,
-}: ICreateWithAadhaarProps) {
-  const { currentStep } = useMultiStepForm<Memory>(
-    [
-      <EnterAadhaar {...({} as IEnterAadhaarProps)} />,
-      <VerifyAadhaar {...({} as IVerifyAadhaarProps)} />,
-      <HandleExistingAbhaNumber
-        {...({ onSuccess } as IHandleExistingAbhaNumberProps)}
-      />,
-      <LinkMobileNumber {...({} as ILinkMobileNumberProps)} />,
-      <VerifyMobileNumber {...({} as IVerifyMobileNumberProps)} />,
-      <ChooseAbhaAddress
-        {...({
-          onSuccess,
-        } as IChooseAbhaAddressProps)}
-      />,
-    ],
-    {
-      aadhaarNumber: "",
-      mobileNumber: "+91",
-      isLoading: false,
-      validationError: "",
-      transactionId: "",
-      abhaNumber: null,
-      resendOtpCount: 0,
-    },
-  );
-
-  return <div>{currentStep}</div>;
-}
-
-type IEnterAadhaarProps = InjectedStepProps<Memory>;
-
-function EnterAadhaar({ memory, setMemory, next }: IEnterAadhaarProps) {
-  const { t } = useTranslation();
-  const [disclaimerAccepted, setDisclaimerAccepted] = useState([
-    false,
-    false,
-    false,
-    false,
-  ]);
-
-  const validateAadhaar = () => {
-    if (
-      memory?.aadhaarNumber.length !== 12 &&
-      memory?.aadhaarNumber.length !== 16
-    ) {
-      setMemory((prev) => ({
-        ...prev,
-        validationError: t("aadhaar_validation_length_error"),
-      }));
-      return false;
-    }
-
-    if (memory?.aadhaarNumber.includes(" ")) {
-      setMemory((prev) => ({
-        ...prev,
-        validationError: t("aadhaar_validation_space_error"),
-      }));
-      return false;
-    }
-
-    return true;
-  };
-
-  const handleSubmit = async () => {
-    if (!validateAadhaar()) return;
-
-    setMemory((prev) => ({ ...prev, isLoading: true }));
-
-    const { res, data } = await request(
-      routes.abdm.healthId.abhaCreateSendAadhaarOtp,
-      {
-        body: {
-          aadhaar: memory!.aadhaarNumber,
-        },
-      },
-    );
-
-    if (res?.status === 200 && data) {
-      setMemory((prev) => ({ ...prev, transactionId: data.transaction_id }));
-      Notify.Success({
-        msg: data.detail ?? t("aadhaar_otp_send_success"),
-      });
-      next();
-    }
-
-    setMemory((prev) => ({ ...prev, isLoading: false }));
-  };
-
-  return (
-    <div>
-      <div className="flex flex-col justify-center">
-        <TextFormField
-          type="password"
-          name="aadhaar-number"
-          label={t("aadhaar_number")}
-          minLength={12}
-          maxLength={12}
-          inputClassName="text-black tracking-[0.3em] font-bold placeholder:font-normal placeholder:tracking-normal"
-          placeholder={t("enter_aadhaar_number")}
-          disabled={memory?.isLoading}
-          value={memory?.aadhaarNumber}
-          onChange={({ value }) =>
-            setMemory((prev) => ({ ...prev, aadhaarNumber: value }))
-          }
-          error={memory?.validationError}
-        />
-        <span
-          className={classNames(
-            "ml-2 text-sm font-medium text-gray-600",
-            !memory?.validationError && "-mt-4",
-          )}
-        >
-          {t("aadhaar_number_will_not_be_stored")}
-        </span>
-      </div>
-
-      <div className="mt-4 flex flex-col gap-2">
-        {disclaimerAccepted.map((isAccepted, i) => (
-          <CheckBoxFormField
-            key={`abha_disclaimer_${i + 1}`}
-            name={`abha_disclaimer_${i + 1}`}
-            label={t(`abha__disclaimer_${i + 1}`)}
-            value={isAccepted}
-            onChange={(e) => {
-              setDisclaimerAccepted(
-                disclaimerAccepted.map((v, j) => (j === i ? e.value : v)),
-              );
-            }}
-            className="mr-2 rounded border-gray-700"
-            labelClassName="text-xs text-gray-800"
-            errorClassName="hidden"
-          />
-        ))}
-      </div>
-
-      <div className="mt-4 flex items-center">
-        <ButtonV2
-          className="w-full"
-          loading={memory?.isLoading}
-          disabled={
-            disclaimerAccepted.some((v) => !v) ||
-            memory?.aadhaarNumber.length === 0
-          }
-          onClick={handleSubmit}
-        >
-          {t("send_otp")}
-        </ButtonV2>
-      </div>
-    </div>
-  );
-}
-
-type IVerifyAadhaarProps = InjectedStepProps<Memory>;
-
-function VerifyAadhaar({ memory, setMemory, next }: IVerifyAadhaarProps) {
-  const { t } = useTranslation();
-  const [otp, setOtp] = useState("");
-
-  const validateMobileNumber = () => {
-    const phone = memory?.mobileNumber.replace("+91", "").replace(/ /g, "");
-    if (phone?.length !== 10) {
-      setMemory((prev) => ({
-        ...prev,
-        validationError: t("mobile_number_validation_error"),
-      }));
-      return false;
-    }
-
-    return true;
-  };
-
-  const handleSubmit = async () => {
-    if (!validateMobileNumber()) return;
-
-    setMemory((prev) => ({ ...prev, isLoading: true }));
-
-    const { res, data } = await request(
-      routes.abdm.healthId.abhaCreateVerifyAadhaarOtp,
-      {
-        body: {
-          otp: otp,
-          transaction_id: memory?.transactionId,
-          mobile: memory?.mobileNumber.replace("+91", "").replace(/ /g, ""),
-        },
-      },
-    );
-
-    if (res?.status === 200 && data) {
-      setMemory((prev) => ({
-        ...prev,
-        transactionId: data.transaction_id,
-        abhaNumber: data.abha_number,
-        resendOtpCount: 0,
-      }));
-      Notify.Success({
-        msg: data.detail ?? t("otp_verification_success"),
-      });
-      next();
-    }
-
-    setMemory((prev) => ({ ...prev, isLoading: false }));
-  };
-
-  const handleResendOtp = async () => {
-    setMemory((prev) => ({ ...prev, isLoading: true }));
-
-    const { res, data } = await request(
-      routes.abdm.healthId.abhaCreateSendAadhaarOtp,
-      {
-        body: {
-          aadhaar: memory!.aadhaarNumber,
-          // transaction_id: memory?.transactionId,
-        },
-        silent: true,
-      },
-    );
-
-    if (res?.status === 200 && data) {
-      setMemory((prev) => ({
-        ...prev,
-        transactionId: data.transaction_id,
-        resendOtpCount: prev.resendOtpCount + 1,
-      }));
-      Notify.Success({
-        msg: data.detail ?? t("aadhaar_otp_send_success"),
-      });
-    } else {
-      setMemory((prev) => ({
-        ...prev,
-        resendOtpCount: Infinity,
-      }));
-      Notify.Success({
-        msg: t("aadhaar_otp_send_error"),
-      });
-    }
-
-    setMemory((prev) => ({ ...prev, isLoading: false }));
-  };
-
-  return (
-    <div>
-      <div className="flex flex-col justify-center">
-        <TextFormField
-          type="password"
-          name="aadhaar-number"
-          label={t("aadhaar_number")}
-          min={12}
-          max={16}
-          inputClassName="text-black tracking-[0.3em] font-bold placeholder:font-normal placeholder:tracking-normal"
-          placeholder={t("enter_aadhaar_number")}
-          disabled={true}
-          value={memory?.aadhaarNumber}
-          onChange={({ value }) =>
-            setMemory((prev) => ({ ...prev, aadhaarNumber: value }))
-          }
-        />
-        <span
-          className={classNames(
-            "ml-2 text-sm font-medium text-gray-600",
-            !memory?.validationError && "-mt-4",
-          )}
-        >
-          {t("aadhaar_number_will_not_be_stored")}
-        </span>
-      </div>
-
-      <div className="mt-4">
-        <OtpFormField
-          name="otp"
-          onChange={(value) => setOtp(value as string)}
-          value={otp}
-          label={t("enter_aadhaar_otp")}
-          disabled={memory?.isLoading}
-        />
-      </div>
-
-      <div className="mt-0">
-        <PhoneNumberFormField
-          label={t("enter_mobile_number")}
-          labelSuffix={<></>}
-          name="mobile_number"
-          value={memory?.mobileNumber}
-          onChange={(e) => {
-            if (!memory?.mobileNumber.startsWith("+91")) {
-              setMemory((prev) => ({
-                ...prev,
-                validationError: t("only_indian_mobile_numbers_supported"),
-              }));
-              return;
-            }
-
-            setMemory((prev) => ({ ...prev, mobileNumber: e.value }));
-          }}
-          error={memory?.validationError}
-          errorClassName="text-xs text-red-500"
-          types={["mobile"]}
-        />
-      </div>
-
-      <div className="mt-4 flex flex-col items-center gap-2">
-        <ButtonV2
-          className="w-full"
-          loading={memory?.isLoading}
-          disabled={otp.length > 6 || memory?.mobileNumber.length === 0}
-          onClick={handleSubmit}
-        >
-          {t("verify_otp")}
-        </ButtonV2>
-
-        {(memory?.resendOtpCount ?? 0) < MAX_OTP_RESEND_ALLOWED && (
-          <ButtonWithTimer
-            ghost
-            className="w-full"
-            initialInverval={60}
-            onClick={handleResendOtp}
-          >
-            {t("resend_otp")}
-          </ButtonWithTimer>
-        )}
-      </div>
-    </div>
-  );
-}
-
-type IHandleExistingAbhaNumberProps = InjectedStepProps<Memory> & {
-  onSuccess: (abhaNumber: AbhaNumberModel) => void;
-};
-
-function HandleExistingAbhaNumber({
-  memory,
-  onSuccess,
-  next,
-}: IHandleExistingAbhaNumberProps) {
-  const { t } = useTranslation();
-
-  // skip this step for new abha number
-  useEffect(() => {
-    if (memory?.abhaNumber?.new) {
-      next();
-    }
-  }, [memory?.abhaNumber, memory?.mobileNumber]); // eslint-disable-line
-
-  return (
-    <div>
-      <h2 className="text-xl font-semibold text-secondary-800">
-        {t("abha_number_exists")}
-      </h2>
-      <p className="text-sm text-secondary-800">
-        {t("abha_number_exists_description")}
-      </p>
-      <div className="mt-4 flex flex-col items-center justify-center gap-2">
-        <ButtonV2 className="w-full" onClick={next}>
-          {t("create_new_abha_address")}
-        </ButtonV2>
-        <ButtonV2
-          variant="secondary"
-          className="w-full"
-          onClick={() => onSuccess(memory?.abhaNumber as AbhaNumberModel)}
-        >
-          {t("use_existing_abha_address")}
-        </ButtonV2>
-        <p className="text-xs text-secondary-800">
-          {memory?.abhaNumber?.health_id}
-        </p>
-      </div>
-    </div>
-  );
-}
-
-type ILinkMobileNumberProps = InjectedStepProps<Memory>;
-
-function LinkMobileNumber({
-  memory,
-  goTo,
-  setMemory,
-  next,
-}: ILinkMobileNumberProps) {
-  const { t } = useTranslation();
-
-  useEffect(() => {
-    if (
-      memory?.abhaNumber?.mobile ===
-      memory?.mobileNumber.replace("+91", "").replace(/ /g, "")
-    ) {
-      goTo(5); // skip linking mobile number
-    }
-  }, [memory?.abhaNumber, memory?.mobileNumber]); // eslint-disable-line
-
-  const handleSubmit = async () => {
-    setMemory((prev) => ({ ...prev, isLoading: true }));
-
-    const { res, data } = await request(
-      routes.abdm.healthId.abhaCreateLinkMobileNumber,
-      {
-        body: {
-          mobile: memory?.mobileNumber.replace("+91", "").replace(/ /g, ""),
-          transaction_id: memory?.transactionId,
-        },
-      },
-    );
-
-    if (res?.status === 200 && data) {
-      setMemory((prev) => ({
-        ...prev,
-        transactionId: data.transaction_id,
-      }));
-      Notify.Success({
-        msg: data.detail ?? t("mobile_otp_send_success"),
-      });
-      next();
-    }
-
-    setMemory((prev) => ({ ...prev, isLoading: false }));
-  };
-
-  return (
-    <div>
-      <div className="mt-0">
-        <PhoneNumberFormField
-          label={t("enter_mobile_number")}
-          labelSuffix={<></>}
-          name="mobile_number"
-          value={memory?.mobileNumber}
-          disabled={true}
-          onChange={() => null}
-          types={["mobile"]}
-        />
-      </div>
-
-      <p className="mb-4 text-sm text-secondary-800">
-        {t("mobile_number_different_from_aadhaar_mobile_number")}
-      </p>
-
-      <div className="mt-4 flex items-center">
-        <ButtonV2
-          className="w-full"
-          loading={memory?.isLoading}
-          onClick={handleSubmit}
-        >
-          {t("send_otp")}
-        </ButtonV2>
-      </div>
-    </div>
-  );
-}
-
-type IVerifyMobileNumberProps = InjectedStepProps<Memory>;
-
-function VerifyMobileNumber({
-  memory,
-  setMemory,
-  next,
-}: IVerifyMobileNumberProps) {
-  const { t } = useTranslation();
-  const [otp, setOtp] = useState("");
-
-  const handleSubmit = async () => {
-    setMemory((prev) => ({ ...prev, isLoading: true }));
-
-    const { res, data } = await request(
-      routes.abdm.healthId.abhaCreateVerifyMobileNumber,
-      {
-        body: {
-          transaction_id: memory?.transactionId,
-          otp: otp,
-        },
-      },
-    );
-
-    if (res?.status === 200 && data) {
-      setMemory((prev) => ({
-        ...prev,
-        transactionId: data.transaction_id,
-        resendOtpCount: 0,
-      }));
-      Notify.Success({
-        msg: data.detail ?? t("mobile_otp_verify_success"),
-      });
-      next();
-    }
-
-    setMemory((prev) => ({ ...prev, isLoading: false }));
-  };
-
-  const handleResendOtp = async () => {
-    setMemory((prev) => ({ ...prev, isLoading: true }));
-
-    const { res, data } = await request(
-      routes.abdm.healthId.abhaCreateLinkMobileNumber,
-      {
-        body: {
-          mobile: memory?.mobileNumber.replace("+91", "").replace(/ /g, ""),
-          transaction_id: memory?.transactionId,
-        },
-      },
-    );
-
-    if (res?.status === 200 && data) {
-      setMemory((prev) => ({
-        ...prev,
-        transactionId: data.transaction_id,
-        resendOtpCount: prev.resendOtpCount + 1,
-      }));
-      Notify.Success({
-        msg: data.detail ?? t("mobile_otp_send_success"),
-      });
-    } else {
-      setMemory((prev) => ({
-        ...prev,
-        resendOtpCount: Infinity,
-      }));
-      Notify.Success({
-        msg: t("mobile_otp_send_error"),
-      });
-    }
-
-    setMemory((prev) => ({ ...prev, isLoading: false }));
-  };
-
-  return (
-    <div>
-      <div className="mt-0">
-        <PhoneNumberFormField
-          label={t("enter_mobile_number")}
-          labelSuffix={<></>}
-          name="mobile_number"
-          value={memory?.mobileNumber}
-          disabled={true}
-          onChange={() => null}
-          types={["mobile"]}
-        />
-      </div>
-
-      <div className="mt-4">
-        <OtpFormField
-          name="otp"
-          onChange={(value) => setOtp(value as string)}
-          value={otp}
-          label={t("enter_mobile_otp")}
-          disabled={memory?.isLoading}
-        />
-      </div>
-
-      <div className="mt-4 flex flex-col items-center gap-2">
-        <ButtonV2
-          className="w-full"
-          loading={memory?.isLoading}
-          onClick={handleSubmit}
-        >
-          {t("verify_otp")}
-        </ButtonV2>
-
-        {(memory?.resendOtpCount ?? 0) < MAX_OTP_RESEND_ALLOWED && (
-          <ButtonWithTimer
-            ghost
-            className="w-full"
-            initialInverval={60}
-            onClick={handleResendOtp}
-          >
-            {t("resend_otp")}
-          </ButtonWithTimer>
-        )}
-      </div>
-    </div>
-  );
-}
-
-type IChooseAbhaAddressProps = InjectedStepProps<Memory> & {
-  onSuccess: (abhaNumber: AbhaNumberModel) => void;
-};
-
-function ChooseAbhaAddress({
-  memory,
-  setMemory,
-  onSuccess,
-}: IChooseAbhaAddressProps) {
-  const { t } = useTranslation();
-  const [healthId, setHealthId] = useState("");
-  const [suggestions, setSuggestions] = useState<string[]>([]);
-
-  useEffect(() => {
-    const fetchSuggestions = async () => {
-      const { res, data } = await request(
-        routes.abdm.healthId.abhaCreateAbhaAddressSuggestion,
-        {
-          body: {
-            transaction_id: memory?.transactionId,
-          },
-        },
-      );
-
-      if (res?.status === 200 && data) {
-        setMemory((prev) => ({ ...prev, transactionId: data.transaction_id }));
-        setSuggestions(data.abha_addresses);
-      }
-    };
-
-    fetchSuggestions();
-  }, [healthId, memory?.transactionId, setMemory]);
-
-  const handleSubmit = async () => {
-    setMemory((prev) => ({ ...prev, isLoading: true }));
-
-    const { res, data } = await request(
-      routes.abdm.healthId.abhaCreateEnrolAbhaAddress,
-      {
-        body: {
-          abha_address: healthId,
-          transaction_id: memory?.transactionId,
-        },
-      },
-    );
-
-    if (res?.status === 200 && data) {
-      setMemory((prev) => ({
-        ...prev,
-        transactionId: data.transaction_id,
-        abhaNumber: data.abha_number,
-      }));
-      Notify.Success({
-        msg: data.detail ?? t("abha_address_created_success"),
-      });
-      onSuccess(data.abha_number);
-    }
-
-    setMemory((prev) => ({ ...prev, isLoading: false }));
-  };
-
-  return (
-    <div className="mt-4 flex flex-col gap-4">
-      <TextFormField
-        name="health-id"
-        label={t("enter_abha_address")}
-        placeholder={t("enter_abha_address")}
-        disabled={memory?.isLoading}
-        value={healthId}
-        onChange={({ value }) => {
-          setHealthId(value);
-        }}
-      />
-
-      <div className="-mt-4 mb-2 pl-2 text-sm text-secondary-500">
-        {validateRule(
-          healthId.length >= 4,
-          t("abha_address_validation_length_error"),
-          false,
-        )}
-        {validateRule(
-          Number.isNaN(Number(healthId[0])) && healthId[0] !== ".",
-          t("abha_address_validation_start_error"),
-          false,
-        )}
-        {validateRule(
-          healthId[healthId.length - 1] !== ".",
-          t("abha_address_validation_end_error"),
-          false,
-        )}
-        {validateRule(
-          /^[0-9a-zA-Z._]+$/.test(healthId),
-          t("abha_address_validation_character_error"),
-          false,
-        )}
-      </div>
-
-      {suggestions.length > 0 && (
-        <div>
-          <h4 className="text-sm text-secondary-800">
-            {t("abha_address_suggestions")}
-          </h4>
-          <div className="mt-2 flex flex-wrap items-end gap-2">
-            {suggestions
-              .filter((suggestion) => suggestion !== healthId)
-              .map((suggestion) => (
-                <p
-                  onClick={() => setHealthId(suggestion)}
-                  className="cursor-pointer rounded-md bg-primary-400 px-2.5 py-1 text-xs text-white"
-                >
-                  {suggestion}
-                </p>
-              ))}
-          </div>
-        </div>
-      )}
-
-      <div className="mt-4 flex items-center justify-center gap-2">
-        <ButtonV2
-          className="w-full"
-          disabled={
-            memory?.isLoading ||
-            !/^(?![\d.])[a-zA-Z0-9._]{4,}(?<!\.)$/.test(healthId)
-          }
-          onClick={handleSubmit}
-        >
-          {t("create_abha_address")}
-        </ButtonV2>
-      </div>
-    </div>
-  );
-}
diff --git a/src/components/ABDM/LinkAbhaNumber/LinkWithOtp.tsx b/src/components/ABDM/LinkAbhaNumber/LinkWithOtp.tsx
deleted file mode 100644
index 9b8150dee86..00000000000
--- a/src/components/ABDM/LinkAbhaNumber/LinkWithOtp.tsx
+++ /dev/null
@@ -1,350 +0,0 @@
-import { useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
-
-import useMultiStepForm, {
-  InjectedStepProps,
-} from "@/components/ABDM/LinkAbhaNumber/useMultiStepForm";
-import { AbhaNumberModel } from "@/components/ABDM/types/abha";
-import ButtonV2, { ButtonWithTimer } from "@/components/Common/ButtonV2";
-import Dropdown, { DropdownItem } from "@/components/Common/Menu";
-import CheckBoxFormField from "@/components/Form/FormFields/CheckBoxFormField";
-import OtpFormField from "@/components/Form/FormFields/OtpFormField";
-import TextFormField from "@/components/Form/FormFields/TextFormField";
-
-import * as Notify from "@/Utils/Notifications";
-import routes from "@/Utils/request/api";
-import request from "@/Utils/request/request";
-import { classNames } from "@/Utils/utils";
-
-const MAX_OTP_RESEND_ALLOWED = 2;
-
-type ILoginWithOtpProps = {
-  onSuccess: (abhaNumber: AbhaNumberModel) => void;
-};
-
-type Memory = {
-  id: string;
-
-  isLoading: boolean;
-  validationError: string;
-
-  transactionId: string;
-  type: "aadhaar" | "mobile" | "abha-number" | "abha-address";
-  otp_system: "abdm" | "aadhaar";
-  abhaNumber: AbhaNumberModel | null;
-
-  resendOtpCount: number;
-};
-
-export default function LinkWithOtp({ onSuccess }: ILoginWithOtpProps) {
-  const { currentStep } = useMultiStepForm<Memory>(
-    [
-      <EnterId {...({} as IEnterIdProps)} />,
-      <VerifyId {...({ onSuccess } as IVerifyIdProps)} />,
-    ],
-    {
-      id: "",
-      isLoading: false,
-      validationError: "",
-      transactionId: "",
-      type: "aadhaar",
-      otp_system: "aadhaar",
-      abhaNumber: null,
-      resendOtpCount: 0,
-    },
-  );
-
-  return <div>{currentStep}</div>;
-}
-
-type IEnterIdProps = InjectedStepProps<Memory>;
-
-const supportedAuthMethods = ["AADHAAR_OTP", "MOBILE_OTP"];
-
-function EnterId({ memory, setMemory, next }: IEnterIdProps) {
-  const { t } = useTranslation();
-  const [disclaimerAccepted, setDisclaimerAccepted] = useState([
-    false,
-    false,
-    false,
-  ]);
-  const [authMethods, setAuthMethods] = useState<string[]>([]);
-
-  const valueType = useMemo(() => {
-    const id = memory?.id;
-    const isNumeric = !isNaN(Number(id?.trim()));
-
-    if (isNumeric && (id?.length === 12 || id?.length === 16)) {
-      return "aadhaar";
-    } else if (isNumeric && id?.length === 10) {
-      return "mobile";
-    } else if (isNumeric && id?.length === 14) {
-      return "abha-number";
-    } else {
-      return "abha-address";
-    }
-  }, [memory?.id]);
-
-  const handleGetAuthMethods = async () => {
-    setMemory((prev) => ({ ...prev, isLoading: true }));
-
-    if (valueType === "aadhaar") {
-      setAuthMethods(["AADHAAR_OTP"]);
-    } else if (valueType === "mobile") {
-      setAuthMethods(["MOBILE_OTP"]);
-    } else {
-      const { res, data, error } = await request(
-        routes.abdm.healthId.abhaLoginCheckAuthMethods,
-        {
-          body: {
-            abha_address: memory?.id.replace(/-/g, "").replace(/ /g, ""),
-          },
-          silent: true,
-        },
-      );
-
-      if (res?.status === 200 && data) {
-        const methods = data.auth_methods.filter((method: string) =>
-          supportedAuthMethods.find((supported) => supported === method),
-        );
-
-        if (methods.length === 0) {
-          Notify.Warn({ msg: t("get_auth_mode_error") });
-        }
-      } else {
-        Notify.Error({ msg: error?.message ?? t("get_auth_mode_error") });
-      }
-    }
-
-    setMemory((prev) => ({ ...prev, isLoading: false }));
-  };
-
-  const handleSendOtp = async (authMethod: string) => {
-    if (!supportedAuthMethods.includes(authMethod)) {
-      Notify.Warn({ msg: t("auth_method_unsupported") });
-      return;
-    }
-
-    const otp_system: "aadhaar" | "abdm" =
-      authMethod === "AADHAAR_OTP" ? "aadhaar" : "abdm";
-
-    setMemory((prev) => ({
-      ...prev,
-      isLoading: true,
-      type: valueType,
-      otp_system,
-    }));
-
-    const { res, data } = await request(routes.abdm.healthId.abhaLoginSendOtp, {
-      body: {
-        value: memory?.id,
-        type: valueType,
-        otp_system,
-      },
-    });
-
-    if (res?.status === 200 && data) {
-      setMemory((prev) => ({
-        ...prev,
-        transactionId: data.transaction_id,
-      }));
-      Notify.Success({ msg: data.detail ?? t("send_otp_success") });
-      next();
-    }
-
-    setMemory((prev) => ({ ...prev, isLoading: false }));
-  };
-
-  return (
-    <div>
-      <div className="flex flex-col justify-center">
-        <TextFormField
-          type="password"
-          name="id"
-          label={t("any_id")}
-          inputClassName="text-black tracking-[0.3em] font-bold placeholder:font-normal placeholder:tracking-normal"
-          placeholder={t("enter_any_id")}
-          disabled={memory?.isLoading}
-          value={memory?.id}
-          onChange={({ value }) => {
-            setMemory((prev) => ({ ...prev, id: value }));
-            setAuthMethods([]);
-          }}
-          error={memory?.validationError}
-        />
-        <span
-          className={classNames(
-            "ml-2 text-sm font-medium text-gray-600",
-            !memory?.validationError && "-mt-4",
-          )}
-        >
-          {t("any_id_description")}
-        </span>
-      </div>
-
-      <div className="mt-4 flex flex-col gap-2">
-        {disclaimerAccepted.map((isAccepted, i) => (
-          <CheckBoxFormField
-            key={`abha_disclaimer_${i + 2}`}
-            name={`abha_disclaimer_${i + 2}`}
-            label={t(`abha__disclaimer_${i + 2}`)}
-            value={isAccepted}
-            onChange={(e) => {
-              setDisclaimerAccepted(
-                disclaimerAccepted.map((v, j) => (j === i ? e.value : v)),
-              );
-            }}
-            className="mr-2 rounded border-gray-700"
-            labelClassName="text-xs text-gray-800"
-            errorClassName="hidden"
-          />
-        ))}
-      </div>
-
-      <div className="mt-4 flex items-center">
-        {authMethods.length === 0 ? (
-          <ButtonV2
-            className="w-full"
-            loading={memory?.isLoading}
-            disabled={
-              disclaimerAccepted.some((v) => !v) || memory?.id.length === 0
-            }
-            onClick={handleGetAuthMethods}
-          >
-            {t("get_auth_methods")}
-          </ButtonV2>
-        ) : (
-          <Dropdown
-            itemClassName="!w-full md:!w-full"
-            containerClassName="w-full"
-            title={t("verify_using")}
-          >
-            {authMethods.map((method) => (
-              <DropdownItem key={method} onClick={() => handleSendOtp(method)}>
-                {t(`abha__auth_method__${method}`)}
-              </DropdownItem>
-            ))}
-          </Dropdown>
-        )}
-      </div>
-    </div>
-  );
-}
-
-type IVerifyIdProps = InjectedStepProps<Memory> & {
-  onSuccess: (abhaNumber: AbhaNumberModel) => void;
-};
-
-function VerifyId({ memory, setMemory, onSuccess }: IVerifyIdProps) {
-  const { t } = useTranslation();
-  const [otp, setOtp] = useState("");
-
-  const handleSubmit = async () => {
-    setMemory((prev) => ({ ...prev, isLoading: true }));
-
-    const { res, data } = await request(
-      routes.abdm.healthId.abhaLoginVerifyOtp,
-      {
-        body: {
-          type: memory?.type,
-          transaction_id: memory?.transactionId,
-          otp,
-          otp_system: memory?.otp_system,
-        },
-      },
-    );
-
-    if (res?.status === 200 && data) {
-      Notify.Success({ msg: t("verify_otp_success") });
-      onSuccess(data.abha_number);
-    }
-
-    setMemory((prev) => ({ ...prev, isLoading: false }));
-  };
-
-  const handleResendOtp = async () => {
-    setMemory((prev) => ({ ...prev, isLoading: true }));
-
-    const { res, data } = await request(routes.abdm.healthId.abhaLoginSendOtp, {
-      body: {
-        value: memory?.id,
-        type: memory?.type,
-        otp_system: memory?.otp_system,
-      },
-    });
-
-    if (res?.status === 200 && data) {
-      setMemory((prev) => ({
-        ...prev,
-        transactionId: data.transaction_id,
-        resendOtpCount: (prev.resendOtpCount ?? 0) + 1,
-      }));
-      Notify.Success({ msg: data.detail ?? t("send_otp_success") });
-    } else {
-      setMemory((prev) => ({
-        ...prev,
-        resendOtpCount: Infinity,
-      }));
-      Notify.Error({ msg: t("send_otp_error") });
-    }
-
-    setMemory((prev) => ({ ...prev, isLoading: false }));
-  };
-
-  return (
-    <div>
-      <div className="flex flex-col justify-center">
-        <TextFormField
-          type="password"
-          name="id"
-          label={t("any_id")}
-          inputClassName="text-black tracking-[0.3em] font-bold placeholder:font-normal placeholder:tracking-normal"
-          placeholder={t("enter_any_id")}
-          disabled={true}
-          value={memory?.id}
-          onChange={() => null}
-        />
-        <span
-          className={classNames(
-            "ml-2 text-sm font-medium text-gray-600",
-            !memory?.validationError && "-mt-4",
-          )}
-        >
-          {t("any_id_description")}
-        </span>
-      </div>
-
-      <div className="mt-4">
-        <OtpFormField
-          name="otp"
-          onChange={(value) => setOtp(value as string)}
-          value={otp}
-          label={t("enter_otp")}
-          disabled={memory?.isLoading}
-        />
-      </div>
-
-      <div className="mt-4 flex flex-col items-center gap-2">
-        <ButtonV2
-          className="w-full"
-          loading={memory?.isLoading}
-          disabled={otp.length !== 6}
-          onClick={handleSubmit}
-        >
-          {t("verify_and_link")}
-        </ButtonV2>
-
-        {(memory?.resendOtpCount ?? 0) < MAX_OTP_RESEND_ALLOWED && (
-          <ButtonWithTimer
-            ghost
-            className="w-full"
-            initialInverval={60}
-            onClick={handleResendOtp}
-          >
-            {t("resend_otp")}
-          </ButtonWithTimer>
-        )}
-      </div>
-    </div>
-  );
-}
diff --git a/src/components/ABDM/LinkAbhaNumber/LinkWithQr.tsx b/src/components/ABDM/LinkAbhaNumber/LinkWithQr.tsx
deleted file mode 100644
index 712d28943b4..00000000000
--- a/src/components/ABDM/LinkAbhaNumber/LinkWithQr.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { IDetectedBarcode, Scanner } from "@yudiel/react-qr-scanner";
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-
-import { ABHAQRContent, AbhaNumberModel } from "@/components/ABDM/types/abha";
-
-import * as Notification from "@/Utils/Notifications";
-import routes from "@/Utils/request/api";
-import request from "@/Utils/request/request";
-
-type ILoginWithQrProps = {
-  onSuccess: (abhaNumber: AbhaNumberModel) => void;
-};
-
-export default function LinkWithQr({ onSuccess }: ILoginWithQrProps) {
-  const { t } = useTranslation();
-  const [isLoading, setIsLoading] = useState(false);
-
-  return (
-    <div>
-      <Scanner
-        onScan={async (detectedCodes: IDetectedBarcode[]) => {
-          if (detectedCodes.length === 0) return;
-
-          const scannedValue = detectedCodes[0].rawValue;
-          if (!scannedValue || isLoading) return;
-
-          try {
-            const qrData = JSON.parse(scannedValue) as ABHAQRContent;
-
-            setIsLoading(true);
-            const { res, data } = await request(routes.abdm.abhaNumber.create, {
-              body: {
-                abha_number: qrData.hidn,
-                health_id: qrData.hid || qrData.phr,
-                name: qrData.name,
-                gender: qrData.gender,
-                date_of_birth: qrData.dob,
-                address: qrData.address,
-                district: qrData.district_name || qrData["dist name"],
-                state: qrData.state_name || qrData["state name"],
-                mobile: qrData.mobile,
-              },
-            });
-
-            if (res?.status === 201 && data) {
-              onSuccess(data);
-            }
-            setIsLoading(false);
-          } catch (e) {
-            Notification.Error({
-              msg: t("abha__qr_scanning_error"),
-            });
-          }
-        }}
-        onError={(e: unknown) => {
-          const errorMessage = e instanceof Error ? e.message : "Unknown error";
-          Notification.Error({
-            msg: errorMessage,
-          });
-        }}
-        scanDelay={3000}
-        constraints={{
-          facingMode: "environment",
-        }}
-      />
-    </div>
-  );
-}
diff --git a/src/components/ABDM/LinkAbhaNumber/index.tsx b/src/components/ABDM/LinkAbhaNumber/index.tsx
deleted file mode 100644
index 45cd0b34d02..00000000000
--- a/src/components/ABDM/LinkAbhaNumber/index.tsx
+++ /dev/null
@@ -1,142 +0,0 @@
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
-
-import CreateWithAadhaar from "@/components/ABDM/LinkAbhaNumber/CreateWithAadhaar";
-import LinkWithOtp from "@/components/ABDM/LinkAbhaNumber/LinkWithOtp";
-import LinkWithQr from "@/components/ABDM/LinkAbhaNumber/LinkWithQr";
-import { AbhaNumberModel } from "@/components/ABDM/types/abha";
-import ButtonV2 from "@/components/Common/ButtonV2";
-import DialogModal from "@/components/Common/Dialog";
-
-import { classNames } from "@/Utils/utils";
-
-interface ILinkAbhaNumberProps {
-  show: boolean;
-  onClose: () => void;
-  onSuccess: (abhaNumber: AbhaNumberModel) => void;
-}
-
-const ABHA_LINK_OPTIONS = {
-  create_with_aadhaar: {
-    title: "abha_link_options__create_with_aadhaar__title",
-    description: "abha_link_options__create_with_aadhaar__description",
-    disabled: false,
-    value: "create_with_aadhaar",
-    create: true,
-  },
-  link_with_otp: {
-    title: "abha_link_options__link_with_otp__title",
-    description: "abha_link_options__link_with_otp__description",
-    disabled: false,
-    value: "link_with_otp",
-    create: false,
-  },
-  create_with_driving_license: {
-    title: "abha_link_options__create_with_driving_license__title",
-    description: "abha_link_options__create_with_driving_license__description",
-    disabled: true,
-    value: "create_with_driving_license",
-    create: true,
-  },
-  link_with_demographics: {
-    title: "abha_link_options__link_with_demographics__title",
-    description: "abha_link_options__link_with_demographics__description",
-    disabled: true,
-    value: "link_with_demographics",
-    create: false,
-  },
-  link_with_qr: {
-    title: "abha_link_options__link_with_qr__title",
-    description: "abha_link_options__link_with_qr__description",
-    disabled: false,
-    value: "link_with_qr",
-    create: false,
-  },
-};
-
-export default function LinkAbhaNumber({
-  show,
-  onClose,
-  onSuccess,
-}: ILinkAbhaNumberProps) {
-  const { t } = useTranslation();
-  const [currentAbhaLinkOption, setCurrentAbhaLinkOption] = useState<
-    keyof typeof ABHA_LINK_OPTIONS
-  >("create_with_aadhaar");
-
-  return (
-    <DialogModal
-      title={t(ABHA_LINK_OPTIONS[currentAbhaLinkOption].title)}
-      show={show}
-      onClose={onClose}
-    >
-      {currentAbhaLinkOption === "create_with_aadhaar" && (
-        <CreateWithAadhaar onSuccess={onSuccess} />
-      )}
-
-      {currentAbhaLinkOption === "link_with_otp" && (
-        <LinkWithOtp onSuccess={onSuccess} />
-      )}
-
-      {currentAbhaLinkOption === "link_with_qr" && (
-        <LinkWithQr onSuccess={onSuccess} />
-      )}
-
-      <div className="mt-6">
-        <p
-          onClick={() =>
-            setCurrentAbhaLinkOption(
-              ABHA_LINK_OPTIONS[currentAbhaLinkOption].create
-                ? "link_with_otp"
-                : "create_with_aadhaar",
-            )
-          }
-          className="cursor-pointer text-center text-sm text-blue-800"
-        >
-          {ABHA_LINK_OPTIONS[currentAbhaLinkOption].create
-            ? t("link_existing_abha_profile")
-            : t("create_new_abha_profile")}
-        </p>
-      </div>
-
-      <div>
-        <p className="mt-6 text-sm text-secondary-800">
-          {t("try_different_abha_linking_option")}
-        </p>
-        <div className="mt-2 flex flex-wrap items-center justify-start gap-2">
-          {Object.values(ABHA_LINK_OPTIONS)
-            .filter(
-              (option) =>
-                option.value !== currentAbhaLinkOption &&
-                ABHA_LINK_OPTIONS[currentAbhaLinkOption]?.create ===
-                  option.create,
-            )
-            .sort((a) => (a.disabled ? 1 : -1))
-            .map((option) => (
-              <ButtonV2
-                onClick={() =>
-                  setCurrentAbhaLinkOption(
-                    option.value as keyof typeof ABHA_LINK_OPTIONS,
-                  )
-                }
-                ghost
-                tooltip={
-                  option.disabled
-                    ? t("abha_link_options__disabled_tooltip")
-                    : t(option.description)
-                }
-                disabled={option.disabled}
-                tooltipClassName="top-full mt-1"
-                className={classNames(
-                  "w-full border border-gray-400 text-secondary-800",
-                  !option.disabled && "hover:border-primary-100",
-                )}
-              >
-                {t(option.title)}
-              </ButtonV2>
-            ))}
-        </div>
-      </div>
-    </DialogModal>
-  );
-}
diff --git a/src/components/ABDM/LinkAbhaNumber/useMultiStepForm.ts b/src/components/ABDM/LinkAbhaNumber/useMultiStepForm.ts
deleted file mode 100644
index 79bc9ec71c6..00000000000
--- a/src/components/ABDM/LinkAbhaNumber/useMultiStepForm.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import {
-  Dispatch,
-  ReactElement,
-  SetStateAction,
-  cloneElement,
-  useCallback,
-  useMemo,
-  useState,
-} from "react";
-
-export interface InjectedStepProps<T> {
-  currentStepIndex: number;
-  isFirstStep: boolean;
-  isLastStep: boolean;
-  next: () => void;
-  prev: () => void;
-  goTo: (step: number) => void;
-  memory: T | null;
-  setMemory: Dispatch<SetStateAction<T>>;
-}
-
-export default function useMultiStepForm<T>(
-  steps: ReactElement[],
-  initialValues?: T,
-) {
-  const [currentStepIndex, setCurrentStepIndex] = useState(0);
-  const [memory, setMemory] = useState<T>(initialValues as T);
-
-  const next = useCallback(
-    () =>
-      setCurrentStepIndex((prev) =>
-        steps.length - 1 > prev ? prev + 1 : prev,
-      ),
-    [steps.length],
-  );
-
-  const prev = useCallback(
-    () => setCurrentStepIndex((prev) => (prev > 0 ? prev - 1 : prev)),
-    [],
-  );
-
-  const goTo = useCallback(
-    (step: number) =>
-      setCurrentStepIndex((prev) =>
-        step >= 0 && step <= steps.length - 1 ? step : prev,
-      ),
-    [steps.length],
-  );
-
-  const options = useMemo(
-    () => ({
-      currentStepIndex,
-      isFirstStep: currentStepIndex === 0,
-      isLastStep: currentStepIndex === steps.length - 1,
-      next,
-      prev,
-      goTo,
-      memory,
-      setMemory,
-    }),
-    [currentStepIndex, memory, next, prev, goTo, steps.length],
-  );
-
-  const currentStep = cloneElement(steps[currentStepIndex], {
-    ...options,
-    ...steps[currentStepIndex].props,
-  });
-
-  return { currentStep, ...options };
-}
diff --git a/src/components/ABDM/types/abha.ts b/src/components/ABDM/types/abha.ts
deleted file mode 100644
index f189bd111cb..00000000000
--- a/src/components/ABDM/types/abha.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { PatientModel } from "@/components/Patient/models";
-
-export type AbhaNumberModel = {
-  id: number;
-  external_id: string;
-  created_date: string;
-  modified_date: string;
-  abha_number: string;
-  health_id: string;
-  name: string;
-  first_name: string | null;
-  middle_name: string | null;
-  last_name: string | null;
-  gender: "F" | "M" | "O";
-  date_of_birth: string | null;
-  address: string | null;
-  district: string | null;
-  state: string | null;
-  pincode: string | null;
-  mobile: string | null;
-  email: string | null;
-  profile_photo: string | null;
-  new: boolean;
-  patient: string | null;
-  patient_object: PatientModel | null;
-};
-
-export type ABHAQRContent = {
-  hidn: string;
-  name: string;
-  gender: "M" | "F" | "O";
-  dob: string;
-  mobile: string;
-  address: string;
-  distlgd: string;
-  statelgd: string;
-} & ({ hid: string; phr?: never } | { phr: string; hid?: never }) &
-  (
-    | { district_name: string; "dist name"?: never }
-    | { "dist name": string; district_name?: never }
-  ) &
-  (
-    | { state_name: string; "state name"?: never }
-    | { "state name": string; state_name?: never }
-  );
diff --git a/src/components/ABDM/types/consent.ts b/src/components/ABDM/types/consent.ts
deleted file mode 100644
index a5041f5767d..00000000000
--- a/src/components/ABDM/types/consent.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { AbhaNumberModel } from "@/components/ABDM/types/abha";
-import { UserBaseModel } from "@/components/Users/models";
-
-export type ConsentPurpose =
-  | "CAREMGT"
-  | "BTG"
-  | "PUBHLTH"
-  | "HPAYMT"
-  | "DSRCH"
-  | "PATRQT";
-
-export type ConsentStatus =
-  | "REQUESTED"
-  | "GRANTED"
-  | "DENIED"
-  | "EXPIRED"
-  | "REVOKED";
-
-export type ConsentHIType =
-  | "Prescription"
-  | "DiagnosticReport"
-  | "OPConsultation"
-  | "DischargeSummary"
-  | "ImmunizationRecord"
-  | "HealthDocumentRecord"
-  | "WellnessRecord";
-
-export type ConsentAccessMode = "VIEW" | "STORE" | "QUERY" | "STREAM";
-
-export type ConsentFrequencyUnit = "HOUR" | "DAY" | "WEEK" | "MONTH" | "YEAR";
-
-export type ConsentCareContext = {
-  patientReference: string;
-  careContextReference: string;
-};
-
-export type ConsentModel = {
-  id: string;
-  consent_id: null | string;
-
-  patient_abha: string;
-  care_contexts: ConsentCareContext[];
-
-  status: ConsentStatus;
-  purpose: ConsentPurpose;
-  hi_types: ConsentHIType[];
-
-  access_mode: ConsentAccessMode;
-  from_time: string;
-  to_time: string;
-  expiry: string;
-
-  frequency_unit: ConsentFrequencyUnit;
-  frequency_value: number;
-  frequency_repeats: number;
-
-  hip: null | string;
-  hiu: null | string;
-
-  created_date: string;
-  modified_date: string;
-};
-
-export type CreateConsentTBody = {
-  patient_abha: string;
-  hi_types: ConsentHIType[];
-  purpose: ConsentPurpose;
-  from_time: Date | string;
-  to_time: Date | string;
-  expiry: Date | string;
-
-  access_mode?: ConsentAccessMode;
-  frequency_unit?: ConsentFrequencyUnit;
-  frequency_value?: number;
-  frequency_repeats?: number;
-  hip?: null | string;
-};
-
-export type ConsentArtefactModel = {
-  consent_request: string;
-
-  cm: null | string;
-} & ConsentModel;
-
-export type ConsentRequestModel = {
-  requester: UserBaseModel;
-  patient_abha_object: AbhaNumberModel;
-  consent_artefacts: ConsentArtefactModel[];
-} & ConsentModel;
diff --git a/src/components/ABDM/types/health-facility.ts b/src/components/ABDM/types/health-facility.ts
deleted file mode 100644
index 419003dbf8e..00000000000
--- a/src/components/ABDM/types/health-facility.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-export interface IHealthFacility {
-  id: string;
-  registered: boolean;
-  external_id: string;
-  created_date: string;
-  modified_date: string;
-  hf_id: string;
-  facility: string;
-  detail?: string;
-}
-
-export interface IcreateHealthFacilityTBody {
-  facility: string;
-  hf_id: string;
-}
-
-export interface IpartialUpdateHealthFacilityTBody {
-  hf_id: string;
-}
diff --git a/src/components/ABDM/types/health-information.ts b/src/components/ABDM/types/health-information.ts
deleted file mode 100644
index eeb1c53a4fb..00000000000
--- a/src/components/ABDM/types/health-information.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export type HealthInformationModel = {
-  data: {
-    content: string;
-    care_context_reference: string;
-  }[];
-};
diff --git a/src/components/Auth/Login.tsx b/src/components/Auth/Login.tsx
index bcf0d4e3415..aab5f8df179 100644
--- a/src/components/Auth/Login.tsx
+++ b/src/components/Auth/Login.tsx
@@ -335,6 +335,7 @@ const Login = (props: { forgot?: boolean }) => {
                             setForgotPassword(true);
                           }}
                           type="button"
+                          id="forgot-pass-btn"
                           className="text-sm text-primary-400 hover:text-primary-500"
                         >
                           {t("forget_password")}
@@ -347,6 +348,7 @@ const Login = (props: { forgot?: boolean }) => {
                         </div>
                       ) : (
                         <button
+                          id="login-button"
                           type="submit"
                           className="inline-flex w-full cursor-pointer items-center justify-center rounded bg-primary-500 px-4 py-2 text-sm font-semibold text-white"
                         >
@@ -370,6 +372,7 @@ const Login = (props: { forgot?: boolean }) => {
                     setForgotPassword(false);
                   }}
                   type="button"
+                  id="back-to-login-btn"
                   className="mb-4 text-sm text-primary-400 hover:text-primary-500"
                 >
                   <div className="flex justify-center">
@@ -377,11 +380,14 @@ const Login = (props: { forgot?: boolean }) => {
                     <span>{t("back_to_login")}</span>
                   </div>
                 </button>
-                <div className="mb-8 w-[300px] text-4xl font-black text-primary-600">
+                <div
+                  className="mb-8 w-[300px] text-4xl font-black text-primary-600"
+                  id="forgot-password-heading"
+                >
                   {t("forget_password")}
                 </div>
                 <form onSubmit={handleForgetSubmit}>
-                  <div>
+                  <div id="forgot-password-instruction">
                     {t("forget_password_instruction")}
                     <LegendInput
                       id="forgot_username"
@@ -403,6 +409,7 @@ const Login = (props: { forgot?: boolean }) => {
                       ) : (
                         <button
                           type="submit"
+                          id="send-reset-link-btn"
                           className="inline-flex w-full cursor-pointer items-center justify-center rounded bg-primary-500 px-4 py-2 text-sm font-semibold text-white"
                         >
                           {t("send_reset_link")}
diff --git a/src/components/Facility/ConsultationDetails/ConsultationContext.tsx b/src/components/Facility/ConsultationDetails/ConsultationContext.tsx
new file mode 100644
index 00000000000..174b20536a5
--- /dev/null
+++ b/src/components/Facility/ConsultationDetails/ConsultationContext.tsx
@@ -0,0 +1,73 @@
+import { ReactNode, createContext, useContext, useState } from "react";
+
+import { ConsultationModel } from "@/components/Facility/models";
+import { PatientModel } from "@/components/Patient/models";
+
+import { PLUGIN_Component } from "@/PluginEngine";
+
+interface ConsultationContextBase {
+  consultation?: ConsultationModel;
+  patient?: PatientModel;
+}
+
+type ConsultationContextType<T> = ConsultationContextBase &
+  T & {
+    setValue: <K extends keyof (ConsultationContextBase & T)>(
+      key: K,
+      value: (ConsultationContextBase & T)[K],
+    ) => void;
+  };
+
+const ConsultationContext = createContext<
+  ConsultationContextType<object> | undefined
+>(undefined);
+
+export const useConsultation = <T extends object = object>() => {
+  const context = useContext(ConsultationContext);
+
+  if (!context) {
+    throw new Error(
+      "'useConsultation' must be used within 'ConsultationProvider' only",
+    );
+  }
+
+  return context as ConsultationContextType<T>;
+};
+
+interface ConsultationProviderProps<T extends object> {
+  children: ReactNode;
+  initialContext?: Partial<ConsultationContextBase & T>;
+}
+
+export const ConsultationProvider = <T extends object = object>({
+  children,
+  initialContext = {},
+}: ConsultationProviderProps<T>) => {
+  const [state, setState] = useState<ConsultationContextBase & T>(
+    initialContext as ConsultationContextBase & T,
+  );
+
+  const setValue = <K extends keyof (ConsultationContextBase & T)>(
+    key: K,
+    value: (ConsultationContextBase & T)[K],
+  ) => {
+    setState((prevState) => ({
+      ...prevState,
+      [key]: value,
+    }));
+  };
+
+  return (
+    <ConsultationContext.Provider
+      value={
+        {
+          ...state,
+          setValue,
+        } as ConsultationContextType<T>
+      }
+    >
+      <PLUGIN_Component __name="ConsultationContextEnabler" />
+      {children}
+    </ConsultationContext.Provider>
+  );
+};
diff --git a/src/components/Facility/ConsultationDetails/index.tsx b/src/components/Facility/ConsultationDetails/index.tsx
index 496fd8f5d02..ec26dfe1a1d 100644
--- a/src/components/Facility/ConsultationDetails/index.tsx
+++ b/src/components/Facility/ConsultationDetails/index.tsx
@@ -1,9 +1,7 @@
-import { Link, navigate, useQueryParams } from "raviger";
+import { Link, navigate } from "raviger";
 import { useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 
-import ABDMRecordsTab from "@/components/ABDM/ABDMRecordsTab";
-import { AbhaNumberModel } from "@/components/ABDM/types/abha";
 import Loading from "@/components/Common/Loading";
 import PageTitle from "@/components/Common/PageTitle";
 import RelativeDateUserMention from "@/components/Common/RelativeDateUserMention";
@@ -29,6 +27,7 @@ import PatientInfoCard from "@/components/Patient/PatientInfoCard";
 import { PatientModel } from "@/components/Patient/models";
 
 import useAuthUser from "@/hooks/useAuthUser";
+import { useCareAppConsultationTabs } from "@/hooks/useCareApps";
 
 import { GENDER_TYPES } from "@/common/constants";
 
@@ -44,6 +43,8 @@ import {
   relativeTime,
 } from "@/Utils/utils";
 
+import { ConsultationProvider } from "./ConsultationContext";
+
 export interface ConsultationTabProps {
   consultationId: string;
   facilityId: string;
@@ -52,7 +53,7 @@ export interface ConsultationTabProps {
   patientData: PatientModel;
 }
 
-const TABS = {
+const defaultTabs = {
   UPDATES: ConsultationUpdatesTab,
   FEED: ConsultationFeedTab,
   SUMMARY: ConsultationSummaryTab,
@@ -66,20 +67,27 @@ const TABS = {
   NUTRITION: ConsultationNutritionTab,
   PRESSURE_SORE: ConsultationPressureSoreTab,
   DIALYSIS: ConsultationDialysisTab,
-  ABDM: ABDMRecordsTab,
-};
+} as Record<string, React.FC<ConsultationTabProps>>;
 
 export const ConsultationDetails = (props: any) => {
   const { facilityId, patientId, consultationId } = props;
   const { t } = useTranslation();
+  const [tabs, setTabs] =
+    useState<Record<string, React.FC<ConsultationTabProps>>>(defaultTabs);
+  const pluginTabs = useCareAppConsultationTabs();
+
+  useEffect(() => {
+    if (pluginTabs) {
+      setTabs((prev) => ({ ...prev, ...pluginTabs }));
+    }
+  }, [pluginTabs]);
+
   let tab = undefined;
-  if (Object.keys(TABS).includes(props.tab.toUpperCase())) {
-    tab = props.tab.toUpperCase() as keyof typeof TABS;
+  if (Object.keys(tabs).includes(props.tab.toUpperCase())) {
+    tab = props.tab.toUpperCase();
   }
   const [showDoctors, setShowDoctors] = useState(false);
-  const [qParams, _] = useQueryParams();
   const [patientData, setPatientData] = useState<PatientModel>();
-  const [abhaNumberData, setAbhaNumberData] = useState<AbhaNumberModel>();
   const [activeShiftingData, setActiveShiftingData] = useState<Array<any>>([]);
 
   const getPatientGender = (patientData: any) =>
@@ -144,16 +152,6 @@ export const ConsultationDetails = (props: any) => {
 
   const fetchData = useCallback(
     async (id: string) => {
-      // Get abha number data
-      const { data: abhaNumberData } = await request(
-        routes.abdm.abhaNumber.get,
-        {
-          pathParams: { abhaNumberId: id ?? "" },
-          silent: true,
-        },
-      );
-      setAbhaNumberData(abhaNumberData);
-
       // Get shifting data
       const shiftRequestsQuery = await request(routes.listShiftRequests, {
         query: { patient: id },
@@ -194,7 +192,7 @@ export const ConsultationDetails = (props: any) => {
     return <Error404 />;
   }
 
-  const SelectedTab = TABS[tab];
+  const SelectedTab = tabs[tab];
 
   const tabButtonClasses = (selected: boolean) =>
     `capitalize min-w-max-content cursor-pointer font-bold whitespace-nowrap ${
@@ -204,217 +202,222 @@ export const ConsultationDetails = (props: any) => {
     }`;
 
   return (
-    <div>
+    <ConsultationProvider
+      initialContext={{
+        consultation: consultationData,
+        patient: patientData,
+      }}
+    >
       <div>
-        <nav className="relative flex flex-wrap items-start justify-between">
-          <PageTitle
-            title="Patient Dashboard"
-            className="sm:m-0 sm:p-0"
-            crumbsReplacements={{
-              [facilityId]: { name: patientData?.facility_object?.name },
-              [patientId]: { name: patientData?.name },
-              [consultationId]: {
-                name:
-                  consultationData.suggestion === "A"
-                    ? `Admitted on ${formatDateTime(
-                        consultationData.encounter_date!,
-                      )}`
-                    : consultationData.suggestion_text,
-              },
-            }}
-            breadcrumbs={true}
-            backUrl="/patients"
-          />
-          <div
-            className="flex w-full flex-col min-[1150px]:w-min min-[1150px]:flex-row min-[1150px]:items-center"
-            id="consultationpage-header"
-          >
-            {!consultationData.discharge_date && (
-              <>
-                <button
-                  id="doctor-connect-button"
-                  onClick={() => {
-                    triggerGoal("Doctor Connect Clicked", {
-                      consultationId,
-                      facilityId: patientData.facility,
-                      userId: authUser.id,
-                      page: "ConsultationDetails",
-                    });
-                    setShowDoctors(true);
-                  }}
-                  className="btn btn-primary m-1 w-full hover:text-white"
-                >
-                  Doctor Connect
-                </button>
-                {patientData.last_consultation?.id &&
-                  isCameraAttached &&
-                  CameraFeedPermittedUserTypes.includes(authUser.user_type) && (
-                    <Link
-                      href={`/facility/${patientData.facility}/patient/${patientData.id}/consultation/${patientData.last_consultation?.id}/feed`}
-                      className="btn btn-primary m-1 w-full hover:text-white"
-                    >
-                      Camera Feed
-                    </Link>
-                  )}
-              </>
-            )}
-            <Link
-              href={`/facility/${patientData.facility}/patient/${patientData.id}`}
-              className="btn btn-primary m-1 w-full hover:text-white"
-              id="patient-details"
-            >
-              Patient Details
-            </Link>
-            <a
-              id="patient_discussion_notes"
-              onClick={() =>
-                showPatientNotesPopup
-                  ? navigate(
-                      `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/notes`,
-                    )
-                  : setShowPatientNotesPopup(true)
-              }
-              className="btn btn-primary m-1 w-full hover:text-white"
-            >
-              Discussion Notes
-            </a>
-          </div>
-        </nav>
-        <div className="mt-2 flex w-full flex-col md:flex-row">
-          <div className="size-full rounded-lg border bg-white text-black shadow">
-            <PatientInfoCard
-              patient={patientData}
-              abhaNumber={abhaNumberData}
-              consultation={consultationData}
-              fetchPatientData={() => {
-                consultationQuery.refetch();
-                patientDataQuery.refetch();
+        <div>
+          <nav className="relative flex flex-wrap items-start justify-between">
+            <PageTitle
+              title="Patient Dashboard"
+              className="sm:m-0 sm:p-0"
+              crumbsReplacements={{
+                [facilityId]: { name: patientData?.facility_object?.name },
+                [patientId]: { name: patientData?.name },
+                [consultationId]: {
+                  name:
+                    consultationData.suggestion === "A"
+                      ? `Admitted on ${formatDateTime(
+                          consultationData.encounter_date!,
+                        )}`
+                      : consultationData.suggestion_text,
+                },
               }}
-              consultationId={consultationId}
-              activeShiftingData={activeShiftingData}
-              showAbhaProfile={qParams["show-abha-profile"] === "true"}
+              breadcrumbs={true}
+              backUrl="/patients"
             />
+            <div
+              className="flex w-full flex-col min-[1150px]:w-min min-[1150px]:flex-row min-[1150px]:items-center"
+              id="consultationpage-header"
+            >
+              {!consultationData.discharge_date && (
+                <>
+                  <button
+                    id="doctor-connect-button"
+                    onClick={() => {
+                      triggerGoal("Doctor Connect Clicked", {
+                        consultationId,
+                        facilityId: patientData.facility,
+                        userId: authUser.id,
+                        page: "ConsultationDetails",
+                      });
+                      setShowDoctors(true);
+                    }}
+                    className="btn btn-primary m-1 w-full hover:text-white"
+                  >
+                    Doctor Connect
+                  </button>
+                  {patientData.last_consultation?.id &&
+                    isCameraAttached &&
+                    CameraFeedPermittedUserTypes.includes(
+                      authUser.user_type,
+                    ) && (
+                      <Link
+                        href={`/facility/${patientData.facility}/patient/${patientData.id}/consultation/${patientData.last_consultation?.id}/feed`}
+                        className="btn btn-primary m-1 w-full hover:text-white"
+                      >
+                        Camera Feed
+                      </Link>
+                    )}
+                </>
+              )}
+              <Link
+                href={`/facility/${patientData.facility}/patient/${patientData.id}`}
+                className="btn btn-primary m-1 w-full hover:text-white"
+                id="patient-details"
+              >
+                Patient Details
+              </Link>
+              <a
+                id="patient_discussion_notes"
+                onClick={() =>
+                  showPatientNotesPopup
+                    ? navigate(
+                        `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/notes`,
+                      )
+                    : setShowPatientNotesPopup(true)
+                }
+                className="btn btn-primary m-1 w-full hover:text-white"
+              >
+                Discussion Notes
+              </a>
+            </div>
+          </nav>
+          <div className="mt-2 flex w-full flex-col md:flex-row">
+            <div className="size-full rounded-lg border bg-white text-black shadow">
+              <PatientInfoCard
+                patient={patientData}
+                consultation={consultationData}
+                fetchPatientData={() => {
+                  consultationQuery.refetch();
+                  patientDataQuery.refetch();
+                }}
+                consultationId={consultationId}
+                activeShiftingData={activeShiftingData}
+              />
 
-            <div className="flex flex-col justify-between px-4 md:flex-row">
-              {consultationData.admitted_to && (
-                <div className="mt-2 rounded-lg border bg-secondary-100 p-2 md:mt-0">
-                  <div className="border-b-2 py-1">
-                    Patient
-                    {consultationData.discharge_date
-                      ? " Discharged from"
-                      : " Admitted to"}
-                    <span className="badge badge-pill badge-warning ml-2 font-bold">
-                      {consultationData.admitted_to}
-                    </span>
-                  </div>
-                  {(consultationData.discharge_date ??
-                    consultationData.encounter_date) && (
-                    <div className="text-3xl font-bold">
-                      {relativeTime(
-                        consultationData.discharge_date
-                          ? consultationData.discharge_date
-                          : consultationData.encounter_date,
-                      )}
+              <div className="flex flex-col justify-between px-4 md:flex-row">
+                {consultationData.admitted_to && (
+                  <div className="mt-2 rounded-lg border bg-secondary-100 p-2 md:mt-0">
+                    <div className="border-b-2 py-1">
+                      Patient
+                      {consultationData.discharge_date
+                        ? " Discharged from"
+                        : " Admitted to"}
+                      <span className="badge badge-pill badge-warning ml-2 font-bold">
+                        {consultationData.admitted_to}
+                      </span>
+                    </div>
+                    {(consultationData.discharge_date ??
+                      consultationData.encounter_date) && (
+                      <div className="text-3xl font-bold">
+                        {relativeTime(
+                          consultationData.discharge_date
+                            ? consultationData.discharge_date
+                            : consultationData.encounter_date,
+                        )}
+                      </div>
+                    )}
+                    <div className="-mt-2 text-xs">
+                      {consultationData.encounter_date &&
+                        formatDateTime(consultationData.encounter_date)}
+                      {consultationData.discharge_date &&
+                        ` - ${formatDateTime(consultationData.discharge_date)}`}
                     </div>
-                  )}
-                  <div className="-mt-2 text-xs">
-                    {consultationData.encounter_date &&
-                      formatDateTime(consultationData.encounter_date)}
-                    {consultationData.discharge_date &&
-                      ` - ${formatDateTime(consultationData.discharge_date)}`}
                   </div>
-                </div>
-              )}
-            </div>
-            <div className="flex flex-col justify-between gap-2 px-4 py-1 md:flex-row">
-              <div className="font-base flex flex-col text-xs leading-relaxed text-secondary-700">
-                <div className="flex">
-                  <span className="text-secondary-900">Created: </span>&nbsp;
-                  <RelativeDateUserMention
-                    actionDate={consultationData.created_date}
-                    user={consultationData.created_by}
-                    tooltipPosition="right"
-                    withoutSuffix={true}
-                  />
-                </div>
+                )}
               </div>
-              <div className="font-base flex flex-col text-xs leading-relaxed text-secondary-700 md:text-right">
-                <div className="flex">
-                  <span className="text-secondary-900">Last Modified: </span>
-                  &nbsp;
-                  <RelativeDateUserMention
-                    actionDate={consultationData.modified_date}
-                    user={consultationData.last_edited_by}
-                    tooltipPosition="left"
-                    withoutSuffix={true}
-                  />
+              <div className="flex flex-col justify-between gap-2 px-4 py-1 md:flex-row">
+                <div className="font-base flex flex-col text-xs leading-relaxed text-secondary-700">
+                  <div className="flex">
+                    <span className="text-secondary-900">Created: </span>&nbsp;
+                    <RelativeDateUserMention
+                      actionDate={consultationData.created_date}
+                      user={consultationData.created_by}
+                      tooltipPosition="right"
+                      withoutSuffix={true}
+                    />
+                  </div>
+                </div>
+                <div className="font-base flex flex-col text-xs leading-relaxed text-secondary-700 md:text-right">
+                  <div className="flex">
+                    <span className="text-secondary-900">Last Modified: </span>
+                    &nbsp;
+                    <RelativeDateUserMention
+                      actionDate={consultationData.modified_date}
+                      user={consultationData.last_edited_by}
+                      tooltipPosition="left"
+                      withoutSuffix={true}
+                    />
+                  </div>
                 </div>
               </div>
             </div>
           </div>
-        </div>
-        {!!consultationData.diagnoses?.length && (
-          <div className="col-span-1 mt-2 overflow-hidden rounded-lg bg-white shadow">
-            <div className="px-4 py-2">
-              <DiagnosesListAccordion
-                diagnoses={consultationData.diagnoses ?? []}
-              />
+          {!!consultationData.diagnoses?.length && (
+            <div className="col-span-1 mt-2 overflow-hidden rounded-lg bg-white shadow">
+              <div className="px-4 py-2">
+                <DiagnosesListAccordion
+                  diagnoses={consultationData.diagnoses ?? []}
+                />
+              </div>
             </div>
-          </div>
-        )}
-        <div className="mt-4 w-full border-b-2 border-secondary-200">
-          <div className="overflow-x-auto sm:flex sm:items-baseline">
-            <div className="mt-4 sm:mt-0">
-              <nav
-                className="flex space-x-6 overflow-x-auto pb-2 pl-2"
-                id="consultation_tab_nav"
-              >
-                {keysOf(TABS).map((p) => {
-                  if (p === "FEED") {
-                    if (
-                      isCameraAttached === false || // No camera attached
-                      consultationData?.discharge_date || // Discharged
-                      !consultationData?.current_bed?.bed_object?.id || // Not admitted to bed
-                      !CameraFeedPermittedUserTypes.includes(authUser.user_type)
-                    )
-                      return null; // Hide feed tab
-                  }
-
-                  if (p === "ABDM" && !abhaNumberData?.abha_number) {
-                    return null;
-                  }
+          )}
+          <div className="mt-4 w-full border-b-2 border-secondary-200">
+            <div className="overflow-x-auto sm:flex sm:items-baseline">
+              <div className="mt-4 sm:mt-0">
+                <nav
+                  className="flex space-x-6 overflow-x-auto pb-2 pl-2"
+                  id="consultation_tab_nav"
+                >
+                  {keysOf(tabs).map((p) => {
+                    if (p === "FEED") {
+                      if (
+                        isCameraAttached === false || // No camera attached
+                        consultationData?.discharge_date || // Discharged
+                        !consultationData?.current_bed?.bed_object?.id || // Not admitted to bed
+                        !CameraFeedPermittedUserTypes.includes(
+                          authUser.user_type,
+                        )
+                      )
+                        return null; // Hide feed tab
+                    }
 
-                  return (
-                    <Link
-                      key={p}
-                      className={tabButtonClasses(tab === p)}
-                      href={`/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/${p.toLocaleLowerCase()}`}
-                    >
-                      {t(`CONSULTATION_TAB__${p}`)}
-                    </Link>
-                  );
-                })}
-              </nav>
+                    return (
+                      <Link
+                        key={p}
+                        className={tabButtonClasses(tab === p)}
+                        href={`/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/${p.toLocaleLowerCase()}`}
+                      >
+                        {t(`CONSULTATION_TAB__${p}`)}
+                      </Link>
+                    );
+                  })}
+                </nav>
+              </div>
             </div>
           </div>
+          <SelectedTab {...consultationTabProps} />
         </div>
-        <SelectedTab {...consultationTabProps} />
-      </div>
 
-      <DoctorVideoSlideover
-        facilityId={facilityId}
-        show={showDoctors}
-        setShow={setShowDoctors}
-      />
-
-      {showPatientNotesPopup && (
-        <PatientNotesSlideover
-          patientId={patientId}
+        <DoctorVideoSlideover
           facilityId={facilityId}
-          consultationId={consultationId}
-          setShowPatientNotesPopup={setShowPatientNotesPopup}
+          show={showDoctors}
+          setShow={setShowDoctors}
         />
-      )}
-    </div>
+
+        {showPatientNotesPopup && (
+          <PatientNotesSlideover
+            patientId={patientId}
+            facilityId={facilityId}
+            consultationId={consultationId}
+            setShowPatientNotesPopup={setShowPatientNotesPopup}
+          />
+        )}
+      </div>
+    </ConsultationProvider>
   );
 };
diff --git a/src/components/Facility/FacilityConfigure.tsx b/src/components/Facility/FacilityConfigure.tsx
index 78d2edd3058..1cb7c7d69cf 100644
--- a/src/components/Facility/FacilityConfigure.tsx
+++ b/src/components/Facility/FacilityConfigure.tsx
@@ -2,13 +2,13 @@ import { t } from "i18next";
 import { navigate } from "raviger";
 import { useReducer, useState } from "react";
 
-import { ConfigureHealthFacility } from "@/components/ABDM/ConfigureHealthFacility";
 import { Submit } from "@/components/Common/ButtonV2";
 import Loading from "@/components/Common/Loading";
 import Page from "@/components/Common/Page";
 import TextFormField from "@/components/Form/FormFields/TextFormField";
 import { FieldChangeEvent } from "@/components/Form/FormFields/Utils";
 
+import { PLUGIN_Component } from "@/PluginEngine";
 import * as Notification from "@/Utils/Notifications";
 import routes from "@/Utils/request/api";
 import request from "@/Utils/request/request";
@@ -163,7 +163,10 @@ export const FacilityConfigure = (props: IProps) => {
           </form>
         </div>
 
-        <ConfigureHealthFacility facilityId={facilityId} />
+        <PLUGIN_Component
+          __name="ExtendFacilityConfigure"
+          facilityId={facilityId}
+        />
       </div>
     </Page>
   );
diff --git a/src/components/Facility/FacilityHome.tsx b/src/components/Facility/FacilityHome.tsx
index 843b958c67b..02c3f5386cb 100644
--- a/src/components/Facility/FacilityHome.tsx
+++ b/src/components/Facility/FacilityHome.tsx
@@ -38,6 +38,7 @@ import {
   USER_TYPES,
 } from "@/common/constants";
 
+import { PLUGIN_Component } from "@/PluginEngine";
 import { NonReadOnlyUsers } from "@/Utils/AuthorizeFor";
 import * as Notification from "@/Utils/Notifications";
 import { CameraFeedPermittedUserTypes } from "@/Utils/permissions";
@@ -423,13 +424,10 @@ export const FacilityHome = ({ facilityId }: Props) => {
                 >
                   {t("view_users")}
                 </DropdownItem>
-                <DropdownItem
-                  id="view-abdm-records"
-                  onClick={() => navigate(`/facility/${facilityId}/abdm`)}
-                  icon={<CareIcon icon="l-file-network" className="text-lg" />}
-                >
-                  {t("view_abdm_records")}
-                </DropdownItem>
+                <PLUGIN_Component
+                  __name="ManageFacilityOptions"
+                  facility={facilityData}
+                />
                 {hasPermissionToDeleteFacility ? (
                   <DropdownItem
                     id="delete-facility"
diff --git a/src/components/Patient/PatientInfoCard.tsx b/src/components/Patient/PatientInfoCard.tsx
index c0c2eec80ec..544c9585e09 100644
--- a/src/components/Patient/PatientInfoCard.tsx
+++ b/src/components/Patient/PatientInfoCard.tsx
@@ -1,25 +1,11 @@
-import careConfig from "@careConfig";
 import { Field, Label, MenuItem, Switch } from "@headlessui/react";
 import { Link, navigate } from "raviger";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 
-import { cn } from "@/lib/utils.js";
-
 import CareIcon from "@/CAREUI/icons/CareIcon";
 import { AuthorizedForConsultationRelatedActions } from "@/CAREUI/misc/AuthorizedChild";
 
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "@/components/ui/tooltip";
-
-import ABHAProfileModal from "@/components/ABDM/ABHAProfileModal";
-import FetchRecordsModal from "@/components/ABDM/FetchRecordsModal";
-import LinkAbhaNumber from "@/components/ABDM/LinkAbhaNumber/index";
-import { AbhaNumberModel } from "@/components/ABDM/types/abha";
 import ButtonV2 from "@/components/Common/ButtonV2";
 import DialogModal from "@/components/Common/Dialog";
 import DropdownMenu from "@/components/Common/Menu";
@@ -70,23 +56,18 @@ const formatSkills = (arr: SkillModel[]) => {
   return `${skills[0]}, ${skills[1]} and ${skills.length - 2} other skills...`;
 };
 
-export default function PatientInfoCard(props: {
+export interface PatientInfoCardProps {
   patient: PatientModel;
   consultation?: ConsultationModel;
-  abhaNumber?: AbhaNumberModel;
   fetchPatientData?: (state: { aborted: boolean }) => void;
   activeShiftingData: any;
   consultationId: string;
-  showAbhaProfile?: boolean;
-}) {
+}
+
+export default function PatientInfoCard(props: PatientInfoCardProps) {
   const authUser = useAuthUser();
   const { t } = useTranslation();
   const [open, setOpen] = useState(false);
-  const [showLinkABHANumber, setShowLinkABHANumber] = useState(false);
-  const [showABHAProfile, setShowABHAProfile] = useState(
-    !!props.showAbhaProfile,
-  );
-  const [showFetchABDMRecords, setShowFetchABDMRecords] = useState(false);
   const [openDischargeSummaryDialog, setOpenDischargeSummaryDialog] =
     useState(false);
   const [openDischargeDialog, setOpenDischargeDialog] = useState(false);
@@ -149,11 +130,6 @@ export default function PatientInfoCard(props: {
     prefetch: !!consultation?.treating_physician_object?.username,
   });
 
-  const { data: healthFacility } = useQuery(routes.abdm.healthFacility.get, {
-    pathParams: { facility_id: patient.facility ?? "" },
-    silent: true,
-  });
-
   return (
     <>
       <DialogModal
@@ -740,90 +716,6 @@ export default function PatientInfoCard(props: {
                 )}
               </div>
 
-              <div>
-                {careConfig.abdm.enabled &&
-                  (props.abhaNumber ? (
-                    <>
-                      <MenuItem>
-                        {({ close }) => (
-                          <>
-                            <div
-                              className="dropdown-item-primary pointer-events-auto m-2 flex cursor-pointer items-center justify-start gap-2 rounded border-0 p-2 text-sm font-normal transition-all duration-200 ease-in-out"
-                              onClick={() => {
-                                close();
-                                setShowABHAProfile(true);
-                                triggerGoal("Patient Card Button Clicked", {
-                                  buttonName: t("show_abha_profile"),
-                                  consultationId: consultation?.id,
-                                  userId: authUser?.id,
-                                });
-                              }}
-                            >
-                              <CareIcon
-                                icon="l-user-square"
-                                className="text-lg text-primary-500"
-                              />
-                              <span>{t("show_abha_profile")}</span>
-                            </div>
-                            <div
-                              className="dropdown-item-primary pointer-events-auto m-2 flex cursor-pointer items-center justify-start gap-2 rounded border-0 p-2 text-sm font-normal transition-all duration-200 ease-in-out"
-                              onClick={() => {
-                                close();
-                                setShowFetchABDMRecords(true);
-                                triggerGoal("Patient Card Button Clicked", {
-                                  buttonName: t("hi__fetch_records"),
-                                  consultationId: consultation?.id,
-                                  userId: authUser?.id,
-                                });
-                              }}
-                            >
-                              <CareIcon
-                                icon="l-file-network"
-                                className="text-lg text-primary-500"
-                              />
-                              <span>{t("hi__fetch_records")}</span>
-                            </div>
-                          </>
-                        )}
-                      </MenuItem>
-                    </>
-                  ) : (
-                    <TooltipProvider>
-                      <Tooltip>
-                        <TooltipTrigger>
-                          <MenuItem disabled={!healthFacility}>
-                            {({ close, disabled }) => (
-                              <div
-                                className={cn(
-                                  "dropdown-item-primary pointer-events-auto m-2 flex cursor-pointer items-center justify-start gap-2 rounded border-0 p-2 text-sm font-normal transition-all duration-200 ease-in-out",
-                                  disabled && "pointer-events-none opacity-30",
-                                )}
-                                onClick={() => {
-                                  close();
-                                  setShowLinkABHANumber(true);
-                                }}
-                              >
-                                <span className="flex w-full items-center justify-start gap-2">
-                                  <CareIcon
-                                    icon="l-link"
-                                    className="text-lg text-primary-500"
-                                  />
-                                  <p>{t("generate_link_abha")}</p>
-                                </span>
-                              </div>
-                            )}
-                          </MenuItem>
-                        </TooltipTrigger>
-
-                        {!healthFacility && (
-                          <TooltipContent className="max-w-sm break-words text-sm">
-                            {t("abha_disabled_due_to_no_health_facility")}
-                          </TooltipContent>
-                        )}
-                      </Tooltip>
-                    </TooltipProvider>
-                  ))}
-              </div>
               <div>
                 {!consultation?.discharge_date && (
                   <MenuItem>
@@ -966,46 +858,8 @@ export default function PatientInfoCard(props: {
           </div>
         </div>
       </section>
-      <LinkAbhaNumber
-        show={showLinkABHANumber}
-        onClose={() => setShowLinkABHANumber(false)}
-        onSuccess={async (abhaProfile) => {
-          const { res, data } = await request(
-            routes.abdm.healthId.linkAbhaNumberAndPatient,
-            {
-              body: {
-                patient: patient.id,
-                abha_number: abhaProfile.external_id,
-              },
-            },
-          );
-
-          if (res?.status === 200 && data) {
-            Notification.Success({
-              msg: t("abha_number_linked_successfully"),
-            });
 
-            props.fetchPatientData?.({ aborted: false });
-            setShowLinkABHANumber(false);
-            setShowABHAProfile(true);
-          } else {
-            Notification.Error({
-              msg: t("failed_to_link_abha_number"),
-            });
-          }
-        }}
-      />
-      <ABHAProfileModal
-        patientId={patient.id}
-        abha={props.abhaNumber}
-        show={showABHAProfile}
-        onClose={() => setShowABHAProfile(false)}
-      />
-      <FetchRecordsModal
-        abha={props.abhaNumber}
-        show={showFetchABDMRecords}
-        onClose={() => setShowFetchABDMRecords(false)}
-      />
+      <PLUGIN_Component __name="ExtendPatientInfoCard" {...props} />
     </>
   );
 }
diff --git a/src/components/Patient/PatientRegister.tsx b/src/components/Patient/PatientRegister.tsx
index 4dc8b4965bc..5cc958d44de 100644
--- a/src/components/Patient/PatientRegister.tsx
+++ b/src/components/Patient/PatientRegister.tsx
@@ -7,16 +7,6 @@ import { useTranslation } from "react-i18next";
 
 import CareIcon from "@/CAREUI/icons/CareIcon";
 
-import { Button } from "@/components/ui/button";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "@/components/ui/tooltip";
-
-import LinkAbhaNumber from "@/components/ABDM/LinkAbhaNumber/index";
-import { AbhaNumberModel } from "@/components/ABDM/types/abha";
 import AccordionV2 from "@/components/Common/AccordionV2";
 import ButtonV2 from "@/components/Common/ButtonV2";
 import CollapseV2 from "@/components/Common/CollapseV2";
@@ -40,7 +30,6 @@ import {
   RequiredFieldValidator,
 } from "@/components/Form/FieldValidators";
 import Form from "@/components/Form/Form";
-import { FormContextValue } from "@/components/Form/FormContext";
 import AutocompleteFormField from "@/components/Form/FormFields/Autocomplete";
 import CheckBoxFormField from "@/components/Form/FormFields/CheckBoxFormField";
 import DateFormField from "@/components/Form/FormFields/DateFormField";
@@ -80,8 +69,10 @@ import countryList from "@/common/static/countries.json";
 import { statusType, useAbortableEffect } from "@/common/utils";
 import { validatePincode } from "@/common/validation";
 
+import { PLUGIN_Component } from "@/PluginEngine";
 import { RestoreDraftButton } from "@/Utils/AutoSave";
 import * as Notification from "@/Utils/Notifications";
+import { usePubSub } from "@/Utils/pubsubContext";
 import routes from "@/Utils/request/api";
 import request from "@/Utils/request/request";
 import useQuery from "@/Utils/request/useQuery";
@@ -94,7 +85,7 @@ import {
   scrollTo,
 } from "@/Utils/utils";
 
-type PatientForm = PatientModel &
+export type PatientForm = PatientModel &
   PatientMeta & { age?: number; is_postpartum?: boolean };
 
 interface PatientRegisterProps extends PatientModel {
@@ -156,7 +147,6 @@ const initForm: any = {
   number_of_doses: "0",
   vaccine_name: null,
   last_vaccinated_date: null,
-  abha_number: null,
   ...medicalHistoryChoices,
   ration_card_category: null,
 };
@@ -226,7 +216,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
     patientList: Array<DupPatientModel>;
   }>({ patientList: [] });
   const [patientName, setPatientName] = useState("");
-  const [showLinkAbhaNumberModal, setShowLinkAbhaNumberModal] = useState(false);
   const [showAutoFilledPincode, setShowAutoFilledPincode] = useState(false);
   const [insuranceDetails, setInsuranceDetails] = useState<HCXPolicyModel[]>(
     [],
@@ -236,6 +225,8 @@ export const PatientRegister = (props: PatientRegisterProps) => {
   const [insuranceDetailsError, setInsuranceDetailsError] =
     useState<FieldError>();
 
+  const { publish } = usePubSub();
+
   const headerText = !id ? "Add Details of Patient" : "Update Patient Details";
   const buttonText = !id ? "Add Patient" : "Save Details";
 
@@ -287,13 +278,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
       const { res, data } = await request(routes.getPatient, {
         pathParams: { id: id ? id : 0 },
       });
-      const { data: abhaNumberData } = await request(
-        routes.abdm.abhaNumber.get,
-        {
-          pathParams: { abhaNumberId: id ?? "" },
-          silent: true,
-        },
-      );
 
       if (!status.aborted) {
         if (res?.ok && data) {
@@ -306,8 +290,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
             age: data.year_of_birth
               ? new Date().getFullYear() - data.year_of_birth
               : "",
-            health_id_number: abhaNumberData?.abha_number || "",
-            health_id: abhaNumberData?.health_id || "",
             nationality: data.nationality ? data.nationality : "India",
             gender: data.gender ? data.gender : undefined,
             state: data.state ? data.state : "",
@@ -392,11 +374,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
     [id],
   );
 
-  const { data: healthFacility } = useQuery(routes.abdm.healthFacility.get, {
-    pathParams: { facility_id: facilityId },
-    silent: true,
-  });
-
   useQuery(routes.hcx.policies.list, {
     query: {
       patient: id,
@@ -708,27 +685,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
           controllerRef: submitController,
         });
     if (res?.ok && requestData) {
-      if (state.form.abha_number) {
-        const { res, data } = await request(
-          routes.abdm.healthId.linkAbhaNumberAndPatient,
-          {
-            body: {
-              patient: requestData.id,
-              abha_number: state.form.abha_number,
-            },
-          },
-        );
-
-        if (res?.status === 200 && data) {
-          Notification.Success({
-            msg: t("abha_number_linked_successfully"),
-          });
-        } else {
-          Notification.Error({
-            msg: t("failed_to_link_abha_number"),
-          });
-        }
-      }
+      publish("patient:upsert", requestData);
 
       await Promise.all(
         insuranceDetails.map(async (obj) => {
@@ -769,68 +726,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
     setIsLoading(false);
   };
 
-  const populateAbhaValues = (
-    abhaProfile: AbhaNumberModel,
-    field: FormContextValue<PatientForm>,
-  ) => {
-    const values = {
-      abha_number: abhaProfile.external_id,
-      health_id_number: abhaProfile.abha_number,
-      health_id: abhaProfile.health_id,
-    };
-
-    if (abhaProfile.name)
-      field("name").onChange({
-        name: "name",
-        value: abhaProfile.name,
-      });
-
-    if (abhaProfile.mobile) {
-      field("phone_number").onChange({
-        name: "phone_number",
-        value: parsePhoneNumber(abhaProfile.mobile, "IN"),
-      });
-
-      field("emergency_phone_number").onChange({
-        name: "emergency_phone_number",
-        value: parsePhoneNumber(abhaProfile.mobile, "IN"),
-      });
-    }
-
-    if (abhaProfile.gender)
-      field("gender").onChange({
-        name: "gender",
-        value: { M: "1", F: "2", O: "3" }[abhaProfile.gender],
-      });
-
-    if (abhaProfile.date_of_birth)
-      field("date_of_birth").onChange({
-        name: "date_of_birth",
-        value: new Date(abhaProfile.date_of_birth),
-      });
-
-    if (abhaProfile.pincode)
-      field("pincode").onChange({
-        name: "pincode",
-        value: abhaProfile.pincode,
-      });
-
-    if (abhaProfile.address) {
-      field("address").onChange({
-        name: "address",
-        value: abhaProfile.address,
-      });
-
-      field("permanent_address").onChange({
-        name: "permanent_address",
-        value: abhaProfile.address,
-      });
-    }
-
-    dispatch({ type: "set_form", form: { ...state.form, ...values } });
-    setShowLinkAbhaNumberModal(false);
-  };
-
   const handleMedicalCheckboxChange = (e: any, id: number, field: any) => {
     const values = field("medical_history").value ?? [];
     if (e.value) {
@@ -1038,32 +933,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
                   result in duplication of patient records.
                 </p>
               </div>
-              {!state.form.abha_number && (
-                <div className="flex justify-center md:justify-end">
-                  <TooltipProvider>
-                    <Tooltip>
-                      <TooltipTrigger>
-                        <Button
-                          variant="outline_primary"
-                          disabled={!healthFacility}
-                          onClick={(e) => {
-                            e.preventDefault();
-                            setShowLinkAbhaNumberModal(true);
-                          }}
-                        >
-                          <CareIcon icon="l-user-square" className="mr-2" />
-                          <span>{t("generate_link_abha")}</span>
-                        </Button>
-                      </TooltipTrigger>
-                      {!healthFacility && (
-                        <TooltipContent className="max-w-sm break-words text-sm">
-                          {t("abha_disabled_due_to_no_health_facility")}
-                        </TooltipContent>
-                      )}
-                    </Tooltip>
-                  </TooltipProvider>
-                </div>
-              )}
               {showAlertMessage.show && (
                 <ConfirmDialog
                   title={showAlertMessage.title}
@@ -1075,59 +944,14 @@ export const PatientRegister = (props: PatientRegisterProps) => {
                   show
                 />
               )}
-              {careConfig.abdm.enabled && (
-                <div className="mb-8 overflow-visible">
-                  {showLinkAbhaNumberModal && (
-                    <LinkAbhaNumber
-                      show={showLinkAbhaNumberModal}
-                      onClose={() => setShowLinkAbhaNumberModal(false)}
-                      onSuccess={(data) => {
-                        if (id) {
-                          Notification.Warn({
-                            msg: "To link Abha Number, please save the patient details",
-                          });
-                        }
-
-                        populateAbhaValues(data, field);
-                      }}
-                    />
-                  )}
-                  {state.form.abha_number && (
-                    <div className="grid grid-cols-1 gap-4 md:grid-cols-2 xl:gap-x-20 xl:gap-y-6">
-                      <div id="abha-number">
-                        <TextFormField
-                          id="abha-number"
-                          name="abha-number"
-                          label="ABHA Number"
-                          type="text"
-                          value={state.form.health_id_number}
-                          onChange={() => null}
-                          disabled={true}
-                          error=""
-                        />
-                      </div>
-                      <div id="health-id">
-                        {state.form.health_id ? (
-                          <TextFormField
-                            id="health-id"
-                            name="health-id"
-                            label="Abha Address"
-                            type="text"
-                            value={state.form.health_id}
-                            onChange={() => null}
-                            disabled={true}
-                            error=""
-                          />
-                        ) : (
-                          <div className="mt-4 text-sm text-secondary-500">
-                            No Abha Address Associated with this ABHA Number
-                          </div>
-                        )}
-                      </div>
-                    </div>
-                  )}
-                </div>
-              )}
+              <PLUGIN_Component
+                __name="ExtendPatientRegisterForm"
+                facilityId={facilityId}
+                patientId={id}
+                state={state}
+                dispatch={dispatch}
+                field={field}
+              />
               <div className="mb-8 overflow-visible">
                 <h1 className="mb-4 text-left text-xl font-bold text-purple-500">
                   Personal Details
diff --git a/src/components/Users/UserAdd.tsx b/src/components/Users/UserAdd.tsx
index b9f5d5fda7c..4c6c5edde2a 100644
--- a/src/components/Users/UserAdd.tsx
+++ b/src/components/Users/UserAdd.tsx
@@ -150,7 +150,7 @@ const getDate = (value: any) =>
 export const validateRule = (
   condition: boolean,
   content: JSX.Element | string,
-  isInitialState: boolean,
+  isInitialState: boolean = false,
 ) => {
   return (
     <div>
diff --git a/src/hooks/useCareApps.ts b/src/hooks/useCareApps.ts
index 5d0de6f3b9f..6870736861a 100644
--- a/src/hooks/useCareApps.ts
+++ b/src/hooks/useCareApps.ts
@@ -24,6 +24,14 @@ export const useCareAppNavItems = () => {
   return navItems;
 };
 
+export const useCareAppConsultationTabs = () => {
+  const careApps = useCareApps();
+
+  return careApps.reduce((acc, app) => {
+    return { ...acc, ...(app.consultationTabs ?? {}) };
+  }, {});
+};
+
 // If required; Reduce plugin.routes to a single pluginRoutes object of type Record<string, () => JSX.Element>
 export function usePluginRoutes() {
   const careApps = useCareApps();
diff --git a/src/pluginTypes.ts b/src/pluginTypes.ts
index 13886b5b7d5..6a10784926e 100644
--- a/src/pluginTypes.ts
+++ b/src/pluginTypes.ts
@@ -1,12 +1,16 @@
 import { LazyExoticComponent } from "react";
 
 import { INavItem } from "@/components/Common/Sidebar/Sidebar";
-import { ConsultationModel } from "@/components/Facility/models";
-import { PatientModel } from "@/components/Patient/models";
+import { ConsultationModel, FacilityModel } from "@/components/Facility/models";
 import { UserAssignedModel } from "@/components/Users/models";
 
-import { AppRoutes } from "@/Routers/AppRouter";
-import { pluginMap } from "@/pluginMap";
+import { AppRoutes } from "./Routers/AppRouter";
+import { ConsultationTabProps } from "./components/Facility/ConsultationDetails";
+import { FormContextValue } from "./components/Form/FormContext";
+import { PatientInfoCardProps } from "./components/Patient/PatientInfoCard";
+import { PatientForm } from "./components/Patient/PatientRegister";
+import { PatientModel } from "./components/Patient/models";
+import { pluginMap } from "./pluginMap";
 
 // Define the available plugins
 export type AvailablePlugin = "@apps/care_livekit_fe" | "@apps/care_hcx_fe";
@@ -19,6 +23,8 @@ export type DoctorConnectButtonComponentType = React.FC<{
   user: UserAssignedModel;
 }>;
 
+export type ExtendPatientInfoCardComponentType = React.FC<PatientInfoCardProps>;
+
 export type ManagePatientOptionsComponentType = React.FC<{
   consultation: ConsultationModel | undefined;
   patient: PatientModel;
@@ -28,11 +34,39 @@ export type AdditionalDischargeProceduresComponentType = React.FC<{
   consultation: ConsultationModel;
 }>;
 
+export type ManageFacilityOptionsComponentType = React.FC<{
+  facility?: FacilityModel;
+}>;
+
+export type ExtendFacilityConfigureComponentType = React.FC<{
+  facilityId: string;
+}>;
+
+export type ExtendPatientRegisterFormComponentType = React.FC<{
+  facilityId: string;
+  patientId?: string;
+  state: {
+    form: {
+      [key: string]: any;
+    };
+    errors: {
+      [key: string]: string;
+    };
+  };
+  dispatch: React.Dispatch<any>;
+  field: FormContextValue<PatientForm>;
+}>;
+
 // Define supported plugin components
 export type SupportedPluginComponents = {
   DoctorConnectButtons: DoctorConnectButtonComponentType;
+  ExtendPatientInfoCard: ExtendPatientInfoCardComponentType;
   ManagePatientOptions: ManagePatientOptionsComponentType;
   AdditionalDischargeProcedures: AdditionalDischargeProceduresComponentType;
+  ManageFacilityOptions: ManageFacilityOptionsComponentType;
+  ConsultationContextEnabler: React.FC;
+  ExtendFacilityConfigure: ExtendFacilityConfigureComponentType;
+  ExtendPatientRegisterForm: ExtendPatientRegisterFormComponentType;
 };
 
 // Create a type for lazy-loaded components
@@ -56,6 +90,10 @@ export type PluginManifest = {
   extends: SupportedPluginExtensions[];
   components: PluginComponentMap;
   navItems: INavItem[];
+  consultationTabs?: Record<
+    string,
+    LazyComponent<React.FC<ConsultationTabProps>>
+  >;
 };
 
 // Create a type that ensures only available plugins can be used