diff --git a/Dockerfile b/Dockerfile
index 899805004df7588a0d7e7bfd407f5210740ea7f6..b81aae46c52cb0d5ea21bb6e42f45a81f259c9f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 ARG R_TAG=3.5.2
-FROM rocker/shiny:$R_TAG AS builder
+FROM rocker/shiny:$R_TAG
 
 # Install and build R packages from CRAN and Bioconductor, removing documentation and tests
 RUN R -e 'install.packages( \
@@ -32,12 +32,13 @@ ADD demo /tmp/demo
 RUN cd /tmp/demo \
     && R -f make-demo.R \
     && mkdir -p /srv/shiny-server/demo \
-    && ls -la && cp demo.RData /srv/shiny-server/demo
+    && ls -la && cp demo.RData /srv/shiny-server/demo \
+    && rm -rf /tmp/demo
 
 # Fix file permissions
 RUN chmod -R a+rX /srv/shiny-server/ \
     && chgrp shiny /var/lib/shiny-server \
     && chmod g+rwxs /var/lib/shiny-server
 
-# Run with a non-privileged user
+# Run with a unprivileged user
 USER shiny