diff --git a/docker/Dockerfile b/docker/Dockerfile
index a9ec2b2..83e0dbc 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 # should be run from root directory of heplify-server
 # sudo docker build --no-cache -t sipcapture/heplify-server -f docker/Dockerfile . 
-FROM golang:alpine as builder
+FROM golang:alpine AS builder
 
 RUN apk update && apk add --no-cache git build-base 
 RUN git clone https://luajit.org/git/luajit-2.0.git \
@@ -17,7 +17,7 @@ RUN apk update
 RUN apk --no-cache add ca-certificates bash
 RUN apk upgrade
 
-WORKDIR /root/
+WORKDIR /app/
 COPY --from=builder /heplify-server/cmd/heplify-server/heplify-server .
 COPY --from=builder /heplify-server/scripts ./scripts
 CMD ["./heplify-server"]
diff --git a/docker/dockerfile-arm b/docker/dockerfile-arm
index c40ae97..4ba1676 100644
--- a/docker/dockerfile-arm
+++ b/docker/dockerfile-arm
@@ -1,7 +1,7 @@
 # mv dockerfile-arm Dockerfile
 # docker buildx build --load --platform=linux/arm64 .
 
-FROM --platform=$BUILDPLATFORM golang:alpine as builder
+FROM --platform=$BUILDPLATFORM golang:alpine AS builder
 
 RUN apk update && apk add --no-cache git build-base
 
@@ -17,6 +17,6 @@ RUN CGO_ENABLED=1 GOOS=linux go build -a --ldflags '-linkmode external -extldfla
 
 FROM alpine:latest
 RUN apk --no-cache add ca-certificates
-WORKDIR /root/
+WORKDIR /app/
 COPY --from=builder /go/src/github.com/sipcapture/heplify-server/cmd/heplify-server/heplify-server .
 COPY --from=builder /go/src/github.com/sipcapture/heplify-server/scripts ./scripts