diff --git a/.forgejo/workflows/ci-cd.yaml b/.forgejo/workflows/ci-cd.yaml
index b89ae3b44..2bf102922 100644
--- a/.forgejo/workflows/ci-cd.yaml
+++ b/.forgejo/workflows/ci-cd.yaml
@@ -32,7 +32,11 @@ jobs:
               ca=["/etc/ssl/certs/ca-certificates.crt"]
       - name: Tag Version
         run: |
-          echo "IMAGE_VERSION=latest"
+          if [ "${{ github.ref_type }}" == "tag" ]; then
+            echo "IMAGE_VERSION=${{ github.ref_name }}" >> $GITHUB_ENV
+          else
+            echo "IMAGE_VERSION=latest" >> $GITHUB_ENV
+          fi
       - name: Login in to registry
         uses: docker/login-action@v2
         with:
diff --git a/src/modules/15_development/components/scholarship/DetailView.vue b/src/modules/15_development/components/scholarship/DetailView.vue
index 05ec17335..50ea302a7 100644
--- a/src/modules/15_development/components/scholarship/DetailView.vue
+++ b/src/modules/15_development/components/scholarship/DetailView.vue
@@ -306,7 +306,7 @@ async function fetchDataDetail(id: string) {
       isStatus.value = data.status;
       isGov.value = data.citizenId ? true : false;
       isGuarantor.value = data.guarantorCitizenId ? true : false;
-      if (isStatus.value !== "PENDING") {
+      if (isStatus.value === "GRADUATE" || isStatus.value === "NOTGRADUATE") {
         router.push(`/development/scholarship-detail/${id}`);
       }
     })
@@ -678,6 +678,27 @@ async function uploadFileDoc(uploadUrl: string, file: any) {
     });
 }
 
+/** ฟังก์ชั่นแปลงสถานะ */
+function conventStatus(val: string, type: string) {
+  switch (val) {
+    case "PENDING":
+      if (type === "TRAINING") {
+        return "อยู่ระหว่างฝึกอบรม";
+      } else if (type === "DOMESTICE" || type === "STUDY") {
+        return "อยู่ระหว่างศึกษา";
+      }
+      return "";
+    case "REPORTED":
+      return "รายงานตัวกลับเข้าปฏิบัติราชการแล้ว";
+    case "GRADUATE":
+      return "เรียนจบ";
+    case "NOTGRADUATE":
+      return "เรียนไม่จบ";
+    default:
+      return "";
+  }
+}
+
 /** ดึงข้อมูลเมื่อคอมโพเนนต์โหลดเสร็จสมบูรณ์  */
 onMounted(async () => {
   if (scholarshipId.value) {
@@ -772,27 +793,38 @@ onMounted(async () => {
           </q-menu>
         </q-btn>
       </div>
-      <div class="q-gutter-sm" v-if="isStatus === 'REPORTED'">
+
+      <div
+        class="q-gutter-sm"
+        v-if="isStatus === 'REPORTED' && !checkRouteDetail"
+      >
         <q-btn
-          v-if="!checkRouteDetail"
           unelevated
           color="green"
           label="เรียนจบ"
           @click="onClickUpdateStatus('GRADUATE')"
         />
         <q-btn
-          v-if="!checkRouteDetail"
           unelevated
           color="red"
           label="เรียนไม่จบ"
           @click="onClickUpdateStatus('NOTGRADUATE')"
         />
       </div>
+
       <div
-        v-if="isStatus === 'GRADUATE' || isStatus === 'NOTGRADUATE'"
-        :class="isStatus === 'GRADUATE' ? 'text-green' : 'text-red'"
+        v-if="
+          checkRouteDetail || isStatus === 'PENDING' || isStatus !== 'REPORTED'
+        "
+        :class="
+          isStatus === 'GRADUATE'
+            ? 'text-green'
+            : isStatus === 'NOTGRADUATE'
+            ? 'text-red'
+            : ''
+        "
       >
-        {{ isStatus === "GRADUATE" ? "เรียนจบ" : "เรียนไม่จบ" }}
+        {{ conventStatus(isStatus, formBody.scholarshipType) }}
       </div>
     </div>
   </div>