diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 4fe20266b..9555adabb 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -6,19 +6,20 @@ VOLUME /config
 
 # Update packages and install software
 RUN apt-get update \
-    && apt-get -y upgrade \
     && apt-get -y install transmission-cli transmission-common transmission-daemon \
-    && apt-get install -y dumb-init unzip openvpn curl ufw wget git \
-    && wget https://github.com/Secretmapper/combustion/archive/release.zip \
-    && unzip release.zip -d /opt/transmission-ui/ \
-    && rm release.zip \
+    && apt-get install -y dumb-init unzip openvpn curl ufw git tinyproxy \
+    && curl -L -o /tmp/release.zip https://github.com/Secretmapper/combustion/archive/release.zip \
+    && unzip /tmp/release.zip -d /opt/transmission-ui/ \
+    && rm /tmp/release.zip \
     && git clone git://github.com/endor/kettu.git /opt/transmission-ui/kettu \
-    && wget https://github.com/ronggang/twc-release/raw/master/src.tar.gz \
     && mkdir /opt/transmission-ui/transmission-web-control \
-    && tar -xvf src.tar.gz -C /opt/transmission-ui/transmission-web-control/ \
-    && rm src.tar.gz \
+    && curl -L https://github.com/ronggang/twc-release/raw/master/src.tar.gz \
+     | tar -C /opt/transmission-ui/transmission-web-control/ -xzv \
+    && apt-get purge git unzip \
+    && apt-get autoremove --purge \
     && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
-    && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.0/dockerize-linux-armhf-v0.6.0.tar.gz | tar -C /usr/local/bin -xzv \
+    && curl -L https://github.com/jwilder/dockerize/releases/download/v0.6.0/dockerize-linux-armhf-v0.6.0.tar.gz \
+     | tar -C /usr/local/bin -xzv \
     && groupmod -g 1000 users \
     && useradd -u 911 -U -d /config -s /bin/false abc \
     && usermod -G users abc
@@ -26,6 +27,7 @@ RUN apt-get update \
 # Add configuration and scripts
 ADD openvpn/ /etc/openvpn/
 ADD transmission/ /etc/transmission/
+ADD tinyproxy /opt/tinyproxy/
 
 ENV OPENVPN_USERNAME=**None** \
     OPENVPN_PASSWORD=**None** \