diff --git a/Dockerfile b/Dockerfile
index f730367..50616fd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,13 @@
 FROM sameersbn/ubuntu:12.04.20140628
 MAINTAINER sameer@damagehead.com
 
+ENV WEBMIN_VERSION 1.690
 RUN apt-get update && \
 		apt-get install -y bind9 perl libnet-ssleay-perl openssl \
 			libauthen-pam-perl libpam-runtime libio-pty-perl \
 			apt-show-versions python && \
+		wget "http://prdownloads.sourceforge.net/webadmin/webmin_${WEBMIN_VERSION}_all.deb" -P /tmp/ && \
+		dpkg -i /tmp/webmin_${WEBMIN_VERSION}_all.deb && rm -rf /tmp/webmin_${WEBMIN_VERSION}_all.deb && \
 		apt-get clean # 20140625
 
 ADD assets/setup/ /app/setup/
diff --git a/assets/setup/install b/assets/setup/install
index 68dee81..7edf31f 100644
--- a/assets/setup/install
+++ b/assets/setup/install
@@ -1,18 +1,6 @@
 #!/bin/bash
 set -e
 
-mkdir -p /app/data
-
-# install webmin, use local copy .deb file if available
-WEBMIN_VERSION=1.690
-if [ -f /app/setup/webmin_${WEBMIN_VERSION}_all.deb ]; then
-	dpkg -i /app/setup/webmin_${WEBMIN_VERSION}_all.deb
-else
-	wget "http://prdownloads.sourceforge.net/webadmin/webmin_${WEBMIN_VERSION}_all.deb" -P /tmp/
-	dpkg -i /tmp/webmin_${WEBMIN_VERSION}_all.deb
-	rm -rf /tmp/webmin_${WEBMIN_VERSION}_all.deb
-fi
-
 mkdir -p /var/run/named
 chmod 775 /var/run/named
 chown root:bind /var/run/named >/dev/null 2>&1 || true