diff --git a/Dockerfile b/Dockerfile
index 883248f6..dac43ea3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -68,6 +68,7 @@ RUN apt-get update \
  mapnik-utils \
  npm \
  osm2pgsql \
+ osmctools \
  osmium-tool \
  osmosis \
  postgresql-$PG_VERSION \
diff --git a/run.sh b/run.sh
index ddd9af9b..ec08600b 100755
--- a/run.sh
+++ b/run.sh
@@ -67,13 +67,19 @@ if [ "$1" == "import" ]; then
         DOWNLOAD_POLY="https://download.geofabrik.de/europe/luxembourg.poly"
     fi
 
+    if [ -n "${DOWNLOAD_POLY:-}" ]; then
+        echo "INFO: Download PBF-POLY file: $DOWNLOAD_POLY"
+        wget ${WGET_ARGS:-} "$DOWNLOAD_POLY" -O /data/region.poly
+    fi
+
     if [ -n "${DOWNLOAD_PBF:-}" ]; then
         echo "INFO: Download PBF file: $DOWNLOAD_PBF"
-        wget ${WGET_ARGS:-} "$DOWNLOAD_PBF" -O /data/region.osm.pbf
-        if [ -n "${DOWNLOAD_POLY:-}" ]; then
-            echo "INFO: Download PBF-POLY file: $DOWNLOAD_POLY"
-            wget ${WGET_ARGS:-} "$DOWNLOAD_POLY" -O /data/region.poly
+        if [ -f /data/region.poly ]; then
+            wget ${WGET_ARGS:-} "$DOWNLOAD_PBF" -O - | osmconvert - -B=/data/region.poly -o=/data/region.osm.pbf
+        else
+            wget ${WGET_ARGS:-} "$DOWNLOAD_PBF" -O /data/region.osm.pbf
         fi
+        chown renderer: /data/region.osm.pbf
     fi
 
     if [ "${UPDATES:-}" == "enabled" ] || [ "${UPDATES:-}" == "1" ]; then