diff --git a/Dockerfile b/Dockerfile
index 6bf2088..3c25131 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -123,12 +123,11 @@ RUN mkdir -p /home/renderer/src \
 USER renderer
 
 # Configure stylesheet
-WORKDIR /home/renderer/src
-RUN git clone https://github.com/gravitystorm/openstreetmap-carto.git \
- && git -C openstreetmap-carto checkout v4.23.0
-WORKDIR /home/renderer/src/openstreetmap-carto
-USER root
-RUN npm install -g carto@0.18.2
+RUN mkdir -p /home/renderer/src \
+ && git clone https://github.com/gravitystorm/openstreetmap-carto.git \
+ && git -C openstreetmap-carto checkout v4.23.0 \
+ && openstreetmap-carto \
+ && npm install -g carto@0.18.2
 USER renderer
 RUN carto project.mml > mapnik.xml