diff --git a/Dockerfile b/Dockerfile
index 7a20a51..ba0b61d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,10 +13,10 @@ LABEL \
 RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash && \
 	apt-get -y --no-install-recommends install >/dev/null \
 		nodejs \
-		yarn \
-	git && \
+		git && \
 	apt-get clean && \
-	rm -rf /var/lib/apt/lists/*
+	rm -rf /var/lib/apt/lists/* && \
+	npm install --global yarn
 
 #RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash
 #ENV NVM_DIR=/root/.nvm
@@ -32,7 +32,7 @@ RUN git clone https://gitlab.com/RemixDev/deemix-gui.git --recursive && \
 
 WORKDIR /deemix-gui/server
 
-RUN npm install
+RUN yarn install
 
 COPY root/ /
 
diff --git a/root/etc/services.d/deemix/run b/root/etc/services.d/deemix/run
index d84507d..cbc5d0f 100644
--- a/root/etc/services.d/deemix/run
+++ b/root/etc/services.d/deemix/run
@@ -10,4 +10,4 @@ cd /deemix-gui/server
 HOME=/deem
 
 echo "[services.d] Starting Deemix"
-s6-setuidgid abc npm start
\ No newline at end of file
+s6-setuidgid abc yarn start
\ No newline at end of file