diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml
index ca8c53977..bdf7a0d94 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-mgt:@build_version@ hrms-git.chin.in.th/bma-hrms/hrms-mgt:latest
+      tags: '@server@/bma-hrms/hrms-mgt:@build_version@ @server@/bma-hrms/hrms-mgt:latest'
     platforms: linux/amd64
     condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
   triggers:
@@ -91,7 +91,7 @@ jobs:
     name: build docker image
     dockerfile: ./docker/Dockerfile
     output: !RegistryOutput
-      tags: hrms-git.bangkok.go.th/bma-hrms/hrms-mgt:@build_version@ hrms-git.bangkok.go.th/bma-hrms/hrms-mgt:latest
+      tags: '@server@/bma-hrms/hrms-mgt:@build_version@ @server@/bma-hrms/hrms-mgt:latest'
     condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
   triggers:
   - !TagCreateTrigger
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0885091e3..c9b81acf3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,7 @@
 # docker buildx build --platform=linux/amd64 -f docker/Dockerfile . -t hrms-git.chin.in.th/bma-hrms/hrms-mgt:0.1
 
 # Build Stage
-FROM node:20-alpine as build-stage
+FROM node:20-alpine AS build-stage
 WORKDIR /app
 COPY package*.json ./
 RUN npm install