diff --git a/tools/unix/Dockerfile b/tools/unix/Dockerfile
index 870d2874d..af029f52a 100755
--- a/tools/unix/Dockerfile
+++ b/tools/unix/Dockerfile
@@ -49,6 +49,8 @@ RUN mkdir /root/OM
 RUN mkdir /root/OM/organicmaps
 # And a volume to store the large output/temp files here
 RUN mkdir /root/OM/maps_build
+# And the output of the app build
+RUN mkdir /root/OM/omim-build-release
 # And a volume to store >10gb files for the planet here
 RUN mkdir /home/planet
 
diff --git a/tools/unix/docker_maps_generator.sh b/tools/unix/docker_maps_generator.sh
index cae7a3f6e..b49b078dd 100755
--- a/tools/unix/docker_maps_generator.sh
+++ b/tools/unix/docker_maps_generator.sh
@@ -25,18 +25,16 @@ echo "<$(date +%T)> Starting..."
 
 # Prepare paths
 #
-# Already created by Dockerfile:
+# Already created by Dockerfile or CI/CD:
 #   /root/OM
 #   /root/OM/organicmaps
+#   /root/OM/omim-build-release
 #   /root/OM/maps_build
 #   /home/planet
 #
 mkdir -p /root/.config/CoMaps # Odd mkdir permission errors in generator_tool in Docker without these
 chmod -R 777 /root/.config
 mkdir -p ~/.config/rclone
-mkdir -p ~/OM/maps_build
-mkdir -p ~/OM/omim-build-release
-mkdir -p ~/OM/osmctools
 mkdir -p /home/planet/planet/isolines/
 mkdir -p /home/planet/planet/kayak/
 mkdir -p /home/planet/planet/tiger/