diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml
index b68fa9f7..4517b830 100644
--- a/.onedev-buildspec.yml
+++ b/.onedev-buildspec.yml
@@ -40,7 +40,7 @@ jobs:
     name: build docker image
     dockerfile: ./docker/Dockerfile
     output: !RegistryOutput
-      tags: hrms-git.chin.in.th/bma-hrms/hrms-manual:@build_version@ hrms-git.chin.in.th/bma-hrms/hrms-manual:latest
+      tags: '@server@/bma-hrms/hrms-manual:@build_version@ @server@/bma-hrms/hrms-manual: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-manual:@build_version@ hrms-git.bangkok.go.th/bma-hrms/hrms-manual:latest
+      tags: '@server@/bma-hrms/hrms-manual:@build_version@ @server@/bma-hrms/hrms-manual:latest'
     condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
   triggers:
   - !TagCreateTrigger