diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/Module.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/Module.js
index 224c2bab5c7..89a3c012ed9 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/Module.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/Module.js
@@ -1,5 +1,5 @@
 import { Loader, TourProvider } from "@egovernments/digit-ui-react-components";
-import React from "react";
+import React, { useState, useEffect } from "react";
 import { useRouteMatch } from "react-router-dom";
 import EmployeeApp from "./pages/employee";
 import { CustomisedHooks } from "./hooks";
@@ -68,27 +68,29 @@ export const CONSOLE_MDMS_MODULENAME = "HCM-ADMIN-CONSOLE";
  */
 const CampaignModule = ({ stateCode, userType, tenants }) => {
   const tenantId = Digit.ULBService.getCurrentTenantId();
-  const { data: BOUNDARY_HIERARCHY_TYPE, isLoading: hierarchyLoading } = Digit.Hooks.useCustomMDMS(
-    tenantId,
-    CONSOLE_MDMS_MODULENAME,
-    [
-      {
-        name: "HierarchySchema",
-        filter: `[?(@.type=='${window.Digit.Utils.campaign.getModuleName()}')]`,
-      },
-    ],
-    {
-      select: (data) => {
-        return data?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.[0]?.hierarchy;
-      },
-    },
-    { schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` }
-  );
+  const [filteredHierarchyType, setFilteredHierarchyType] = useState(null);
+  const [employeeData, setEmployeeData] = useState(null);
+  const [loading, setLoading] = useState(true);
+
+  // Using the new custom hook
+  const { 
+    data: BOUNDARY_HIERARCHY_TYPE, 
+    isLoading: hierarchyLoading,
+    rawData: hierarchyData 
+  } = Digit.Hooks.campaign.useEmployeeHierarchyType(tenantId, {
+    select: (data) => data?.hierarchy
+  });
+
+  const hierarchyRelationData = Digit.Hooks.campaign.useBoundaryRelationshipSearch({ 
+    BOUNDARY_HIERARCHY_TYPE, 
+    tenantId 
+  });
 
-  const hierarchyData = Digit.Hooks.campaign.useBoundaryRelationshipSearch({ BOUNDARY_HIERARCHY_TYPE, tenantId });
   const modulePrefix = "hcm";
+  const moduleCode = BOUNDARY_HIERARCHY_TYPE 
+    ? [`boundary-${BOUNDARY_HIERARCHY_TYPE}`] 
+    : ["campaignmanager", "schema", "admin-schemas", "checklist", "appconfiguration"];
 
-  const moduleCode = BOUNDARY_HIERARCHY_TYPE ? [`boundary-${BOUNDARY_HIERARCHY_TYPE}`] : ["campaignmanager", "schema", "admin-schemas", "checklist", "appconfiguration"];
 
   const { path, url } = useRouteMatch();
   const language = Digit.StoreData.getCurrentLanguage();
@@ -112,7 +114,13 @@ const CampaignModule = ({ stateCode, userType, tenants }) => {
           stateCode={stateCode}
           url={url}
           userType={userType}
-          hierarchyData={hierarchyData}
+          hierarchyData={hierarchyRelationData}
+          employeeDetails={hierarchyData?.employee}
+          allHierarchy={{
+            [CONSOLE_MDMS_MODULENAME]: {
+              HierarchySchema: hierarchyData?.allHierarchies
+            }
+          }}
         />
       </TourProvider>
     </ErrorBoundary>
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignType.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignType.js
index 0962132ce89..2992f67ac83 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignType.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/CampaignType.js
@@ -1,8 +1,8 @@
 import React, { useState, useMemo, useRef, useEffect, Fragment } from "react";
 import { Header } from "@egovernments/digit-ui-react-components";
 import { useTranslation } from "react-i18next";
-import { InfoCard, LabelFieldPair } from "@egovernments/digit-ui-components";
-import { Button, CardText, Dropdown, ErrorMessage, PopUp, Stepper, TextBlock , Card} from "@egovernments/digit-ui-components";
+import { InfoCard, LabelFieldPair, Toast } from "@egovernments/digit-ui-components";
+import { Button, CardText, Dropdown, ErrorMessage, PopUp, Stepper, TextBlock , Card, Loader} from "@egovernments/digit-ui-components";
 
 const CampaignSelection = ({ onSelect, formData, formState, ...props }) => {
   const { t } = useTranslation();
@@ -20,10 +20,27 @@ const CampaignSelection = ({ onSelect, formData, formState, ...props }) => {
   const [currentStep , setCurrentStep] = useState(1);
   const currentKey = searchParams.get("key");
   const source = searchParams.get("source");
+  const [showToast, setShowToast] = useState(false);
   const [key, setKey] = useState(() => {
     const keyParam = searchParams.get("key");
     return keyParam ? parseInt(keyParam) : 1;
   });
+  const [loading, setLoading] = useState(true);
+
+  const { 
+    data: BOUNDARY_HIERARCHY_TYPE, 
+    isLoading: hierarchyLoading,
+    rawData: rawData
+  } = Digit.Hooks.campaign.useEmployeeHierarchyType(tenantId, {
+    select: (data) => data?.hierarchy
+  });
+
+  const employeeDetails = useMemo(() => {
+    return rawData?.employee;
+  }, [rawData]);
+  const hierarchies = useMemo(()=>{
+    return rawData?.allHierarchies;
+  }, [rawData])
 
   function updateUrlParams(params) {
     const url = new URL(window.location.href);
@@ -33,6 +50,68 @@ const CampaignSelection = ({ onSelect, formData, formState, ...props }) => {
     window.history.replaceState({}, "", url);
   }
 
+  const [filteredProjectTypes, setFilteredProjectTypes] = useState([]);
+  const getGroupsFromMatchingHierarchies = (employeeDetails, hierarchies) => {
+    if (!employeeDetails?.assignments || !hierarchies?.length) {
+      return [];
+    }
+
+    // Get employee departments from assignments
+    const employeeDepartments = new Set(
+      employeeDetails.assignments
+        .filter(assignment => assignment.department)
+        .map(assignment => assignment.department.toUpperCase())
+    );
+
+    // Filter hierarchies where employee department matches hierarchy department
+    const matchingHierarchies = hierarchies.filter(hierarchy => {
+      // Handle both single department and array of departments
+      const hierarchyDepartments = Array.isArray(hierarchy?.department) 
+        ? hierarchy?.department 
+        : [hierarchy?.department];
+            
+      // Check if any of the hierarchy departments match any employee departments
+      return hierarchyDepartments.some(dept => 
+        employeeDepartments.has(dept?.toUpperCase())
+      );
+    });
+
+    // Extract unique groups from matching hierarchies
+    const groups = new Set(
+      matchingHierarchies
+        .filter(hierarchy => hierarchy.group)
+        .flatMap(hierarchy => hierarchy.group)
+    );
+    return Array.from(groups);
+    // return [ "POLIO"];
+  };
+
+  // Updated function to filter project types
+  const filterProjectTypesByHierarchy = (employeeDetails, hierarchies, allProjectTypes) => {
+    if (!allProjectTypes?.["HCM-PROJECT-TYPES"]?.projectTypes) {
+      return [];
+    }
+
+    // Get groups from matching hierarchies
+    const validGroups = getGroupsFromMatchingHierarchies(employeeDetails, hierarchies);
+
+    // Filter project types based on valid groups
+    return allProjectTypes["HCM-PROJECT-TYPES"].projectTypes.filter(project => {
+      if (!project.group) return false;
+      return validGroups.includes(project.group);
+    });
+  };
+
+  // Usage in your component
+  useEffect(() => {
+    if (employeeDetails && projectType && hierarchies) {
+      const filtered = filterProjectTypesByHierarchy(employeeDetails, hierarchies, projectType);
+      setLoading(false);
+      setFilteredProjectTypes(filtered);
+      if(!filtered) setShowToast(true);
+    }
+  }, [employeeDetails, projectType, hierarchies]);
+
   useEffect(() => {
     if (props?.props?.isSubmitting && !type) {
       setError({ message: "CAMPAIGN_FIELD_MANDATORY" });
@@ -92,127 +171,139 @@ const CampaignSelection = ({ onSelect, formData, formState, ...props }) => {
 
   return (
     <>
-      <div className="container">
-        <div className="card-container" >
-          <Card className="card-header-timeline" >
-            <TextBlock subHeader={t("HCM_CAMPAIGN_DETAILS")} subHeaderClassName={"stepper-subheader"} wrapperClassName={"stepper-wrapper"} />
-          </Card>
-          <Card className="stepper-card">
-            <Stepper
-              customSteps={["HCM_CAMPAIGN_TYPE","HCM_CAMPAIGN_NAME",  "HCM_CAMPAIGN_DATE" , "HCM_SUMMARY"]}
-              currentStep={currentStep }
-              onStepClick={onStepClick}
-              direction={"vertical"}
-            />
-          </Card>
-        </div>
+      {loading && <Loader />}
+      {!loading && (
+        <div className="container">
+          <div className="card-container">
+            <Card className="card-header-timeline">
+              <TextBlock 
+                subHeader={t("HCM_CAMPAIGN_DETAILS")} 
+                subHeaderClassName={"stepper-subheader"} 
+                wrapperClassName={"stepper-wrapper"} 
+              />
+            </Card>
+            <Card className="stepper-card">
+              <Stepper
+                customSteps={["HCM_CAMPAIGN_TYPE", "HCM_CAMPAIGN_NAME", "HCM_CAMPAIGN_DATE", "HCM_SUMMARY"]}
+                currentStep={currentStep}
+                onStepClick={onStepClick}
+                direction={"vertical"}
+              />
+            </Card>
+          </div>
 
-        <div className="card-container2">
-          <Card className = "setup-campaign-card">
-            <Header styles={{ margin: '0px' }}>{t(`HCM_CAMPAIGN_TYPE_HEADER`)}</Header>
-            <p className="description-type">{t(`HCM_CAMPAIGN_TYPE_DESCRIPTION`)}</p>
-            <LabelFieldPair style={{ display: "flex", marginBottom:"-0.8rem" }}>
-              <div className="campaign-type">
-                <span>{`${t("HCM_CAMPAIGN_TYPE")}`}</span>
-                <span className="mandatory-span">*</span>
-              </div>
-              <div
-                className="campaign-type-wrapper"
-                onClick={(e) => {
-                  if (props?.props?.sessionData?.HCM_CAMPAIGN_TYPE?.projectType && !canUpdate && source!=="microplan") {
-                    setShowPopUp(true);
+          <div className="card-container2">
+            <Card className="setup-campaign-card">
+              <Header styles={{ margin: '0px' }}>{t(`HCM_CAMPAIGN_TYPE_HEADER`)}</Header>
+              <p className="description-type">{t(`HCM_CAMPAIGN_TYPE_DESCRIPTION`)}</p>
+              <LabelFieldPair style={{ display: "flex", marginBottom: "-0.8rem" }}>
+                <div className="campaign-type">
+                  <span>{`${t("HCM_CAMPAIGN_TYPE")}`}</span>
+                  <span className="mandatory-span">*</span>
+                </div>
+                <div
+                  className="campaign-type-wrapper"
+                  onClick={(e) => {
+                    if (props?.props?.sessionData?.HCM_CAMPAIGN_TYPE?.projectType && !canUpdate && source !== "microplan") {
+                      setShowPopUp(true);
+                      return;
+                    }
                     return;
-                  }
-                  return;
-                }}
-                onFocus={(e) => {
-                  if (props?.props?.sessionData?.HCM_CAMPAIGN_TYPE?.projectType && !canUpdate) {
-                    setShowPopUp(true);
+                  }}
+                  onFocus={(e) => {
+                    if (props?.props?.sessionData?.HCM_CAMPAIGN_TYPE?.projectType && !canUpdate) {
+                      setShowPopUp(true);
+                      return;
+                    }
                     return;
-                  }
-                  return;
-                }}
-              >
-                <Dropdown
-                  style={!showBeneficiary ? { width: "40rem", paddingBottom: 0, marginBottom: 0 } : { width: "40rem", paddingBottom: "1rem" }}
-                  variant={error ? "error" : ""}
-                  t={t}
-                  option={projectType?.["HCM-PROJECT-TYPES"]?.projectTypes}
-                  optionKey={"code"}
-                  selected={type}
-                  select={(value) => {
-                    setStartValidation(true);
-                    handleChange(value);
                   }}
-                  disabled = {source === "microplan"}
-                  
-                />
-                {error?.message && <ErrorMessage message={t(error?.message)} showIcon={true} />}
-              </div>
-            </LabelFieldPair>
-            {showBeneficiary && (
-              <LabelFieldPair style={{ alignItems: "center" , display: "flex" , marginBottom: "0rem" }} >
-                <div className="beneficiary-type">{`${t("HCM_BENEFICIARY_TYPE")}`}</div>
-                <div>{t(`CAMPAIGN_TYPE_${beneficiaryType}`)}</div>
+                >
+                  <Dropdown
+                    style={!showBeneficiary ? { width: "40rem", paddingBottom: 0, marginBottom: 0 } : { width: "40rem", paddingBottom: "1rem" }}
+                    variant={error ? "error" : ""}
+                    t={t}
+                    option={filteredProjectTypes}
+                    optionKey={"code"}
+                    selected={type}
+                    select={(value) => {
+                      setStartValidation(true);
+                      handleChange(value);
+                    }}
+                    disabled={source === "microplan"}
+                  />
+                  {error?.message && <ErrorMessage message={t(error?.message)} showIcon={true} />}
+                </div>
               </LabelFieldPair>
-            )}
-          </Card>
-           <InfoCard
-                        populators={{
-                          name: "infocard",
-                        }}
-                        variant="info"
-                        text={t("HCM_UPDATE_CAMPAIGN_TYPE_INFO")}
-                        style={{ marginTop: "1rem", maxWidth: "100%" }}
-                      />
+              {showBeneficiary && (
+                <LabelFieldPair style={{ alignItems: "center", display: "flex", marginBottom: "0rem" }}>
+                  <div className="beneficiary-type">{`${t("HCM_BENEFICIARY_TYPE")}`}</div>
+                  <div>{t(`CAMPAIGN_TYPE_${beneficiaryType}`)}</div>
+                </LabelFieldPair>
+              )}
+            </Card>
+            <InfoCard
+              populators={{
+                name: "infocard",
+              }}
+              variant="info"
+              text={t("HCM_UPDATE_CAMPAIGN_TYPE_INFO")}
+              style={{ marginTop: "1rem", maxWidth: "100%" }}
+            />
+          </div>
+
+          {showPopUp && (
+            <PopUp
+              className={"boundaries-pop-module"}
+              type={"default"}
+              heading={t("ES_CAMPAIGN_UPDATE_TYPE_MODAL_HEADER")}
+              children={[
+                <div>
+                  <CardText style={{ margin: 0 }}>{t("ES_CAMPAIGN_UPDATE_TYPE_MODAL_TEXT") + " "}</CardText>
+                </div>,
+              ]}
+              onOverlayClick={() => {
+                setShowPopUp(false);
+              }}
+              onClose={() => {
+                setShowPopUp(false);
+              }}
+              footerChildren={[
+                <Button
+                  className={"campaign-type-alert-button"}
+                  type={"button"}
+                  size={"large"}
+                  variation={"secondary"}
+                  label={t("ES_CAMPAIGN_BOUNDARY_MODAL_BACK")}
+                  onClick={() => {
+                    setShowPopUp(false);
+                    setCanUpdate(true);
+                  }}
+                />,
+                <Button
+                  className={"campaign-type-alert-button"}
+                  type={"button"}
+                  size={"large"}
+                  variation={"primary"}
+                  label={t("ES_CAMPAIGN_BOUNDARY_MODAL_SUBMIT")}
+                  onClick={() => {
+                    setShowPopUp(false);
+                    setCanUpdate(false);
+                  }}
+                />,
+              ]}
+              sortFooterChildren={true}
+            />
+          )}
         </div>
-        {showPopUp && (
-          <PopUp
-            className={"boundaries-pop-module"}
-            type={"default"}
-            heading={t("ES_CAMPAIGN_UPDATE_TYPE_MODAL_HEADER")}
-            children={[
-              <div>
-                <CardText style={{ margin: 0 }}>{t("ES_CAMPAIGN_UPDATE_TYPE_MODAL_TEXT") + " "}</CardText>
-              </div>,
-            ]}
-            onOverlayClick={() => {
-              setShowPopUp(false);
-            }}
-            onClose={() => {
-              setShowPopUp(false);
-            }}
-            footerChildren={[
-              <Button
-                className={"campaign-type-alert-button"}
-                type={"button"}
-                size={"large"}
-                variation={"secondary"}
-                label={t("ES_CAMPAIGN_BOUNDARY_MODAL_BACK")}
-                onClick={() => {
-                  setShowPopUp(false);
-                  setCanUpdate(true);
-                }}
-              />,
-              <Button
-                className={"campaign-type-alert-button"}
-                type={"button"}
-                size={"large"}
-                variation={"primary"}
-                label={t("ES_CAMPAIGN_BOUNDARY_MODAL_SUBMIT")}
-                onClick={() => {
-                  setShowPopUp(false);
-                  setCanUpdate(false);
-                }}
-              />,
-            ]}
-            sortFooterChildren={true}
-          ></PopUp>
-        )}
-      </div>
+      )}
+      {!loading && showToast && 
+        <Toast
+        type="error"
+        label={t("BOUNDARY_USER_NOT ASSIGNED_TO_ANY_BOUNDARY_WITH_HIS_DEPARTMENT")}
+      />
+      }
     </>
-
   );
 };
 
-export default CampaignSelection;
+export default CampaignSelection;
\ No newline at end of file
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js
index eb07c878b63..df57e61b51d 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundariesDuplicate.js
@@ -3,7 +3,7 @@ import { CardText,  Header } from "@egovernments/digit-ui-react-components";
 import { useTranslation } from "react-i18next";
 import { useLocation, useHistory } from "react-router-dom";
 import { Wrapper } from "./SelectingBoundaryComponent";
-import { InfoCard, PopUp, Stepper, TextBlock,Tag , Card} from "@egovernments/digit-ui-components";
+import { InfoCard, PopUp, Stepper, TextBlock,Tag , Card, Loader} from "@egovernments/digit-ui-components";
 import { CONSOLE_MDMS_MODULENAME } from "../Module";
 import TagComponent from "./TagComponent";
 
@@ -11,15 +11,60 @@ const SelectingBoundariesDuplicate = ({ onSelect, formData, ...props }) => {
   const { t } = useTranslation();
   const tenantId = Digit.ULBService.getStateId();
   const searchParams = new URLSearchParams(location.search);
-  const hierarchyType = props?.props?.dataParams?.hierarchyType;
-  const { data: HierarchySchema } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{ 
-    name: "HierarchySchema",
-    "filter": `[?(@.type=='${window.Digit.Utils.campaign.getModuleName()}')]`
-   }],{select:(MdmsRes)=>MdmsRes},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` });
-  const { data: mailConfig } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{ name: "mailConfig" }],{select:(MdmsRes)=>MdmsRes},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.mailConfig` });
+  // const hierarchyType = props?.props?.dataParams?.hierarchyType;
+  const employee = props?.props?.employeeDetails?.Employees?.[0];
+  const hierarchies = props?.props?.allHierarchy?.MdmsRes?.["HCM-ADMIN-CONSOLE"]?.HierarchySchema || [];
+  // const { data: HierarchySchema } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{ 
+  //   name: "HierarchySchema",
+  //   "filter": `[?(@.type=='${window.Digit.Utils.campaign.getModuleName()}')]`
+  //  }],{select:(MdmsRes)=>MdmsRes},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` });
+  
+  const { 
+    data: BOUNDARY_HIERARCHY_TYPE, 
+    isLoading: hierarchyLoading,
+    rawData: rawData
+  } = Digit.Hooks.campaign.useEmployeeHierarchyType(tenantId, {
+    select: (data) => data?.hierarchy
+  });
   const lowestHierarchy = useMemo(() => {
-    return HierarchySchema?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.[0]?.lowestHierarchy;
-  }, [HierarchySchema]);
+    return rawData?.matchingHierarchy?.lowestHierarchy;
+  }, [rawData]);
+  const hierarchyType = useMemo(()=>{
+    return BOUNDARY_HIERARCHY_TYPE;
+  }, [BOUNDARY_HIERARCHY_TYPE])
+
+  
+  const [boundaryHierarchyData, setBoundaryHierarchyData] = useState(null);
+  const [loading, setLoading] = useState(true);
+
+  useEffect(() => {
+    if(!hierarchyType) return null;
+    const fetchBoundaryHierarchy = async () => { 
+      try {
+        const response = await Digit.CustomService.getResponse({
+          url: '/boundary-service/boundary-relationships/_search',
+          params: {
+            tenantId: tenantId,
+            hierarchyType: hierarchyType,
+            includeChildren: true
+          },
+          body: {},
+        });
+  
+        const boundaryData = response?.TenantBoundary?.[0]?.boundary;
+        setBoundaryHierarchyData(boundaryData);
+        setLoading(false);
+
+      } catch (error) {
+        console.error("Error fetching boundary hierarchy:", error);
+      }
+    };
+  
+    fetchBoundaryHierarchy();
+  }, [hierarchyType]);
+  
+  const { data: mailConfig } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{ name: "mailConfig" }],{select:(MdmsRes)=>MdmsRes},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.mailConfig` });
+
   const [selectedData, setSelectedData] = useState(props?.props?.sessionData?.HCM_CAMPAIGN_SELECTING_BOUNDARY_DATA?.boundaryType?.selectedData || []);
   const [boundaryOptions, setBoundaryOptions] = useState(
     props?.props?.sessionData?.HCM_CAMPAIGN_SELECTING_BOUNDARY_DATA?.boundaryType?.boundaryData || {}
@@ -47,7 +92,7 @@ const SelectingBoundariesDuplicate = ({ onSelect, formData, ...props }) => {
   };
 
   useEffect(() => {
-    onSelect("boundaryType", { selectedData: selectedData, boundaryData: boundaryOptions ,  updateBoundary: !restrictSelection});
+    onSelect("boundaryType", { selectedData: selectedData, boundaryData: boundaryOptions ,  updateBoundary: !restrictSelection });
   }, [selectedData, boundaryOptions , restrictSelection]);
 
   useEffect(() => {
@@ -102,53 +147,56 @@ const SelectingBoundariesDuplicate = ({ onSelect, formData, ...props }) => {
 
   return (
     <>
-      <div className="container-full">
-        <div className="card-container">
-          <Card className="card-header-timeline">
-            <TextBlock subHeader={t("HCM_BOUNDARY_DETAILS")} subHeaderClassName={"stepper-subheader"} wrapperClassName={"stepper-wrapper"} />
-          </Card>
-          <Card className="stepper-card">
-            <Stepper customSteps={["HCM_BOUNDARY_DETAILS_VERTICAL", "HCM_SUMMARY"]} currentStep={1} onStepClick={onStepClick} direction={"vertical"} />
-          </Card>
-        </div>
+      {loading && <Loader />}
+      {!loading && 
+        <div className="container-full">
+          <div className="card-container">
+            <Card className="card-header-timeline">
+              <TextBlock subHeader={t("HCM_BOUNDARY_DETAILS")} subHeaderClassName={"stepper-subheader"} wrapperClassName={"stepper-wrapper"} />
+            </Card>
+            <Card className="stepper-card">
+              <Stepper customSteps={["HCM_BOUNDARY_DETAILS_VERTICAL", "HCM_SUMMARY"]} currentStep={1} onStepClick={onStepClick} direction={"vertical"} />
+            </Card>
+          </div>
 
-        <div className="card-container-delivery">
-        <TagComponent campaignName={campaignName} />  
-          <Card>
-            <Header>{t(`CAMPAIGN_SELECT_BOUNDARY`)}</Header>
-            <p className="description-type">{t(`CAMPAIGN_SELECT_BOUNDARIES_DESCRIPTION`)}</p>
-            <Wrapper
-              hierarchyType={hierarchyType}
-              lowest={lowestHierarchy}
-              selectedData={selectedData}
-              boundaryOptions={boundaryOptions}
-              hierarchyData={props?.props?.hierarchyData}
-              isMultiSelect={"true"}
-              restrictSelection = {restrictSelection}
-              onSelect={(value) => {
-                handleBoundaryChange(value);
+          <div className="card-container-delivery">
+          <TagComponent campaignName={campaignName} />  
+            <Card>
+              <Header>{t(`CAMPAIGN_SELECT_BOUNDARY`)}</Header>
+              <p className="description-type">{t(`CAMPAIGN_SELECT_BOUNDARIES_DESCRIPTION`)}</p>
+              <Wrapper
+                hierarchyType={hierarchyType}
+                lowest={lowestHierarchy}
+                selectedData={selectedData}
+                boundaryOptions={boundaryOptions}
+                hierarchyData={boundaryHierarchyData}
+                isMultiSelect={"true"}
+                restrictSelection = {restrictSelection}
+                onSelect={(value) => {
+                  handleBoundaryChange(value);
+                }}
+              ></Wrapper>
+            </Card>
+            <InfoCard
+              populators={{
+                name: "infocard",
               }}
-            ></Wrapper>
-          </Card>
-          <InfoCard
-            populators={{
-              name: "infocard",
-            }}
-            variant="default"
-            style={{ margin: "0rem", maxWidth: "100%" , marginTop: "1.5rem" , marginBottom: "2rem"}}
-            additionalElements={[
-              <span style={{ color: "#505A5F" }}>
-                {t("HCM_BOUNDARY_INFO")}
-                &nbsp;
-                <a href={`mailto:${mailConfig?.[CONSOLE_MDMS_MODULENAME]?.mailConfig?.[0]?.mailId}`} style={{ color: "black" }}>
-                  {mailConfig?.[CONSOLE_MDMS_MODULENAME]?.mailConfig?.[0]?.mailId}
-                </a>
-              </span>,
-            ]}
-            label={"Info"}
-          />
+              variant="default"
+              style={{ margin: "0rem", maxWidth: "100%" , marginTop: "1.5rem" , marginBottom: "2rem"}}
+              additionalElements={[
+                <span style={{ color: "#505A5F" }}>
+                  {t("HCM_BOUNDARY_INFO")}
+                  &nbsp;
+                  <a href={`mailto:${mailConfig?.[CONSOLE_MDMS_MODULENAME]?.mailConfig?.[0]?.mailId}`} style={{ color: "black" }}>
+                    {mailConfig?.[CONSOLE_MDMS_MODULENAME]?.mailConfig?.[0]?.mailId}
+                  </a>
+                </span>,
+              ]}
+              label={"Info"}
+            />
+          </div>
         </div>
-      </div>
+      }
     </>
   );
 };
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundaryComponent.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundaryComponent.js
index c05fef6d15e..3a5baddb6d0 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundaryComponent.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/SelectingBoundaryComponent.js
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, Fragment, useRef, useMemo } from "react";
+import React, { useState, useEffect, Fragment, useRef, useMemo, use } from "react";
 import { useTranslation } from "react-i18next";
 import { Card, CardHeader, Header, CardText } from "@egovernments/digit-ui-react-components";
 import { LabelFieldPair, CardLabel } from "@egovernments/digit-ui-components";
@@ -129,7 +129,6 @@ const SelectingBoundaryComponent = ({
   const [parentRoot, setParentRoot] = useState(selectedData?.find((item) => item?.isRoot === true)?.type || {});
   const [restrictSelection, setRestrictSelection] = useState(restrictSelectionPage);
 
-
   useEffect(() => {
     setBoundaryOptions(boundaryOptionsPage);
   }, [boundaryOptionsPage]);
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UpdateBoundaryWrapper.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UpdateBoundaryWrapper.js
index 1a19b1dd57b..ee77dd793c0 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UpdateBoundaryWrapper.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/components/UpdateBoundaryWrapper.js
@@ -15,19 +15,30 @@ const UpdateBoundaryWrapper = ({ onSelect,...props }) => {
   const id = searchParams.get("id");
   const isDraft = searchParams.get("draft");
   // const hierarchyType = props?.props?.hierarchyType;
-  const { data: HierarchySchema } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{ 
-    name: "HierarchySchema",
-    "filter": `[?(@.type=='${window.Digit.Utils.campaign.getModuleName()}')]`
-   }],{select:(MdmsRes)=>MdmsRes},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` });
+  // const { data: HierarchySchema } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{ 
+  //   name: "HierarchySchema",
+  //   "filter": `[?(@.type=='${window.Digit.Utils.campaign.getModuleName()}')]`
+  //  }],{select:(MdmsRes)=>MdmsRes},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` });
   const [selectedData, setSelectedData] = useState(props?.props?.sessionData?.HCM_CAMPAIGN_SELECTING_BOUNDARY_DATA?.boundaryType?.selectedData || []);
   const [boundaryOptions, setBoundaryOptions] = useState(
     props?.props?.sessionData?.HCM_CAMPAIGN_SELECTING_BOUNDARY_DATA?.boundaryType?.boundaryData || {}
   );
   const campaignName = searchParams.get("campaignName");
   const [hierarchyType , SetHierarchyType] = useState(props?.props?.hierarchyType);
+  // const lowestHierarchy = useMemo(() => {
+  //   return HierarchySchema?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.find((item) => item.hierarchy === hierarchyType)?.lowestHierarchy;
+  // }, [HierarchySchema, hierarchyType]);
+  const { 
+    data: BOUNDARY_HIERARCHY_TYPE, 
+    isLoading: hierarchyLoading,
+    rawData: rawData
+  } = Digit.Hooks.campaign.useEmployeeHierarchyType(tenantId, {
+    select: (data) => data?.hierarchy
+  });
   const lowestHierarchy = useMemo(() => {
-    return HierarchySchema?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.find((item) => item.hierarchy === hierarchyType)?.lowestHierarchy;
-  }, [HierarchySchema, hierarchyType]);
+    return rawData?.matchingHierarchy?.lowestHierarchy;
+  }, [rawData]);
+
 
   const reqCriteriaCampaign = {
     url: `/project-factory/v1/project-type/search`,
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/CampaignConfig.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/CampaignConfig.js
index 1f4f4e43932..207b45efe66 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/CampaignConfig.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/configs/CampaignConfig.js
@@ -1,4 +1,5 @@
-export const CampaignConfig = (totalFormData, dataParams, isSubmitting, summaryErrors, hierarchyData) => {
+export const CampaignConfig = (totalFormData, dataParams, isSubmitting, summaryErrors, hierarchyData, allHierarchy, employeeDetails) => {
+
   return [
     {
       form: [
@@ -20,6 +21,8 @@ export const CampaignConfig = (totalFormData, dataParams, isSubmitting, summaryE
                 module: "HCM",
                 sessionData: totalFormData,
                 isSubmitting: isSubmitting,
+                employeeDetails: employeeDetails,
+                allHierarchy: allHierarchy
               },
               populators: {
                 name: "projectType",
@@ -125,6 +128,8 @@ export const CampaignConfig = (totalFormData, dataParams, isSubmitting, summaryE
                 sessionData: totalFormData,
                 dataParams: dataParams,
                 hierarchyData: hierarchyData,
+                employeeDetails: employeeDetails,
+                allHierarchy: allHierarchy
               },
               populators: {
                 name: "boundaryType",
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/index.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/index.js
index da35cdc455a..cda87de23a5 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/index.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/index.js
@@ -19,6 +19,7 @@ import useMDMSServiceSearch from "./useMDMSServiceSearch";
 import useBoundaryHome from "./useBoundaryHome";
 import useFetchFromMicroplan from "./useFetchFromMicroplan";
 import { useReadExcelData, useUpdateAndUploadExcel } from "./useReadExcelData";
+import useEmployeeHierarchyType from "./useEmployeeHierarchyType";
 
 const UserService = {};
 
@@ -48,6 +49,7 @@ const campaign = {
   useFetchFromMicroplan,
   useReadExcelData,
   useUpdateAndUploadExcel,
+  useEmployeeHierarchyType
 };
 
 const Hooks = {
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useBoundaryHome.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useBoundaryHome.js
index 23c9199a631..03006b5fde0 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useBoundaryHome.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useBoundaryHome.js
@@ -1,29 +1,10 @@
 import { useQuery } from "react-query";
-import { CONSOLE_MDMS_MODULENAME } from "../Module";
 
 const MDMS_V2_CONTEXT_PATH = window?.globalConfigs?.getConfig("MDMS_V2_CONTEXT_PATH") || "mdms-v2";
 const HRMS_CONTEXT_PATH = window?.globalConfigs?.getConfig("HRMS_CONTEXT_PATH") || "egov-hrms";
 
-
-
-const generateFile = async (hierarchyType, tenantId) => {
-  const res = await Digit.CustomService.getResponse({
-    url: `/project-factory/v1/data/_generate`,
-    body: {},
-    params: {
-      tenantId: tenantId,
-      type: "boundaryManagement",
-      forceUpdate: true,
-      hierarchyType: hierarchyType,
-      campaignId: "default",
-    },
-  });
-  return res;
-};
-
 const fetchBoundaryHierarchy = async (hierarchyType, tenantId) => {
   try {
-    // Second API Call: Fetch Service Definitions
     const res = await Digit.CustomService.getResponse({
       url: `/boundary-service/boundary-hierarchy-definition/_search`,
       params: {},
@@ -38,14 +19,13 @@ const fetchBoundaryHierarchy = async (hierarchyType, tenantId) => {
     });
     return res?.BoundaryHierarchy?.[0] || {};
   } catch (error) {
-    console.error("Error fetching service definition:", error);
+    console.error("Error fetching boundary hierarchy:", error);
     return error;
   }
 };
 
 const fetchEmployeeDetails = async (userName, tenantId) => {
   try {
-    // Second API Call: Fetch Service Definitions
     const res = await Digit.CustomService.getResponse({
       url: `/${HRMS_CONTEXT_PATH}/employees/_search`,
       params: {
@@ -57,71 +37,68 @@ const fetchEmployeeDetails = async (userName, tenantId) => {
     });
     return res?.Employees?.[0];
   } catch (error) {
-    console.error("Error fetching service definition:", error);
+    console.error("Error fetching employee details:", error);
     return error;
   }
 };
 
-const selectData = (data) => {
-  return data?.mdms
-    ?.map((e) => e?.data)
-    .reduce((acc, curr) => {
-      acc[curr?.type] = curr;
-      return acc;
-    }, {});
+const fetchHierarchies = async (tenantId) => {
+  try {
+    const res = await Digit.CustomService.getResponse({
+      url: `/egov-mdms-service/v1/_search`,
+      body: {
+        MdmsCriteria: {
+          tenantId: tenantId,
+          moduleDetails: [{
+            moduleName: "HCM-ADMIN-CONSOLE",
+            masterDetails: [{
+              name: "HierarchySchema"
+            }]
+          }]
+        },
+      },
+    });
+    return res?.MdmsRes?.["HCM-ADMIN-CONSOLE"]?.HierarchySchema|| [];
+  } catch (error) {
+    console.error("Error fetching hierarchies:", error);
+    return [];
+  }
 };
 
-const useBoundaryHome = ({ screenType = "campaign", defaultHierarchyType = "", hierarchyType = "", userName, tenantId }) => {
+const useBoundaryHome = ({ hierarchyType = "", userName, tenantId }) => {
   const fetchConsolidatedData = async () => {
     try {
-      // First API Call: Fetch MDMS Data
-      const mdmsResponse = await Digit.CustomService.getResponse({
-        url: `/${MDMS_V2_CONTEXT_PATH}/v2/_search`,
-        body: {
-          MdmsCriteria: {
-            tenantId: tenantId,
-            schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema`,
-            isActive: true
-          },
-        },
-      });
-      // Second API Call: Merge MDMS Data with Service Definition
-      const final = selectData(mdmsResponse);
-      // let final = selectData(mdmsResponse);
-      // final.campaign.hierarchyType="BOUNDARYDEMO35";
-
-      const boundaryConfig = final?.[screenType];
-
-      const employeeDetails = (boundaryConfig?.department?.length > 0 && (await fetchEmployeeDetails(userName, tenantId))) || null;
-      const hierarchyName=hierarchyType || boundaryConfig?.hierarchy;
-      const defaultHierarchyName=defaultHierarchyType || final?.["default"]?.hierarchy;
-      const boundaryData = await fetchBoundaryHierarchy(hierarchyName, tenantId);
-      const defaultBoundaryData = await fetchBoundaryHierarchy(defaultHierarchyName, tenantId);
-      // boundaryData && generateFile(hierarchyType || boundaryConfig?.hierarchy, tenantId);
+      // Fetch all hierarchies
+      const hierarchies = await fetchHierarchies(tenantId);
+      
+      // Fetch employee details
+      const employeeDetails = await fetchEmployeeDetails(userName, tenantId);
+      const employeeDepartments = employeeDetails?.assignments?.map(assignment => assignment.department) || [];
+      // Find matching hierarchy based on employee departments
+      const matchingHierarchy = hierarchies.find(
+        schema => (schema.department || []).some(dept => employeeDepartments.includes(dept))
+      );
+      const hierarchyName = hierarchyType || matchingHierarchy?.hierarchy;
+      
+      // Fetch boundary data for the matched hierarchy
+      const boundaryData = hierarchyName ? await fetchBoundaryHierarchy(hierarchyName, tenantId) : null;
 
-      // Return a promise that resolves after both API calls are complete
-      return new Promise((resolve) => {
-        // Once the second call (`mergeData`) is done, resolve the final data
+      return {
+        boundaryData,
+        employeeDetails,
+        hierarchyName,
+        matchingHierarchy,
+        hierarchies
+      };
 
-        // Merge the MDMS data with the service data
-        const mergedData = {
-          boundaryConfig: final,
-          defaultBoundaryData,
-          boundaryData,
-          employeeDetails,
-          hierarchyName,
-          defaultHierarchyName
-        };
-        resolve(mergedData);
-      });
     } catch (error) {
-      console.error("Error fetching MDMS data:", error);
-      return [];
+      console.error("Error in consolidated data fetch:", error);
+      return {};
     }
   };
 
   const { data, isFetching, refetch, isLoading, error } = useQuery(
-    ["mdmsData", screenType, defaultHierarchyType, hierarchyType, userName, tenantId],
+    ["boundaryData", hierarchyType, userName, tenantId],
     fetchConsolidatedData,
     {
       cacheTime: 0,
@@ -133,11 +110,8 @@ const useBoundaryHome = ({ screenType = "campaign", defaultHierarchyType = "", h
     isLoading,
     error,
     refetch,
-    isFetching,
-    revalidate: () => {
-      // final && client.invalidateQueries({ queryKey: [url].filter((e) => e) });
-    },
+    isFetching
   };
 };
 
-export default useBoundaryHome;
+export default useBoundaryHome;
\ No newline at end of file
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useEmployeeHierarchyType.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useEmployeeHierarchyType.js
new file mode 100644
index 00000000000..22931b0e0b6
--- /dev/null
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/hooks/useEmployeeHierarchyType.js
@@ -0,0 +1,96 @@
+import { useEffect, useState, useCallback, useMemo } from 'react';
+
+const useEmployeeHierarchyType = (tenantId, options = {}) => {
+  const [data, setData] = useState(null);
+  const [isLoading, setIsLoading] = useState(true);
+  const [error, setError] = useState(null);
+
+  const HRMS_CONTEXT_PATH = window?.globalConfigs?.getConfig("HRMS_CONTEXT_PATH") || "egov-hrms";
+  const CONSOLE_MDMS_MODULENAME = "HCM-ADMIN-CONSOLE";
+  const MDMS_V2_CONTEXT_PATH = window?.globalConfigs?.getConfig("MDMS_V2_CONTEXT_PATH") || "egov-mdms-service";
+
+
+  const fetchEmployeeAndHierarchy = useCallback(async () => {
+    try {
+      setIsLoading(true);
+      
+      // Fetch employee details
+      const employeeResponse = await Digit.CustomService.getResponse({
+        url: `/${HRMS_CONTEXT_PATH}/employees/_search`,
+        params: { 
+          tenantId,
+          codes: Digit.UserService.getUser()?.info?.userName,
+          SortOrder: "ASC"
+        },
+        body: {}
+      });
+      
+      const employee = employeeResponse?.Employees?.[0];
+      
+      // Fetch hierarchies using MDMS
+      const mdmsResponse = await Digit.CustomService.getResponse(
+        {
+            url: `/${MDMS_V2_CONTEXT_PATH}/v1/_search`,
+            params: {},
+                body: {
+                  MdmsCriteria: {
+                    tenantId,
+                    moduleDetails: [{
+                      moduleName: "HCM-ADMIN-CONSOLE",
+                      masterDetails: [{
+                        name: "HierarchySchema"
+                      }]
+                    }]
+                  }
+                }
+            }
+      );
+      
+      // Get employee departments
+      const employeeDepartments = employee?.assignments?.map(assignment => assignment.department) || [];
+      const hierarchies = mdmsResponse?.MdmsRes?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema || [];
+      
+      // Find matching hierarchy
+      const matchingHierarchy = hierarchies.find(
+        schema => (schema.department || []).some(dept => employeeDepartments.includes(dept))
+      );
+
+      const result = {
+        hierarchy: matchingHierarchy?.hierarchy || null,
+        employee,
+        allHierarchies: hierarchies,
+        matchingHierarchy
+      };
+
+      setData(result);
+      setIsLoading(false);
+      return result;
+
+    } catch (err) {
+      console.error("Error in useEmployeeHierarchyType:", err);
+      setError(err);
+      setIsLoading(false);
+      return null;
+    }
+  }, [tenantId]);
+
+  useEffect(() => {
+    fetchEmployeeAndHierarchy();
+  }, [fetchEmployeeAndHierarchy]);
+
+  const select = options?.select || (data => data?.hierarchy);
+  const queryData = useMemo(() => {
+    if (!data) return null;
+    return select(data);
+  }, [data, select]);
+
+  return {
+    data: queryData,
+    isLoading,
+    error,
+    refetch: fetchEmployeeAndHierarchy,
+    rawData: data
+  };
+};
+
+export default useEmployeeHierarchyType;
\ No newline at end of file
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/BoundaryHome.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/BoundaryHome.js
index 1f579ea09a2..bf27a052739 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/BoundaryHome.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/BoundaryHome.js
@@ -47,11 +47,18 @@ const BoundaryHome = () => {
   const [showPopUp, setShowPopUp] = useState(false);
   const [authorized, setAuthorized] = useState(false);
   const [geoPodeData, setGeoPodeData] = useState(false);
+  const [disButton, setDisButton] = useState(true);
   const history = useHistory();
+  const user = Digit.UserService.getUser();
   
   const type=searchParams.get("type")|| config?.type;
 
   const {isLoading,data,error}=Digit.Hooks.campaign.useBoundaryHome({ screenType: type,defaultHierarchyType:searchParams?.get("defaultHierarchyType"),hierarchyType:searchParams?.get("hierarchyType"),userName:Digit.UserService.getUser()?.info?.userName,tenantId });
+  useEffect(()=>{
+    if(user?.info?.roles?.some(role => role.code === "BOUNDARY_MANAGER")) setAuthorized(true);
+    setDisButton(!data?.boundaryData || !data?.hierarchyName);
+  }, [data]);
+
   if (isLoading) return <Loader />;
 
   return (
@@ -71,7 +78,7 @@ const BoundaryHome = () => {
             size={"large"}
             variation={"secondary"}
             label={t(key)}
-            isDisabled={isEditDisabled || isCreateDisabled}
+            isDisabled={isEditDisabled || isCreateDisabled || disButton || !authorized}
             onClick={()=>navigate(history,key,data,setShowPopUp)}
             style={{ width: "35rem", height: "5rem" }}
             textStyles={{ fontSize: "1.5rem" }}
@@ -79,7 +86,7 @@ const BoundaryHome = () => {
         })}
         </div>
       </Card>
-      <InfoCard
+      {!disButton && authorized && <InfoCard
         label="Info"
         variant="default"
         style={{maxWidth:"200rem", marginTop:"1rem"}}
@@ -87,7 +94,19 @@ const BoundaryHome = () => {
           <span style={{ color: "#505A5F", fontWeight: 600 }}>{t(`HIERARCHY_CREATED_ON`)} {": "} {new Date(data?.boundaryData?.auditDetails?.createdTime).toLocaleDateString()}</span>,
           <span style={{ color: "#505A5F", fontWeight: 600 }}>{t(`HIERARCHY_LAST_MODIFIED_ON`)} {": "} {new Date(data?.boundaryData?.auditDetails?.lastModifiedTime).toLocaleDateString()}</span>,
         ]}
-      /> 
+      /> }
+      {disButton && 
+        <Toast
+          type="error"
+          label={t("BOUNDARY_USER_NOT_ASSIGNED_TO_ANY_BOUNDARY_WITH_HIS_DEPARTMENT")}
+        />
+      }
+      {!authorized && 
+        <Toast
+          type="error"
+          label={t("BOUNDARY_USER_NOT_AUTHORIZED_FOR_BOUNDARY_MANAGEMENT")}
+        />
+      }
     </React.Fragment>
   );
 };
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js
index 65ecba51d41..eb186ebbad5 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/SetupCampaign.js
@@ -65,21 +65,32 @@ const SetupCampaign = ({ hierarchyType, hierarchyData }) => {
   const [fetchBoundary, setFetchBoundary] = useState(() => Boolean(searchParams.get("fetchBoundary")));
   const [fetchUpload, setFetchUpload] = useState(false);
   const [active, setActive] = useState(0);
-  const { data: HierarchySchema } = Digit.Hooks.useCustomMDMS(
-    tenantId,
-    CONSOLE_MDMS_MODULENAME,
-    [
-      {
-        name: "HierarchySchema",
-        filter: `[?(@.type=='${window?.Digit?.Utils?.campaign?.getModuleName()}')]`,
-      },
-    ],
-    { select: (MdmsRes) => MdmsRes },
-    { schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` }
-  );
+  const HRMS_CONTEXT_PATH = window?.globalConfigs?.getConfig("HRMS_CONTEXT_PATH") || "egov-hrms";
+  // const { data: HierarchySchema } = Digit.Hooks.useCustomMDMS(
+  //   tenantId,
+  //   CONSOLE_MDMS_MODULENAME,
+  //   [
+  //     {
+  //       name: "HierarchySchema",
+  //       filter: `[?(@.type=='${window?.Digit?.Utils?.campaign?.getModuleName()}')]`,
+  //     },
+  //   ],
+  //   { select: (MdmsRes) => MdmsRes },
+  //   { schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` }
+  // );
+
+  const { 
+    data: BOUNDARY_HIERARCHY_TYPE, 
+    isLoading: hierarchyLoading,
+    rawData: rawData
+  } = Digit.Hooks.campaign.useEmployeeHierarchyType(tenantId, {
+    select: (data) => data?.hierarchy
+  });
+
+
   const lowestHierarchy = useMemo(() => {
-    return HierarchySchema?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.[0]?.lowestHierarchy;
-  }, [HierarchySchema]);
+    return rawData?.matchingHierarchy?.lowestHierarchy;
+  }, [rawData]);
 
   const { data: DeliveryConfig } = Digit.Hooks.useCustomMDMS(
     tenantId,
@@ -108,6 +119,22 @@ const SetupCampaign = ({ hierarchyType, hierarchyData }) => {
 
   const { data: hierarchyDefinition } = Digit.Hooks.useCustomAPIHook(reqCriteria);
 
+  const reqAllHierarchy = {
+    url: '/egov-mdms-service/v1/_search',
+    params: {},
+        body: {
+          MdmsCriteria: {
+            tenantId,
+            moduleDetails: [{
+              moduleName: "HCM-ADMIN-CONSOLE",
+              masterDetails: [{
+                name: "HierarchySchema"
+              }]
+            }]
+          }
+        }
+    }
+  
   const { isLoading: draftLoading, data: draftData, error: draftError, refetch: draftRefetch } = Digit.Hooks.campaign.useSearchCampaign({
     tenantId: tenantId,
     filter: {
diff --git a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/UpdateCampaign.js b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/UpdateCampaign.js
index b9a6dd7afd8..38a956fbf19 100644
--- a/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/UpdateCampaign.js
+++ b/health/micro-ui/web/micro-ui-internals/packages/modules/campaign-manager/src/pages/employee/UpdateCampaign.js
@@ -55,17 +55,29 @@ const UpdateCampaign = ({hierarchyData }) => {
   const [fetchBoundary, setFetchBoundary] = useState(() => Boolean(searchParams.get("fetchBoundary")));
   const [fetchUpload, setFetchUpload] = useState(false);
   const [active, setActive] = useState(0);
-  const { data: HierarchySchema } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{ 
-    name: "HierarchySchema",
-    "filter": `[?(@.type=='${window.Digit.Utils.campaign.getModuleName()}')]`
-   }],{select:(MdmsRes)=>MdmsRes},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` });
+  // const { data: HierarchySchema } = Digit.Hooks.useCustomMDMS(tenantId, CONSOLE_MDMS_MODULENAME, [{ 
+  //   name: "HierarchySchema",
+  //   "filter": `[?(@.type=='${window.Digit.Utils.campaign.getModuleName()}')]`
+  //  }],{select:(MdmsRes)=>MdmsRes},{ schemaCode: `${CONSOLE_MDMS_MODULENAME}.HierarchySchema` });
+  // const [hierarchyType, setHierarchyType] = useState();
+  // const lowestHierarchy = useMemo(() => {
+  //   return HierarchySchema?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.find((item) => item.hierarchy === hierarchyType)?.lowestHierarchy;
+  // }, [HierarchySchema, hierarchyType]);
+
+  const { 
+    data: BOUNDARY_HIERARCHY_TYPE, 
+    isLoading: hierarchyLoading,
+    rawData: rawData
+  } = Digit.Hooks.campaign.useEmployeeHierarchyType(tenantId, {
+    select: (data) => data?.hierarchy
+  });
   const [hierarchyType, setHierarchyType] = useState();
   const lowestHierarchy = useMemo(() => {
-    return HierarchySchema?.[CONSOLE_MDMS_MODULENAME]?.HierarchySchema?.find((item) => item.hierarchy === hierarchyType)?.lowestHierarchy;
-  }, [HierarchySchema, hierarchyType]);
+    return rawData?.matchingHierarchy?.lowestHierarchy;
+  }, [rawData]);
+
   const { isLoading, data: projectType } = Digit.Hooks.useCustomMDMS(tenantId, "HCM-PROJECT-TYPES", [{ name: "projectTypes" }],{select:(MdmsRes)=>MdmsRes}, { schemaCode: `${"HCM-PROJECT-TYPES"}.projectTypes` });
   
-
   const reqCriteriaCampaign = {
     url: `/project-factory/v1/project-type/search`,
     body: {