diff --git a/tools/unix/Dockerfile b/tools/unix/Dockerfile
index 027f368d2..870d2874d 100755
--- a/tools/unix/Dockerfile
+++ b/tools/unix/Dockerfile
@@ -9,7 +9,8 @@ RUN apt-get update -qq \
     curl \
     osmctools \
     rclone \
-    sftp \
+    openssh-client \
+    git \
     sshpass \
     vim \
     wget \
@@ -39,6 +40,10 @@ RUN apt-get update -qq \
     zlib1g-dev \
     && rm -rf /var/cache/apt/* /var/lib/apt/lists/*;
 
+# Allow pip to install system-wide in the container
+RUN rm -f /usr/lib/python*/EXTERNALLY-MANAGED
+RUN pip3 install "protobuf<4"
+
 RUN mkdir /root/OM
 # When running, bind mount the repo here
 RUN mkdir /root/OM/organicmaps
diff --git a/tools/unix/docker_maps_generator.sh b/tools/unix/docker_maps_generator.sh
index 4ae4b8d36..cae7a3f6e 100755
--- a/tools/unix/docker_maps_generator.sh
+++ b/tools/unix/docker_maps_generator.sh
@@ -17,6 +17,10 @@ set -e
 #UK_POSTCODES_URL:/home/planet/postcodes/gb-postcode-data/gb_postcodes.csv
 #US_POSTCODES_URL:/home/planet/postcodes/us-postcodes/uszips.csv
 
+echo "<$(date +%T)> Setting git as safe dir..."
+
+git config --global --add safe.directory /root/OM/organicmaps
+
 echo "<$(date +%T)> Starting..."
 
 # Prepare paths