diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml
index d434821..0c6114d 100644
--- a/.onedev-buildspec.yml
+++ b/.onedev-buildspec.yml
@@ -1,4 +1,4 @@
-version: 37
+version: 38
 jobs:
 - name: CI for UAT
   steps:
@@ -40,7 +40,7 @@ jobs:
     name: build docker image
     dockerfile: ./docker/Dockerfile
     output: !RegistryOutput
-      tags: hrms-git.chin.in.th/bma-hrms/hrms-api-kpi:@build_version@ hrms-git.chin.in.th/bma-hrms/hrms-api-kpi:latest
+      tags: '@server@/bma-hrms/hrms-api-kpi:@build_version@ @server@/bma-hrms/hrms-api-kpi:latest'
     condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
   triggers:
   - !TagCreateTrigger
@@ -90,7 +90,7 @@ jobs:
     name: build docker image
     dockerfile: ./docker/Dockerfile
     output: !RegistryOutput
-      tags: hrms-git.bangkok.go.th/bma-hrms/hrms-api-kpi:@build_version@ hrms-git.bangkok.go.th/bma-hrms/hrms-api-kpi:latest
+      tags: '@server@/bma-hrms/hrms-api-kpi:@build_version@ @server@/bma-hrms/hrms-api-kpi:latest'
     condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
   triggers:
   - !TagCreateTrigger