diff --git a/apps/nowait-user/src/assets/logo/yeungnam.png b/apps/nowait-user/src/assets/logo/yeungnam.png
new file mode 100644
index 00000000..e6d543c9
Binary files /dev/null and b/apps/nowait-user/src/assets/logo/yeungnam.png differ
diff --git a/apps/nowait-user/src/pages/order/remittenceWait/RemittanceWaitPage.tsx b/apps/nowait-user/src/pages/order/remittenceWait/RemittanceWaitPage.tsx
index 0c46e357..8386ca62 100644
--- a/apps/nowait-user/src/pages/order/remittenceWait/RemittanceWaitPage.tsx
+++ b/apps/nowait-user/src/pages/order/remittenceWait/RemittanceWaitPage.tsx
@@ -35,7 +35,6 @@ const RemittanceWaitPage = () => {
     })),
     totalPrice,
   };
-
   const orderButton = async () => {
     if (isLoading) return;
     try {
@@ -70,6 +69,8 @@ const RemittanceWaitPage = () => {
       >
         <img
           src={isLoaded ? loadedSrc : remittanceWaitFallback}
+          // src={remittanceWait}
+
           alt="입금 대기중인 이미지"
           width={"150px"}
           height={"150px"}
diff --git a/apps/nowait-user/src/pages/waiting/BoothMapManage/MapManagePage.tsx b/apps/nowait-user/src/pages/waiting/BoothMapManage/MapManagePage.tsx
index 7281ee8b..f274b1ef 100644
--- a/apps/nowait-user/src/pages/waiting/BoothMapManage/MapManagePage.tsx
+++ b/apps/nowait-user/src/pages/waiting/BoothMapManage/MapManagePage.tsx
@@ -1,135 +1,52 @@
-import { useEffect, useState } from "react";
-import { Button } from "@repo/ui";
-import { Container as MapDiv, NaverMap, Marker } from "react-naver-maps";
 import { useGeoPolygon } from "../boothMap/hooks/useGeoPolygon";
 import { useMyLocation } from "../boothMap/hooks/useMyLocation";
-import UniversityPolygon from "../boothMap/components/UniversityPolygon";
-import MapControlButtons from "../boothMap/components/mapControls/MapControls";
+import MapControls from "./components/MapControls";
+import GeoDataForm from "./components/GeoDataForm";
+import MapCanvas from "./components/MapCanvas";
+import { useMapClick } from "./hooks/useMapClick";
+import { useMarkerManager } from "./hooks/useMarkerManager";
+import { useMap } from "react-naver-maps";
 
 const MapManagePage = () => {
-  const [markers, setMarkers] = useState<
-    { storeId: string; lat: number; lng: number }[]
-  >([]);
-  const [status, setStatus] = useState(false);
-  const [geoData, setGeoData] = useState<string>("");
-  const [map, setMap] = useState<any | null>(null);
+  const map = useMap();
+
   const paths = useGeoPolygon();
   const myLocation = useMyLocation();
 
-  //마커 생성 컨트롤
-  useEffect(() => {
-    if (!map) return;
-
-    const listener = window.naver.maps.Event.addListener(
-      map,
-      "click",
-      (e: any) => {
-        if (!status) return;
-
-        const inputId = prompt("스토어 아이디를 입력하세요");
-        if (inputId === null || inputId.trim() === "") return;
-        const isExist = markers.some(
-          (marker) => String(marker.storeId) === String(inputId)
-        );
-        if (isExist) {
-          alert("이미 존재하는 주점입니다.");
-          return;
-        }
-
-        const lat = e.coord.lat();
-        const lng = e.coord.lng();
-
-        const newMarker = { storeId: inputId, lat, lng };
-        setMarkers((prev) => [...prev, newMarker]);
-      }
-    );
-
-    return () => {
-      window.naver.maps.Event.removeListener(listener);
-    };
-  }, [map, status, markers]);
+  const {
+    markers,
+    isActive,
+    setIsActive,
+    addMarker,
+    undoMarker,
+    resetMarkers,
+    copyMarkers,
+  } = useMarkerManager();
+
+  useMapClick({
+    map,
+    enabled: isActive,
+    onClick: addMarker,
+  });
 
   return (
-    <div className="relative top-0 left-0 min-h-dvh w-full">
-      <MapDiv style={{ width: "100%", height: "100vh" }}>
-        <NaverMap
-          defaultCenter={myLocation.center}
-          defaultZoom={16}
-          ref={setMap}
-        >
-          <UniversityPolygon paths={paths} />
-          <MapControlButtons center={myLocation.center} map={map} />
-          {markers.map((marker) => {
-            return (
-              <Marker
-                key={marker.storeId}
-                position={{ lat: marker.lat, lng: marker.lng }}
-              ></Marker>
-            );
-          })}
-        </NaverMap>
-      </MapDiv>
-      <div className="fixed left-1/2 -translate-x-1/2 bottom-20 w-full z-50 px-2.5">
-        <form
-          onSubmit={() => {
-            const parsed = JSON.parse(geoData);
-            const polygon = [
-              parsed.map(({ lat, lon }: { lat: number; lon: number }) => [
-                lon,
-                lat,
-              ]),
-            ];
-            navigator.clipboard.writeText(JSON.stringify(polygon, null, 2));
-            alert("복사가 완료 되었습니다.");
-          }}
-        >
-          <textarea
-            className="bg-white w-full min-h-48"
-            onChange={(e) => setGeoData(e.target.value)}
-            value={geoData}
-          />
-          <Button>데이터 변경</Button>
-        </form>
-      </div>
-      <div className="flex gap-1 fixed left-1/2 bottom-2.5 -translate-x-1/2 w-full z-50 px-2.5">
-        <Button className="text-15-medium" onClick={() => setStatus(true)}>
-          시작
-        </Button>
-        <Button className="text-15-medium" onClick={() => setStatus(false)}>
-          중지
-        </Button>
-        <Button
-          className="text-15-medium"
-          onClick={() => {
-            setMarkers((prev) => prev.slice(0, -1));
-          }}
-        >
-          뒤로가기
-        </Button>
-        <Button
-          className="text-15-medium"
-          onClick={() => {
-            setMarkers([]);
-          }}
-        >
-          초기화
-        </Button>
-        <Button
-          className="text-15-medium"
-          onClick={() => {
-            // 좌표를 문자열로 변환 후 복사
-            const formattedMarkers = markers
-              .map((marker) => {
-                return `${marker.storeId} : {lat:${marker.lat},lng:${marker.lng}}`;
-              })
-              .join(",\n");
-            navigator.clipboard.writeText(`${formattedMarkers}\n`);
-            alert("복사가 완료 되었습니다.");
-          }}
-        >
-          복사
-        </Button>
-      </div>
+    // <div className="relative top-0 left-0 min-h-dvh w-full">
+    <div className="fixed top-0 left-0 min-h-dvh w-full my-0!">
+      <MapCanvas
+        center={myLocation.center}
+        paths={paths}
+        markers={markers}
+      />
+      <GeoDataForm />
+      <MapControls
+        isActive={isActive}
+        hasMarkers={!!markers.length}
+        onStart={() => setIsActive(true)}
+        onStop={() => setIsActive(false)}
+        onUndo={undoMarker}
+        onReset={resetMarkers}
+        onCopy={copyMarkers}
+      />
     </div>
   );
 };
diff --git a/apps/nowait-user/src/pages/waiting/BoothMapManage/components/GeoDataForm.tsx b/apps/nowait-user/src/pages/waiting/BoothMapManage/components/GeoDataForm.tsx
new file mode 100644
index 00000000..9d6a51ca
--- /dev/null
+++ b/apps/nowait-user/src/pages/waiting/BoothMapManage/components/GeoDataForm.tsx
@@ -0,0 +1,40 @@
+import { Button } from "@repo/ui";
+import { useState } from "react";
+
+const GeoDataForm = () => {
+  const [geoData, setGeoData] = useState("");
+
+  const copyPolygon = () => {
+    const parsed = JSON.parse(geoData);
+    const polygon = [
+      parsed.map(({ lat, lon }: { lat: number; lon: number }) => [
+        lon,
+        lat,
+      ]),
+    ];
+
+    navigator.clipboard.writeText(JSON.stringify(polygon, null, 2));
+    alert("복사가 완료 되었습니다.");
+  };
+
+  return (
+    <div className="fixed left-1/2 -translate-x-1/2 bottom-20 w-full z-50 px-2.5">
+      <form
+        onSubmit={(e) => {
+          e.preventDefault();
+          copyPolygon();
+        }}
+      >
+        <textarea
+          className="bg-white w-full min-h-48 outline-none"
+          placeholder="데이터를 입력해주세요."
+          value={geoData}
+          onChange={(e) => setGeoData(e.target.value)}
+        />
+        <Button>데이터 변경 및 복사</Button>
+      </form>
+    </div>
+  );
+};
+
+export default GeoDataForm;
\ No newline at end of file
diff --git a/apps/nowait-user/src/pages/waiting/BoothMapManage/components/MapCanvas.tsx b/apps/nowait-user/src/pages/waiting/BoothMapManage/components/MapCanvas.tsx
new file mode 100644
index 00000000..c1f3eaf8
--- /dev/null
+++ b/apps/nowait-user/src/pages/waiting/BoothMapManage/components/MapCanvas.tsx
@@ -0,0 +1,26 @@
+import { Container as MapDiv, Marker, NaverMap } from "react-naver-maps";
+import UniversityPolygon from "../../boothMap/components/UniversityPolygon";
+import MapControlButtons from "../../boothMap/components/mapControls/MapControls";
+
+interface PropsType {
+  center: { lat: number; lng: number };
+  paths: any;
+  markers: { storeId: string; lat: number; lng: number }[];
+}
+
+const MapCanvas = ({ center, paths, markers }: PropsType) => {
+  return (
+    <MapDiv style={{ width: "100%", height: "100vh" }}>
+      <NaverMap defaultCenter={center} defaultZoom={16}>
+        <MapControlButtons center={center} />
+
+        <UniversityPolygon paths={paths} />
+        {markers.map(({ storeId, lat, lng }) => (
+          <Marker key={storeId} position={{ lat, lng }} />
+        ))}
+      </NaverMap>
+    </MapDiv>
+  );
+};
+
+export default MapCanvas;
diff --git a/apps/nowait-user/src/pages/waiting/BoothMapManage/components/MapControls.tsx b/apps/nowait-user/src/pages/waiting/BoothMapManage/components/MapControls.tsx
new file mode 100644
index 00000000..bddca09d
--- /dev/null
+++ b/apps/nowait-user/src/pages/waiting/BoothMapManage/components/MapControls.tsx
@@ -0,0 +1,33 @@
+import { Button } from "@repo/ui";
+
+type Props = {
+  isActive: boolean;
+  hasMarkers: boolean;
+  onStart: () => void;
+  onStop: () => void;
+  onUndo: () => void;
+  onReset: () => void;
+  onCopy: () => void;
+};
+
+const MapControls = ({
+  isActive,
+  hasMarkers,
+  onStart,
+  onStop,
+  onUndo,
+  onReset,
+  onCopy,
+}: Props) => {
+  return (
+    <div className="flex gap-1 fixed left-1/2 bottom-2.5 -translate-x-1/2 w-full z-50 px-2.5">
+      <Button disabled={isActive} onClick={onStart}>시작</Button>
+      <Button disabled={!isActive} onClick={onStop}>중지</Button>
+      <Button disabled={!hasMarkers} onClick={onUndo}>뒤로가기</Button>
+      <Button onClick={onReset}>초기화</Button>
+      <Button disabled={!hasMarkers} onClick={onCopy}>복사</Button>
+    </div>
+  );
+};
+
+export default MapControls;
\ No newline at end of file
diff --git a/apps/nowait-user/src/pages/waiting/BoothMapManage/hooks/useMapClick.ts b/apps/nowait-user/src/pages/waiting/BoothMapManage/hooks/useMapClick.ts
new file mode 100644
index 00000000..1d4695da
--- /dev/null
+++ b/apps/nowait-user/src/pages/waiting/BoothMapManage/hooks/useMapClick.ts
@@ -0,0 +1,26 @@
+import { useEffect } from "react";
+
+interface PropsType  {
+  map: any | null;
+  enabled: boolean;
+  onClick: (lat: number, lng: number) => void;
+};
+
+export const useMapClick = ({ map, enabled, onClick }: PropsType) => {
+  useEffect(() => {
+    if (!map) return;
+
+    const listener = window.naver.maps.Event.addListener(
+      map,
+      "click",
+      (e: any) => {
+        if (!enabled) return;
+        onClick(e.coord.lat(), e.coord.lng());
+      }
+    );
+
+    return () => {
+      window.naver.maps.Event.removeListener(listener);
+    };
+  }, [map, enabled, onClick]);
+};
\ No newline at end of file
diff --git a/apps/nowait-user/src/pages/waiting/BoothMapManage/hooks/useMarkerManager.ts b/apps/nowait-user/src/pages/waiting/BoothMapManage/hooks/useMarkerManager.ts
new file mode 100644
index 00000000..9e5e3f89
--- /dev/null
+++ b/apps/nowait-user/src/pages/waiting/BoothMapManage/hooks/useMarkerManager.ts
@@ -0,0 +1,56 @@
+import { useCallback, useState } from "react";
+
+export const useMarkerManager = () => {
+  const [markers, setMarkers] = useState<{ storeId: string; lat: number; lng: number }[]>([]);
+  const [isActive, setIsActive] = useState(false);
+
+  //마커 추가
+  const addMarker = useCallback(
+    (lat: number, lng: number) => {
+      const storeId = prompt("스토어 아이디를 입력하세요");
+      if (!storeId?.trim()) return;
+
+      const isExist = markers.some(
+        (marker) => marker.storeId === storeId
+      );
+
+      if (isExist) {
+        alert("이미 존재하는 주점입니다.");
+        return;
+      }
+
+      setMarkers((prev) => [...prev, { storeId, lat, lng }]);
+    },
+    [markers]
+  );
+
+  //마커 뒤로가기
+  const undoMarker = () =>
+    setMarkers((prev) => prev.slice(0, -1));
+
+  //마커 초기화
+  const resetMarkers = () => setMarkers([]);
+
+  //전체 마커 복사
+  const copyMarkers = () => {
+    const text = markers
+      .map(
+        ({ storeId, lat, lng }) =>
+          `${storeId} : { lat: ${lat}, lng: ${lng} }`
+      )
+      .join(",\n");
+
+    navigator.clipboard.writeText(text);
+    alert("복사가 완료 되었습니다.");
+  };
+
+  return {
+    markers,
+    isActive,
+    setIsActive,
+    addMarker,
+    undoMarker,
+    resetMarkers,
+    copyMarkers,
+  };
+};
\ No newline at end of file
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/MapPage.tsx b/apps/nowait-user/src/pages/waiting/boothMap/MapPage.tsx
index 525d0197..09124398 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/MapPage.tsx
+++ b/apps/nowait-user/src/pages/waiting/boothMap/MapPage.tsx
@@ -8,7 +8,12 @@ import BoothMarkers from "./components/BoothMarkers";
 import { useBooths } from "./hooks/useBooths";
 import { useMyLocation } from "./hooks/useMyLocation";
 import MapControlButtons from "./components/mapControls/MapControls";
-import { Container as MapDiv, NaverMap, Marker } from "react-naver-maps";
+import {
+  Container as MapDiv,
+  NaverMap,
+  Marker,
+  useMap,
+} from "react-naver-maps";
 import { useMapZoom } from "./hooks/useMapZoom";
 import { useMapEvents } from "./hooks/useMapEvents";
 
@@ -20,8 +25,7 @@ declare global {
 
 const MapPage = () => {
   const [selectedBooth, setSelectedBooth] = useState<number | null>(null);
-  const [map, setMap] = useState<any | null>(null);
-
+  const map = useMap();
   // const { setIsCompassMode } = isCompassModeStore();
   //대학교 폴리곤(영역) 설정
   const paths = useGeoPolygon();
@@ -31,6 +35,7 @@ const MapPage = () => {
   const myLocation = useMyLocation();
   //줌레벨 가져오기
   const zoom = useMapZoom(map);
+  // const isInsideServiceArea = useIsInsidePolygon(paths, myLocation.center);
   //맵 드래그, 클릭 컨트롤
   useMapEvents(map, () => setSelectedBooth(null));
 
@@ -42,7 +47,7 @@ const MapPage = () => {
         setSelectedBooth(id);
       }
     },
-    [selectedBooth]
+    [selectedBooth],
   );
 
   return (
@@ -56,12 +61,8 @@ const MapPage = () => {
             height: "600px",
           }}
         >
-          <NaverMap
-            defaultCenter={myLocation.center}
-            defaultZoom={16}
-            ref={setMap}
-          >
-            <MapControlButtons center={myLocation.center} map={map} />
+          <NaverMap center={myLocation.center} zoom={16}>
+            <MapControlButtons center={myLocation.center}/>
             <UniversityPolygon paths={paths} />
             {!myLocation.isLoading && <Marker position={myLocation.center} />}
             <BoothMarkers
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/components/BoothMarker.tsx b/apps/nowait-user/src/pages/waiting/boothMap/components/BoothMarker.tsx
new file mode 100644
index 00000000..d8e04218
--- /dev/null
+++ b/apps/nowait-user/src/pages/waiting/boothMap/components/BoothMarker.tsx
@@ -0,0 +1,91 @@
+import React from "react";
+import { Marker } from "react-naver-maps";
+import DotMarker from "../../../../assets/icon/DotMarker.svg?url";
+
+interface BoothMarkerProps {
+  booth: {
+    storeId: number;
+    lat: number;
+    lng: number;
+    profileImage?: {
+      imageUrl?: string;
+    };
+  };
+  zoomLevel: number;
+  openBooth: (id: number) => void;
+}
+
+const BoothMarker = React.memo(
+  ({ booth, zoomLevel, openBooth }: BoothMarkerProps) => {
+    const isZoomed = zoomLevel >= 19;
+
+    const imageUrl =
+      booth.profileImage?.imageUrl &&
+      booth.profileImage.imageUrl.trim().length > 0
+        ? booth.profileImage.imageUrl
+        : DotMarker;
+
+    const icon = !isZoomed
+      ? {
+          url: DotMarker,
+          size: { width: 12, height: 12 },
+          scaledSize: { width: 12, height: 12 },
+        }
+      : {
+          content: `
+  <div style="
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    
+  ">
+    <!-- 원형 마커 -->
+    <div style="
+      width:44px;
+      height:44px;
+      border-radius:50%;
+      background:#fff;
+      display:flex;
+      align-items:center;
+      justify-content:center;
+    ">
+      <img
+        src="${imageUrl}"
+        style="
+          width:36px;
+          height:36px;
+          border-radius:50%;
+          object-fit:cover;
+        "
+      />
+    </div>
+
+    <!-- 아래 화살표 -->
+    <div style="
+      width: 0;
+      height: 0;
+      border-left: 7px solid transparent;
+      border-right: 7px solid transparent;
+      border-radius : 2px;
+      border-top: 10px solid #fff;
+      margin-top: -3px;
+    //   filter: drop-shadow(0 2px 2px rgba(0,0,0,0.25));
+    "></div>
+  </div>
+`,
+          size: { width: 44, height: 44 },
+          anchor: { x: 22, y: 22 },
+        };
+
+    return (
+      <Marker
+        position={{ lat: booth.lat, lng: booth.lng }}
+        icon={icon}
+        onClick={() => openBooth(booth.storeId)}
+      />
+    );
+  }
+);
+
+export default BoothMarker;
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/components/BoothMarkers.tsx b/apps/nowait-user/src/pages/waiting/boothMap/components/BoothMarkers.tsx
index 77249211..3a9a1582 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/components/BoothMarkers.tsx
+++ b/apps/nowait-user/src/pages/waiting/boothMap/components/BoothMarkers.tsx
@@ -1,33 +1,19 @@
-// import BoothMarker from "../../../../assets/icon/BoothMarker.svg?url";
-import MarkerTest from "../../../../assets/markerTest2.svg?url"
-import DotMarker from "../../../../assets/icon/DotMarker.svg?url";
-import React from "react";
-import { Marker } from "react-naver-maps";
+import BoothMarker from "./BoothMarker";
 
-interface BoothMarkersProps {
-  booths: { storeId: number; lat: number; lng: number }[];
-  openBooth: (id: number) => void;
-  zoomLevel: number;
-}
+const BoothMarkers = ({ booths, zoomLevel, openBooth }:any) => {
+  console.log(booths)
+  return (
+    <>
+      {booths.map((booth:any) => (
+        <BoothMarker
+          key={booth.storeId}
+          booth={booth}
+          zoomLevel={zoomLevel}
+          openBooth={openBooth}
+        />
+      ))}
+    </>
+  );
+};
 
-const BoothMarkers = React.memo(
-  ({ booths, openBooth, zoomLevel }: BoothMarkersProps) => {
-
-    return (
-      <>
-        {booths.map((booth) => (
-          <Marker
-            key={booth.storeId}
-            position={{ lat: booth.lat, lng: booth.lng }}
-            icon={{
-              url: zoomLevel >= 18 ? MarkerTest : DotMarker,
-            }}
-            onClick={() => openBooth(booth.storeId)}
-          />
-        ))}
-      </>
-    );
-  }
-);
-
-export default BoothMarkers;
+export default BoothMarkers;
\ No newline at end of file
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/components/MapHeader.tsx b/apps/nowait-user/src/pages/waiting/boothMap/components/MapHeader.tsx
index a2a26c72..fbbf60a0 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/components/MapHeader.tsx
+++ b/apps/nowait-user/src/pages/waiting/boothMap/components/MapHeader.tsx
@@ -8,11 +8,11 @@ import Cancel from "../../../../assets/icon/cancel.svg?react";
 import Portal from "../../../../components/common/modal/Portal";
 import SearchModal from "../../../../components/common/modal/SearchModal";
 
-const HomeHeader = React.memo(() => {
+const MapHeader = React.memo(() => {
   const [isMenuOpen, setIsMenuOpen] = useState(false);
   const [isSearchOpen, setIsSearchOpen] = useState(false);
   const navigate = useNavigate();
-  console.log("헤더 렌더링")
+  
   const toggleMenu = () => {
     setIsMenuOpen(!isMenuOpen);
   };
@@ -187,4 +187,4 @@ const HomeHeader = React.memo(() => {
   );
 });
 
-export default HomeHeader;
+export default MapHeader;
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/components/UniversityPolygon.tsx b/apps/nowait-user/src/pages/waiting/boothMap/components/UniversityPolygon.tsx
index e9a8bd3e..a5eef6d6 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/components/UniversityPolygon.tsx
+++ b/apps/nowait-user/src/pages/waiting/boothMap/components/UniversityPolygon.tsx
@@ -10,10 +10,10 @@ const UniversityPolygon = ({
   return (
     <Polygon
       paths={paths}
-      strokeWeight={2}
-      strokeColor="#ffffff"
+      strokeWeight={1}
+      strokeColor="#5e5e5e"
       strokeOpacity={0.8}
-      fillColor="#686868"
+      fillColor="#5c5c5c"
       fillOpacity={0.6}
     />
   );
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/CompassButton.tsx b/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/CompassButton.tsx
index b028ffe3..a07d8eb7 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/CompassButton.tsx
+++ b/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/CompassButton.tsx
@@ -1,16 +1,15 @@
 // import { useRef } from "react";
 import MyLocation from "../../../../../assets/icon/myLocation.svg?react";
 import { isCompassModeStore } from "../../../../../stores/mapStore";
-import { useNavermaps } from "react-naver-maps";
+import { useMap, useNavermaps } from "react-naver-maps";
 
 const CompassButton = ({
-  map,
   center,
 }: {
-  map: any;
   center: { lat: number; lng: number };
 }) => {
   const { isCompassMode, setIsCompassMode } = isCompassModeStore();
+  const map = useMap();
   const navermaps = useNavermaps();
 
   const handleClick = async () => {
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/MapControls.tsx b/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/MapControls.tsx
index bad40389..26b881c6 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/MapControls.tsx
+++ b/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/MapControls.tsx
@@ -5,10 +5,8 @@ import UniversityListModal from "./UniversityListModal";
 import CompassButton from "./CompassButton";
 
 const MapControlButtons = ({
-  map,
   center,
 }: {
-  map: any
   center: { lat: number; lng: number };
 }) => {
   const modal = useModal();
@@ -24,11 +22,11 @@ const MapControlButtons = ({
         >
           <University width="22px" height="22px" />
         </button>
-        <CompassButton map={map} center={center} />
+        <CompassButton center={center} />
       </div>
       {modal.isOpen === true && (
         <Portal>
-          <UniversityListModal  onClose={modal.close} map={map}/>
+          <UniversityListModal onClose={modal.close} />
         </Portal>
       )}
     </div>
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/UniversityListModal.tsx b/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/UniversityListModal.tsx
index 19563937..6d0f6e54 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/UniversityListModal.tsx
+++ b/apps/nowait-user/src/pages/waiting/boothMap/components/mapControls/UniversityListModal.tsx
@@ -1,12 +1,7 @@
 import { UNIVERSITY } from "../../constants/university";
-import { useNavermaps } from "react-naver-maps";
-const UniversityListModal = ({
-  map,
-  onClose,
-}: {
-  map: any;
-  onClose: () => void;
-}) => {
+import { useMap, useNavermaps } from "react-naver-maps";
+const UniversityListModal = ({ onClose }: { onClose: () => void }) => {
+  const map = useMap();
   const navermaps = useNavermaps();
 
   return (
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/constants/boothPosition.ts b/apps/nowait-user/src/pages/waiting/boothMap/constants/boothPosition.ts
index 30512d42..d6856881 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/constants/boothPosition.ts
+++ b/apps/nowait-user/src/pages/waiting/boothMap/constants/boothPosition.ts
@@ -6,5 +6,6 @@ export const BOOTHPOSITION: Record<number, { lat: number; lng: number }> = {
   2: { lat: 37.4547305, lng: 127.1350393 },
   3: { lat: 37.4547837, lng: 127.1350393 },
   4: { lat: 37.454837, lng: 127.1350286 },
-  5: { lat: 37.4548944, lng: 127.1350205 },
+  24: { lat: 37.4548944, lng: 127.1350205 },
+
 };
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/constants/university.ts b/apps/nowait-user/src/pages/waiting/boothMap/constants/university.ts
index 5cfddc93..9cc8ddfc 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/constants/university.ts
+++ b/apps/nowait-user/src/pages/waiting/boothMap/constants/university.ts
@@ -1,5 +1,6 @@
 import GachonLogo from "../../../../assets/logo/gachon.png";
 import KonkukLogo from "../../../../assets/logo/konkuk.png";
+import yeungnam from "../../../../assets/logo/yeungnam.png";
 
 export const UNIVERSITY = [
   {
@@ -21,9 +22,9 @@ export const UNIVERSITY = [
     lng: 126.95368082522316,
   },
   {
-    id: 1,
-    name: "영남대학교 서울캠퍼스",
-    logo: KonkukLogo,
+    id: 2,
+    name: "영남대학교",
+    logo: yeungnam,
     period: "9.30-10.1",
     festival: "녹색지대",
     lat: 37.4209795,
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/hooks/useGeoPolygon.ts b/apps/nowait-user/src/pages/waiting/boothMap/hooks/useGeoPolygon.ts
index 16163ab6..4e12a904 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/hooks/useGeoPolygon.ts
+++ b/apps/nowait-user/src/pages/waiting/boothMap/hooks/useGeoPolygon.ts
@@ -3,10 +3,12 @@ import { useEffect, useState } from "react";
 
 export const useGeoPolygon = () => {
   const [paths, setPaths] = useState<{ lat: number; lng: number }[][]>([]);
+
   useEffect(() => {
     const fetchPolygons = async () => {
       try {
         const { data } = await axios.get("/geojson/university.geojson");
+
         // 좌표 변환
         const coords = data.features.map((feature: any) => {
           return feature.geometry.coordinates[0].map(
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/hooks/useIsInsidePolyon.ts b/apps/nowait-user/src/pages/waiting/boothMap/hooks/useIsInsidePolyon.ts
new file mode 100644
index 00000000..86f0e877
--- /dev/null
+++ b/apps/nowait-user/src/pages/waiting/boothMap/hooks/useIsInsidePolyon.ts
@@ -0,0 +1,52 @@
+import { useEffect, useState } from "react";
+
+declare global {
+  interface Window {
+    naver: any;
+  }
+}
+
+interface LatLng {
+  lat: number;
+  lng: number;
+}
+
+export const useIsInsidePolygon = (paths: LatLng[][], location?: LatLng) => {
+  const [isInside, setIsInside] = useState(true);
+
+  useEffect(() => {
+    if (!paths.length || !location) return;
+
+    const check = () => {
+      if (
+        !window.naver?.maps?.geometry?.poly
+      ) {
+        // 🔥 geometry 아직이면 다시 시도
+        setTimeout(check, 200);
+        return;
+      }
+
+      const point = new window.naver.maps.LatLng(
+        location.lat,
+        location.lng
+      );
+
+      const insideAnyPolygon = paths.some((polygonPath) => {
+        const naverPath = polygonPath.map(
+          (p) => new window.naver.maps.LatLng(p.lat, p.lng)
+        );
+
+        return window.naver.maps.geometry.poly.containsPoint(
+          naverPath,
+          point
+        );
+      });
+
+      setIsInside(insideAnyPolygon);
+    };
+
+    check();
+  }, [paths, location]);
+
+  return isInside;
+};
\ No newline at end of file
diff --git a/apps/nowait-user/src/pages/waiting/boothMap/hooks/useMyLocation.ts b/apps/nowait-user/src/pages/waiting/boothMap/hooks/useMyLocation.ts
index 56b6cce1..79c6052d 100644
--- a/apps/nowait-user/src/pages/waiting/boothMap/hooks/useMyLocation.ts
+++ b/apps/nowait-user/src/pages/waiting/boothMap/hooks/useMyLocation.ts
@@ -4,16 +4,52 @@ export const useMyLocation = () => {
   const [location, setLocation] = useState({
     center: { lat: 33.450701, lng: 126.570667 },
     isLoading: true,
+    error: null as string | null,
   });
 
   useEffect(() => {
-    if (!navigator.geolocation) return;
-    navigator.geolocation.watchPosition((pos) => {
-      setLocation({
-        center: { lat: pos.coords.latitude, lng: pos.coords.longitude },
+    if (!navigator.geolocation) {
+      setLocation((prev) => ({
+        ...prev,
         isLoading: false,
-      });
+        error: "Geolocation not supported",
+      }));
+      return;
+    }
+
+    // 최초 위치
+    navigator.geolocation.getCurrentPosition(
+      (pos) => {
+        setLocation({
+          center: {
+            lat: pos.coords.latitude,
+            lng: pos.coords.longitude,
+          },
+          isLoading: false,
+          error: null,
+        });
+      },
+      () => {
+        setLocation((prev) => ({
+          ...prev,
+          isLoading: false,
+          error: "위치 정보를 가져올 수 없습니다",
+        }));
+      }
+    );
+
+    // 위치 변경 감지
+    const watchId = navigator.geolocation.watchPosition((pos) => {
+      setLocation((prev) => ({
+        ...prev,
+        center: {
+          lat: pos.coords.latitude,
+          lng: pos.coords.longitude,
+        },
+      }));
     });
+
+    return () => navigator.geolocation.clearWatch(watchId);
   }, []);
 
   return location;