diff --git a/Dockerfile b/Dockerfile
index ace6017..2ef7533 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -52,13 +52,13 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -q \
     libboost-date-time1.67.0 libboost-filesystem1.67.0 libboost-system1.67.0 libboost-program-options1.67.0 python && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
-COPY --from=build /home/valhalla/node-valhalla.tar /home/valhalla/valhalla.tar /home/valhalla/prime_server.tar /home/valhalla/
+COPY --from=build /home/valhalla/node-valhalla.tar /home/valhalla/valhalla.tar /home/valhalla/prime_server.tar /home/
 
-RUN cd / && tar -xf /home/valhalla/valhalla.tar && tar -xf /home/valhalla/prime_server.tar && rm /home/valhalla/*.tar && ldconfig
+RUN cd / && tar -xf /home/valhalla.tar && tar -xf /home/prime_server.tar && rm /home/*.tar && ldconfig
 
 ADD home /home
 
-RUN cd /home/valhalla && valhalla_build_config \
+RUN cd /home && valhalla_build_config \
     --service-limits-bicycle-max-matrix-locations 10000 \
     --service-limits-bicycle-max-matrix-distance 500000 \
     --service-limits-motor-scooter-max-matrix-locations 10000 \
@@ -79,10 +79,10 @@ RUN cd /home/valhalla && valhalla_build_config \
     --service-limits-motorcycle-max-matrix-distance 500000 \
     --service-limits-bus-max-matrix-locations 10000 \
     --service-limits-bus-max-matrix-distance 5000000 \
-    --mjolnir-tile-dir ${PWD}/valhalla_tiles \
-    --mjolnir-tile-extract ${PWD}/valhalla_tiles.tar \
-    --mjolnir-timezone ${PWD}/valhalla_tiles/timezones.sqlite \
-    --mjolnir-admin ${PWD}/valhalla_tiles/admins.sqlite > valhalla.json
+    --mjolnir-tile-dir /home/valhalla/valhalla_tiles \
+    --mjolnir-tile-extract /home/valhalla/valhalla_tiles.tar \
+    --mjolnir-timezone /home/valhalla/valhalla_tiles/timezones.sqlite \
+    --mjolnir-admin /home/valhalla/valhalla_tiles/admins.sqlite > valhalla.json
 
 CMD /home/start.sh
 
diff --git a/README.md b/README.md
index fdaf899..4096453 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@ docker build -t valhalla .
 
 ```
 docker run -it -d --restart always \
-    -v /home/test/russia-latest.osm.pbf:/home/valhalla/data.osm.pbf \
+    -v /home/test/russia-latest.osm.pbf:/home/data.osm.pbf \
+    -v /home/valhalla-cache:/home/valhalla \
     --name valhalla -p 8002:8002 valhalla
 ```
diff --git a/home/start.sh b/home/start.sh
index e70b8a1..7c52c6b 100755
--- a/home/start.sh
+++ b/home/start.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-cd /home/valhalla
+cd /home
 
-if [ valhalla_tiles.tar -ot data.osm.pbf ]; then
+if [ /home/valhalla/valhalla_tiles.tar -ot /home/data.osm.pbf ]; then
     /home/update.sh
 fi
 
diff --git a/home/update.sh b/home/update.sh
index fd22cf8..a8d52e8 100755
--- a/home/update.sh
+++ b/home/update.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 cd /home/valhalla
-valhalla_build_tiles -c valhalla.json data.osm.pbf
+valhalla_build_tiles -c /home/valhalla.json /home/data.osm.pbf
 find valhalla_tiles | sort -n | tar cf valhalla_tiles2.tar --no-recursion -T -
 rm -rf valhalla_tiles *.bin *.txt
 mv valhalla_tiles2.tar valhalla_tiles.tar