diff --git a/Dockerfile b/Dockerfile
index 7a2770ce9a..0e7a91e96c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,20 @@
 FROM golang:latest
 
-ARG BOR_DIR=/bor
+ARG BOR_DIR=/var/lib/bor
 ENV BOR_DIR=$BOR_DIR
 
 RUN apt-get update -y && apt-get upgrade -y \
     && apt install build-essential git -y \
-    && mkdir -p /bor
+    && mkdir -p ${BOR_DIR}
 
 WORKDIR ${BOR_DIR}
 COPY . .
 RUN make bor
 
-RUN cp build/bin/bor /usr/local/bin/
+RUN cp build/bin/bor /usr/bin/
+RUN groupadd -g 10137 bor \
+    && useradd -u 10137 --no-log-init --create-home -r -g bor bor \
+    && chown -R bor:bor ${BOR_DIR}
 
 ENV SHELL /bin/bash
 EXPOSE 8545 8546 8547 30303 30303/udp
diff --git a/Dockerfile.alltools b/Dockerfile.alltools
index a3f36d4a04..1c4437e251 100644
--- a/Dockerfile.alltools
+++ b/Dockerfile.alltools
@@ -13,6 +13,6 @@ RUN set -x \
     && apk add --update --no-cache \
        ca-certificates \
     && rm -rf /var/cache/apk/*
-COPY --from=builder /bor/build/bin/* /usr/local/bin/
+COPY --from=builder /bor/build/bin/* /usr/bin/
 
 EXPOSE 8545 8546 30303 30303/udp
diff --git a/Dockerfile.release b/Dockerfile.release
index 66dd589e82..cd90450bc3 100644
--- a/Dockerfile.release
+++ b/Dockerfile.release
@@ -1,10 +1,20 @@
 FROM alpine:3.14
 
+ARG BOR_DIR=/var/lib/bor
+ENV BOR_DIR=$BOR_DIR
+
 RUN apk add --no-cache ca-certificates && \
-    mkdir -p /etc/bor
-COPY bor /usr/local/bin/
-COPY builder/files/genesis-mainnet-v1.json /etc/bor/
-COPY builder/files/genesis-testnet-v4.json /etc/bor/
+    mkdir -p ${BOR_DIR}
+
+WORKDIR ${BOR_DIR}
+COPY bor /usr/bin/
+COPY builder/files/genesis-mainnet-v1.json ${BOR_DIR}
+COPY builder/files/genesis-testnet-v4.json ${BOR_DIR}
+RUN groupadd -g 10137 bor \
+    && useradd -u 10137 --no-log-init --create-home -r -g bor bor \
+    && chown -R bor:bor ${BOR_DIR}
+
+USER bor
 
 EXPOSE 8545 8546 8547 30303 30303/udp
 ENTRYPOINT ["bor"]