diff --git a/Dockerfile b/Dockerfile
index c89b804..17aa013 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,21 @@
-FROM alpine:3.5
-WORKDIR /app/build
-COPY . /app
-RUN apk add --no-cache g++ make cmake libmpdclient-dev openssl-dev
-RUN cmake ..
+FROM registry.gitlab.com/dedyms/sid-slim:latest AS tukang
+WORKDIR /src
+RUN apt update && apt install -y --no-install-recommends build-essential cmake libmpdclient-dev libssl-dev unzip
+#ADD https://github.com/notandy/ympd/archive/master.zip master.zip
+#ADD https://github.com/SuperBFG7/ympd/archive/refs/heads/master.zip master.zip
+ADD https://github.com/martadinata666/ympd-1/archive/refs/heads/master.zip master.zip
+RUN unzip master.zip -d /src/
+RUN cmake /src/ympd-1-master/
 RUN make
 
-FROM alpine:3.5
-RUN apk add  --no-cache libmpdclient openssl
-EXPOSE 8080
-COPY --from=0 /app/build/ympd /usr/bin/ympd
-COPY --from=0 /app/build/mkdata /usr/bin/mkdata
-CMD ympd
\ No newline at end of file
+FROM registry.gitlab.com/dedyms/sid-slim:latest
+RUN apt update && apt install -y libmpdclient2 openssl && rm -rf /var/lib/apt/lists/* && apt clean
+WORKDIR $HOME
+COPY --chown=$CONTAINERUSER:$CONTAINERUSER --from=tukang /src/ympd $HOME/.local/bin/ympd
+COPY --chown=$CONTAINERUSER:$CONTAINERUSER --from=tukang /src/mkdata $HOME/.local/bin/mkdata
+ENV MPD_SERVER=0.0.0.0
+ENV MPD_PORT=6600
+ENV WEBPORT=8080
+EXPOSE 8080/tcp
+USER $CONTAINERUSER
+CMD ympd -h $MPD_SERVER -p $MPD_PORT