diff --git a/apps/client/app/(afterLogin)/my-study/_components/AssignmentStatusBox.tsx b/apps/client/app/(afterLogin)/my-study/_components/AssignmentStatusBox.tsx
index 256f8937..8a4535d6 100644
--- a/apps/client/app/(afterLogin)/my-study/_components/AssignmentStatusBox.tsx
+++ b/apps/client/app/(afterLogin)/my-study/_components/AssignmentStatusBox.tsx
@@ -5,7 +5,7 @@ import { padWithZero, parseISODate } from "@wow-class/utils";
 import { routePath } from "constants/routePath";
 import Link from "next/link";
 import type { ComponentProps } from "react";
-import type { AssignmentSubmissionStatusType } from "types/entities/common/assignment";
+import type { AssignmentSubmissionStatusType } from "types/entities/myStudy";
 import Box from "wowds-ui/Box";
 import Button from "wowds-ui/Button";
 import Tag from "wowds-ui/Tag";
diff --git a/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/AssignmentOverviewBox/AssignmentBoxButtons.tsx b/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/AssignmentOverviewBox/AssignmentBoxButtons.tsx
index 041ee9b3..32c7ab77 100644
--- a/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/AssignmentOverviewBox/AssignmentBoxButtons.tsx
+++ b/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/AssignmentOverviewBox/AssignmentBoxButtons.tsx
@@ -107,6 +107,7 @@ const PrimaryButton = ({
   const stroke = buttonsDisabled ? "mono100" : "primary";
   const link =
     assignmentSubmissionStatus === null ? repositoryLink : submissionLink;
+
   return (
     <Button
       asProp={Link}
@@ -137,7 +138,12 @@ const SecondaryButton = ({
     if (response.success) {
       //TODO: 과제 제출 이후에는 과제 상태에 대한 업데이트 필요
       //이번주 과제 조회 api, 대시보드 api revaliate
-      revalidateTagByName(tags.studyDetailDashboard);
+      revalidateTagByName(
+        assignmentSubmissionStatus === null
+          ? tags.studyDetailDashboard
+          : tags.upcomingStudy
+      );
+      revalidateTagByName(tags.studyHistory);
     }
   };
 
diff --git a/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/AssignmentOverviewBox/AssignmentBoxInfo.tsx b/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/AssignmentOverviewBox/AssignmentBoxInfo.tsx
index 2ee65756..496d14dc 100644
--- a/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/AssignmentOverviewBox/AssignmentBoxInfo.tsx
+++ b/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentContent/AssignmentOverviewBox/AssignmentBoxInfo.tsx
@@ -3,14 +3,15 @@ import { Text } from "@wow-class/ui";
 import { padWithZero, parseISODate } from "@wow-class/utils";
 import Image from "next/image";
 import type { Assignment } from "types/dtos/studyDetail";
-import { getAssignmentGithubFolderName } from "utils/getAssignmentGithubFolderName";
 
 import { FailurePopover } from "./FailurePopover";
 interface AssignmentBoxInfoProps {
   assignment: Assignment;
 }
 
-export const AssignmentBoxInfo = ({ assignment }: AssignmentBoxInfoProps) => {
+export const AssignmentBoxInfo = async ({
+  assignment,
+}: AssignmentBoxInfoProps) => {
   const {
     deadline,
     assignmentSubmissionStatus,
@@ -36,7 +37,7 @@ export const AssignmentBoxInfo = ({ assignment }: AssignmentBoxInfoProps) => {
           <Text as="div" color="sub">
             제출한 과제
             <Text as="span" color="textBlack">
-              {getAssignmentGithubFolderName(submissionLink)}
+              과제 이름
             </Text>
           </Text>
           <Image alt="dot" height={6} src="/images/dot.svg" width={6} />
diff --git a/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentHistory/AssignmentHistoryItem.tsx b/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentHistory/AssignmentHistoryItem.tsx
index 7ad760db..e4ed7767 100644
--- a/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentHistory/AssignmentHistoryItem.tsx
+++ b/apps/client/app/(afterLogin)/my-study/my-assignment/_components/AssignmentHistory/AssignmentHistoryItem.tsx
@@ -114,6 +114,7 @@ const tagContainerStyle = css({
   paddingX: "22px",
   width: "129px",
   alignItems: "center",
+  flexDirection: "column",
 });
 
 const assignmentSubmissionMap: Record<