diff --git a/Makefile b/Makefile
index b6848fe..e59f239 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,10 @@ VERSIONS = android-16 android-17 android-18 android-19 android-21 android-22 and
 generate:
 	for version in $(VERSIONS); do \
 		mkdir -p ./build/$$version ; \
-		sed "s/{{ platform }}/$$version/" templates/Dockerfile > build/$$version/Dockerfile ; \
-		sed "s/{{ platform }}/$$version/" templates/config.ini > build/$$version/config.ini ; \
-		sed "s/{{ platform }}/$$version/" templates/start.sh > build/$$version/start.sh ; \
-		sed "s/{{ platform }}/$$version/" templates/Makefile > build/$$version/Makefile ; \
+		sed "s/{{ platform }}/$$version/g" templates/Dockerfile > build/$$version/Dockerfile ; \
+		sed "s/{{ platform }}/$$version/g" templates/config.ini > build/$$version/config.ini ; \
+		sed "s/{{ platform }}/$$version/g" templates/start.sh > build/$$version/start.sh ; \
+		sed "s/{{ platform }}/$$version/g" templates/Makefile > build/$$version/Makefile ; \
 		cp base/* ./build/$$version ; \
 	done
 
diff --git a/templates/Dockerfile b/templates/Dockerfile
index 8b4162e..8c4efe7 100644
--- a/templates/Dockerfile
+++ b/templates/Dockerfile
@@ -27,13 +27,14 @@ RUN dpkg --add-architecture i386 && \
 
     # Install Android SDK
     curl -L $LINK_ANDROID_SDK > /tmp/android-sdk-linux.zip && \
-    unzip /tmp/android-sdk-linux.zip -d /opt/android-sdk-linux/ && \
+    unzip -q /tmp/android-sdk-linux.zip -d /opt/android-sdk-linux/ && \
     rm /tmp/android-sdk-linux.zip && \
 
     # Customized steps per specific platform
     yes | sdkmanager --no_https --licenses && \
     sdkmanager --no_https emulator tools platform-tools "platforms;{{ platform }}" "system-images;{{ platform }};google_apis;x86" --verbose && \
     echo no | avdmanager create avd -n "x86" --package "system-images;{{ platform }};google_apis;x86" --tag google_apis && \
+
     # Unfilter devices (now local because CI downloads from github are unstable)
     # curl -o /root/.android/adb_usb.ini https://raw.githubusercontent.com/apkudo/adbusbini/master/adb_usb.ini && \