diff --git a/infra/base-images/base/Dockerfile b/infra/base-images/base/Dockerfile
index f6e05a375..3f6de1af5 100644
--- a/infra/base-images/base/Dockerfile
+++ b/infra/base-images/base/Dockerfile
@@ -19,14 +19,11 @@
 FROM ubuntu:16.04
 MAINTAINER mike.aizatsky@gmail.com
 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update
-RUN apt-get upgrade -y
-RUN apt-get autoremove -y
+RUN apt-get update && apt-get upgrade -y && apt-get autoremove -y
 
 ENV OUT=/out
 ENV SRC=/src
 ENV WORK=/work
-
-RUN mkdir -p $OUT $SRC $WORK && chmod a+rwx $OUT $SRC $WORK
 ENV PATH="$PATH:/out"
 
+RUN mkdir -p $OUT $SRC $WORK && chmod a+rwx $OUT $SRC $WORK