diff --git a/src/components/Workflow/Main.vue b/src/components/Workflow/Main.vue
index a4bb315e6..618a6936f 100644
--- a/src/components/Workflow/Main.vue
+++ b/src/components/Workflow/Main.vue
@@ -53,8 +53,8 @@ const typeSelectPerson = ref<string>("");
 //รายการระบบที่ต้องการ disable step 3 หรือรองสุดท้าย
 const displayArray = <string[]>[
   "REGISTRY_PROFILE",
-  "RETIREMENT_RESIFNATION",
-  "LEAVE_LIST",
+  "SYS_RETIREMENT",
+  "SYS_LEAVE_LIST",
 ];
 
 async function fetchCheckState() {
diff --git a/src/modules/02_organization/views/main.vue b/src/modules/02_organization/views/main.vue
index ec07f4a0c..974fe7088 100644
--- a/src/modules/02_organization/views/main.vue
+++ b/src/modules/02_organization/views/main.vue
@@ -30,7 +30,6 @@ import DialogCreateCommandORG from "@/modules/18_command/components/DialogCreate
 const $q = useQuasar();
 const { showLoader, hideLoader, messageError, date2Thai } = useCounterMixin();
 const store = useOrganizational();
-const keycloakSystem = ref<string>("ORG_COMMAND");
 
 /** ตัวแปร*/
 const modalNewStructure = ref<boolean>(false); // เพิ่มโครงสร้าง
@@ -130,7 +129,7 @@ function onClickHistory(id: string, name: string) {
 async function workflowSystem() {
   showLoader();
   http
-    .get(config.API.workflowKeycloakSystem(keycloakSystem.value))
+    .get(config.API.workflowKeycloakSystem("SYS_ORG"))
     .then((res) => {
       const data = res.data.result;
       store.isOfficer = data.isOfficer;
diff --git a/src/modules/05_placement/components/Other/OtherDetail.vue b/src/modules/05_placement/components/Other/OtherDetail.vue
index 04204d097..9f797cbc6 100644
--- a/src/modules/05_placement/components/Other/OtherDetail.vue
+++ b/src/modules/05_placement/components/Other/OtherDetail.vue
@@ -32,12 +32,8 @@ const {
   success,
 } = mixin;
 
-const isOfficer = ref<boolean | null>(null);
-const isStaff = ref<boolean | null>(null);
-
 const paramsId = route.params.id;
 const myForm = ref<QForm | null>(null);
-const roleAdmin = ref<boolean>(false);
 const dataProfile = ref<DataProfile>(); //ข้อมุลส่วนตัว
 const edit = ref<boolean>(false);
 const status = ref<string>("");
@@ -143,27 +139,7 @@ const getClass = (val: boolean) => {
   };
 };
 
-async function getWorkFlow() {
-  showLoader();
-  await http
-    .get(config.API.workflowKeycloakSystem("ORG_COMMAND"))
-    .then(async (res) => {
-      const data = await res.data.result;
-      isOfficer.value = data.isOfficer;
-      isStaff.value = data.isStaff;
-      roleAdmin.value = data.isOfficer;
-      hideLoader();
-    })
-    .catch((e) => {
-      messageError($q, e);
-      hideLoader();
-    })
-    .finally(() => {});
-}
-
 onMounted(async () => {
-  getWorkFlow();
-
   fetchData();
 });
 </script>
diff --git a/src/modules/06_retirement/components/resign/ResignReject.vue b/src/modules/06_retirement/components/resign/ResignReject.vue
index 422b67dd6..4763e922e 100644
--- a/src/modules/06_retirement/components/resign/ResignReject.vue
+++ b/src/modules/06_retirement/components/resign/ResignReject.vue
@@ -836,7 +836,7 @@ onMounted(async () => {
       ref="workflowRef"
       v-model:is-check-data="isCheckData"
       :id="id"
-      sys-name="RETIREMENT_RESIFNATION"
+      sys-name="SYS_RETIREMENT"
     />
   </div>
 
diff --git a/src/modules/09_leave/components/2_Leave/DetailLeave.vue b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
index 0119a7956..bdb15c37e 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeave.vue
+++ b/src/modules/09_leave/components/2_Leave/DetailLeave.vue
@@ -808,7 +808,7 @@ onMounted(async () => {
               ref="workflowRef"
               :id="paramsId"
               v-model:is-check-data="isCheckData"
-              sys-name="LEAVE_LIST"
+              sys-name="SYS_LEAVE_LIST"
             />
           </div>
         </div>
diff --git a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
index ded00d4b5..68adf2d30 100644
--- a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
+++ b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue
@@ -709,7 +709,11 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
 
           <!-- Workflow -->
           <div class="col-xs-12 col-sm-12">
-            <WorkFlow ref="workflowRef" :id="paramsId" sys-name="LEAVE_LIST" />
+            <WorkFlow
+              ref="workflowRef"
+              :id="paramsId"
+              sys-name="SYS_LEAVE_LIST"
+            />
           </div>
         </div>
       </div>
diff --git a/src/modules/17_acting/views/main.vue b/src/modules/17_acting/views/main.vue
index 20f9458fa..43d65d707 100644
--- a/src/modules/17_acting/views/main.vue
+++ b/src/modules/17_acting/views/main.vue
@@ -29,7 +29,6 @@ const { showLoader, hideLoader, messageError, dialogRemove } =
   useCounterMixin();
 
 /** โครงสร้าง*/
-const keycloakSystem = ref<string>("ORG_COMMAND");
 const expanded = ref<Array<string>>([]);
 const filter = ref<string>("");
 const nodeTree = ref<DataTree[]>([]);
@@ -261,7 +260,7 @@ function onDelete(id: string) {
 function getWorkFlow() {
   showLoader();
   http
-    .get(config.API.workflowKeycloakSystem(keycloakSystem.value))
+    .get(config.API.workflowKeycloakSystem("SYS_ACTING"))
     .then((res) => {
       const data = res.data.result;
       storeActing.isOfficer = data.isOfficer;