diff --git a/openwrt/Dockerfile b/openwrt/Dockerfile
index c4ac6d7..c8f6924 100644
--- a/openwrt/Dockerfile
+++ b/openwrt/Dockerfile
@@ -5,13 +5,6 @@
 FROM debian:jessie
 MAINTAINER kev <noreply@easypi.info>
 
-ENV OPENWRT_VERSION=15.05.1
-ENV OPENWRT_URL=https://downloads.openwrt.org/chaos_calmer/15.05.1/brcm2708/bcm2708
-ENV OPENWRT_IMG=OpenWrt-ImageBuilder-15.05.1-brcm2708-bcm2708.Linux-x86_64
-ENV OPENWRT_SDK=OpenWrt-SDK-15.05.1-brcm2708-bcm2708_gcc-4.8-linaro_uClibc-0.9.33.2_eabi.Linux-x86_64
-ENV OPENWRT_IMG_URL=${OPENWRT_URL}/${OPENWRT_IMG}.tar.bz2
-ENV OPENWRT_SDK_URL=${OPENWRT_URL}/${OPENWRT_SDK}.tar.bz2
-
 RUN set -xe \
     && apt-get update \
     && apt-get install -y build-essential \
@@ -39,6 +32,13 @@ RUN set -xe \
 USER openwrt
 WORKDIR /home/openwrt
 
+ENV OPENWRT_VERSION=15.05.1
+ENV OPENWRT_URL=https://downloads.openwrt.org/chaos_calmer/15.05.1/brcm2708/bcm2708
+ENV OPENWRT_IMG=OpenWrt-ImageBuilder-15.05.1-brcm2708-bcm2708.Linux-x86_64
+ENV OPENWRT_SDK=OpenWrt-SDK-15.05.1-brcm2708-bcm2708_gcc-4.8-linaro_uClibc-0.9.33.2_eabi.Linux-x86_64
+ENV OPENWRT_IMG_URL=${OPENWRT_URL}/${OPENWRT_IMG}.tar.bz2
+ENV OPENWRT_SDK_URL=${OPENWRT_URL}/${OPENWRT_SDK}.tar.bz2
+
 RUN set -xe \
     && curl -sSL ${OPENWRT_IMG_URL} | tar xj \
     && curl -sSL ${OPENWRT_SDK_URL} | tar xj \