diff --git a/Dockerfile b/Dockerfile
index 5283cf6..e3e573b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,22 @@
-FROM alpine:latest
+FROM ubuntu:latest
+ 
+RUN apt-get update
+RUN apt-get install -y libc++-dev
 
-RUN apk add --no-cache gcompat libstdc++
+WORKDIR /master-server
 
-COPY --chmod=755 ./linux-x64-release/alterware-master /usr/local/bin/
+RUN groupadd alterware-master && useradd -r -g alterware-master alterware-master
+
+RUN mkdir -p /master-server && \
+    chown alterware-master:alterware-master /master-server && \
+    chmod 775 /master-server
+
+COPY --chown=alterware-master:alterware-master --chmod=755 ./linux-x64-release/alterware-master /master-server
 
-RUN addgroup -S alterware-master && adduser -S alterware-master -G alterware-master
 USER alterware-master
 
 EXPOSE 20810/udp
 
 ENV AW_STATS_LOCATION=""
 
-ENTRYPOINT ["/usr/local/bin/alterware-master"]
+ENTRYPOINT ["/master-server/alterware-master"]