diff --git a/Dockerfile b/Dockerfile
index 397109bd9..ec54a6b6a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,3 @@
-# Transmission and OpenVPN
-#
-# Version 1.15
-
 FROM ubuntu:16.04
 MAINTAINER Kristian Haugene
 
@@ -10,26 +6,24 @@ VOLUME /config
 
 # Update packages and install software
 RUN apt-get update \
-    && apt-get -y install software-properties-common ufw \
-    && add-apt-repository multiverse \
+    && apt-get -y upgrade \
+    && apt-get -y install software-properties-common wget \
     && add-apt-repository ppa:transmissionbt/ppa \
-    && apt-get update \
-    && apt-get install -y sudo transmission-cli transmission-common transmission-daemon curl rar unrar zip unzip wget \
-    && wget -O /tmp/release.zip https://github.com/Secretmapper/combustion/archive/release.zip \
-    && unzip -d /tmp /tmp/release.zip ; rm /tmp/*.zip \
-    && mkdir /usr/bin/transmission-combustion/ ; mv /tmp/combustion-release/* /usr/bin/transmission-combustion/ \
-    && wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg|apt-key add - \
+    && wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg | apt-key add - \
     && echo "deb http://build.openvpn.net/debian/openvpn/stable xenial main" > /etc/apt/sources.list.d/openvpn-aptrepo.list \
     && apt-get update \
-    && apt-get install -y openvpn \
+    && apt-get install -y sudo transmission-cli transmission-common transmission-daemon curl rar unrar zip unzip ufw iputils-ping openvpn \
+    && wget https://github.com/Secretmapper/combustion/archive/release.zip \
+    && unzip release.zip -d /opt/transmission-ui/ \
+    && rm release.zip \
     && wget https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb \
     && dpkg -i dumb-init_1.2.0_amd64.deb \
     && rm -rf dumb-init_1.2.0_amd64.deb \
-    && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
     && curl -L https://github.com/jwilder/dockerize/releases/download/v0.5.0/dockerize-linux-amd64-v0.5.0.tar.gz | tar -C /usr/local/bin -xzv \
+    && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
     && groupmod -g 1000 users \
     && useradd -u 911 -U -d /config -s /bin/false abc \
-    && usermod -G users abc 
+    && usermod -G users abc
 
 ADD openvpn/ /etc/openvpn/
 ADD transmission/ /etc/transmission/
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 9df34a259..28ed7f2f5 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,7 +1,3 @@
-# Transmission and OpenVPN
-#
-# Version 1.10
-
 FROM resin/rpi-raspbian:jessie
 MAINTAINER Kristian Haugene
 
@@ -10,11 +6,12 @@ VOLUME /config
 
 # Update packages and install software
 RUN apt-get update \
-    && apt-get install -y transmission-cli transmission-common transmission-daemon \
-    && wget -O /tmp/release.zip https://github.com/Secretmapper/combustion/archive/release.zip \
-    && unzip -d /tmp /tmp/release.zip ; rm /tmp/*.zip \
-    && mkdir /usr/bin/transmission-combustion/ ; mv /tmp/combustion-release/* /usr/bin/transmission-combustion/ \
+    && apt-get -y upgrade \
+    && apt-get -y install transmission-cli transmission-common transmission-daemon \
     && apt-get install -y openvpn curl ufw \
+    && wget https://github.com/Secretmapper/combustion/archive/release.zip \
+    && unzip release.zip -d /opt/transmission-ui/ \
+    && rm release.zip \
     && curl -sLO https://archive.raspbian.org/raspbian/pool/main/d/dumb-init/dumb-init_1.0.3-1_armhf.deb \
     && dpkg -i dumb-init_*.deb \
     && rm -rf dumb-init_*.deb \
diff --git a/transmission/start.sh b/transmission/start.sh
index e8fb5d87b..1efc41db7 100755
--- a/transmission/start.sh
+++ b/transmission/start.sh
@@ -10,7 +10,7 @@ export TRANSMISSION_BIND_ADDRESS_IPV4=$4
 
 if [ "true" = "$ENABLE_COMBUSTION_UI" ]; then
   echo "Using Combustion UI, overriding TRANSMISSION_WEB_HOME"
-  export TRANSMISSION_WEB_HOME=/usr/bin/transmission-combustion
+  export TRANSMISSION_WEB_HOME=/opt/transmission-ui/combustion-release
 fi
 
 echo "Generating transmission settings.json from env variables"