diff --git a/Dockerfile b/Dockerfile
index 3875626..53a655e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,13 +16,11 @@ USER juju
 
 RUN mkdir -p /tmp/package-query && cd /tmp/package-query && curl -J -O https://aur.archlinux.org/packages/pa/package-query/PKGBUILD && makepkg -fsc --noconfirm
 
-WORKDIR /tmp/package-query
 USER root
 
-RUN pacman --noconfirm -U package-query-*.tar.xz
-
-RUN mkdir /juju && chown juju /juju
+RUN pacman --noconfirm -U /tmp/package-query/package-query-*.tar.xz && rm -rf /tmp/package-query /var/cache/pacman/pkg/*
 
 USER juju
-WORKDIR /juju
+VOLUME ["/tmp/juju-image"]
+WORKDIR /tmp/juju-image
 ENTRYPOINT ["sh", "-c", "/run.sh"]
diff --git a/README.md b/README.md
index f08d940..47db8b9 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,8 @@
 
-
-
 To build image:
 
-    docker build -t fee/juju-docker --rm=true .
+    docker build -t fee/juju-docker .
 
-To run container:
+To run container and generate the JuJu image in /tmp/juju-image:
 
-    docker run --privileged -it feel/juju-docker /bin/bash
+    docker run --privileged -v /tmp/juju-image:/tmp/juju-image -t juju
diff --git a/run.sh b/run.sh
index d12f78f..1094142 100755
--- a/run.sh
+++ b/run.sh
@@ -1,4 +1,4 @@
 
 
-git clone https://github.com/fsquillace/juju.git /juju
-/juju/bin/juju -b -n
+git clone https://github.com/fsquillace/juju.git /tmp/juju
+/tmp/juju/bin/juju -b -n