diff --git a/Dockerfile b/Dockerfile
index a366460..96bff06 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,6 +18,16 @@ WORKDIR /usr/src/huellas
 # This is an empty build to get the dependencies cached.
 RUN cargo build --release
 
+# Install typescript dependencies
+WORKDIR /usr/src/huellas/ts-client/
+RUN npm install
+
+# Install Typescript
+RUN npm install -g typescript
+
+# Set the working directory
+WORKDIR /usr/src/huellas
+
 # Now copy in the rest of the sources
 COPY src /usr/src/huellas/src/
 COPY migrations /usr/src/huellas/migrations/
@@ -36,12 +46,6 @@ COPY ts-client /usr/src/huellas/ts-client/
 # Set the working directory
 WORKDIR /usr/src/huellas/ts-client/
 
-# Install dependencies
-RUN npm install
-
-# Install Typescript
-RUN npm install -g typescript
-
 # Transpile
 RUN tsc
 
@@ -62,4 +66,5 @@ COPY --from=builder /usr/src/huellas/ts-client/build/client.js /usr/local/bin/st
 RUN sed -i '1d' /usr/local/bin/static/client.js
 
 # Run the application
+WORKDIR /usr/local/bin
 CMD ["/usr/local/bin/huellas"]