diff --git a/Dockerfile b/Dockerfile
index ca7824b..6d14335 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,13 +9,17 @@ RUN apk -U upgrade \
   && apk --no-cache add git \
   && adduser -g ${GID} -u ${UID} --disabled-password --gecos "" matrix-to
 
-RUN git clone https://github.com/matrix-org/matrix.to \
-  && cd matrix.to \
-  && yarn \
-  && yarn build
-  
 USER matrix-to
-  
+
+WORKDIR /home/matrix-to
+
+RUN git clone https://github.com/matrix-org/matrix.to
+
+WORKDIR /home/matrix-to/matrix.to
+
+RUN yarn \
+  && yarn build
+
 EXPOSE 5000
 
 ENTRYPOINT ["yarn", "start"]