diff --git a/cloud/ubuntu.sh b/cloud/ubuntu.sh
index 1fc2709..af4b4e2 100755
--- a/cloud/ubuntu.sh
+++ b/cloud/ubuntu.sh
@@ -35,6 +35,10 @@ echo "=============== Installing tutor"
 curl -L "https://github.com/regisb/tutor/releases/download/latest/tutor-$(uname -s)_$(uname -m)" -o /usr/local/bin/tutor
 chmod +x /usr/local/bin/tutor
 
+echo "=============== Building docker images"
+tutor images env
+tutor images build all
+
 echo "=============== Configuring supervisor"
 echo "[program:tutor]
 command=/usr/local/bin/tutor webui start
diff --git a/tutor/local.py b/tutor/local.py
index c16173a..e3b9862 100644
--- a/tutor/local.py
+++ b/tutor/local.py
@@ -23,16 +23,18 @@ def local():
 @click.command(
     help="Configure and run Open edX from scratch"
 )
+@click.option("-p", "--pullimages", "pullimages_", is_flag=True, help="Update docker images")
 @opts.root
-def quickstart(root):
+def quickstart(pullimages_, root):
     click.echo(fmt.title("Interactive platform configuration"))
     tutor_config.interactive.callback(root, [])
     click.echo(fmt.title("Environment generation"))
     env.callback(root)
     click.echo(fmt.title("Stopping any existing platform"))
     stop.callback(root)
-    click.echo(fmt.title("Docker image updates"))
-    pullimages.callback(root)
+    if pullimages_:
+        click.echo(fmt.title("Docker image updates"))
+        pullimages.callback(root)
     click.echo(fmt.title("Database creation and migrations"))
     databases.callback(root)
     click.echo(fmt.title("HTTPS certificates generation"))