diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index 3f20ceb..2d7d8ff 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -1,18 +1,24 @@
 # syntax=docker/dockerfile:3
 
-FROM alpine:3.15
+FROM alpine:latest
 
-#SHELL ["/bin/ash", "-ex", "-c"]
-
-ENV ELECTRUM_USER=api
-ENV ELECTRUM_PASSWORD=changeme
-
-ENV HOME=/home/electrum
-#ENV TESTNET=false
+LABEL name="Electrum client"
+LABEL project="electrum"
 
 EXPOSE 7000
 
-RUN adduser -D -h $HOME electrum
+ENV USER_UID=2000
+ENV USER_GID=2000
+ENV HOME=/home/electrum
+
+ENV ELECTRUM_USER=electrum_api
+ENV ELECTRUM_PASSWORD=electrum_password
+#ENV TESTNET=false
+
+#SHELL ["/bin/ash", "-ex", "-c"]
+
+RUN addgroup -g $USER_GID electrum ;\
+	adduser -D -h $HOME -u $USER_UID -G electrum electrum
 
 RUN apk --no-cache add electrum
 
diff --git a/README.md b/README.md
index a4c345f..18e2776 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,8 @@ Container images are configured using parameters passed at runtime.
 |:--------|:-------|
 |-p 7000|JSON-RPC API port TCP|
 |-e ELECTRUM_TESTNET=|Set 1 to enable bitcoin testnet mode. Default: `0`|
-|-e ELECTRUM_API_USER=|JSON-RPC API user. Default: `api`|
-|-e ELECTRUM_API_PASSWORD=|JSON-RPC API password. Default: `changeme`|
+|-e ELECTRUM_API_USER=|JSON-RPC API user. Default: `electrum_api`|
+|-e ELECTRUM_API_PASSWORD=|JSON-RPC API password. Default: `electrum_password`|
+|-e USER_UID=|Electrum user id. Default: `2000`|
+|-e USER_GID=|Electrum user gid. Default: `2000`|