diff --git a/Dockerfile b/Dockerfile
index 48b36149d..9fe196733 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,9 @@ RUN apt-get update \
     && 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 - https://github.com/Secretmapper/combustion/archive/release.zip \
+    && unzip release.zip ; rm *.zip \
+    && mkdir /usr/bin/transmission-daemon/combustion ; mv combustion-release/* /usr/bin/transmission-daemon/combustion \
     && 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 \
@@ -107,6 +110,7 @@ ENV OPENVPN_USERNAME=**None** \
     TRANSMISSION_WATCH_DIR_ENABLED=true \
     TRANSMISSION_HOME=/data/transmission-home \
     ENABLE_UFW=false \
+    ENABLE_COMBUSTION_UI=false \
     PUID=\
     PGID=\
     TRANSMISSION_WEB_HOME=
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index a403d421b..fb02e04e5 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -11,6 +11,9 @@ VOLUME /config
 # Update packages and install software
 RUN apt-get update \
     && apt-get install -y transmission-cli transmission-common transmission-daemon \
+    && wget -O - https://github.com/Secretmapper/combustion/archive/release.zip \
+    && unzip release.zip ; rm *.zip \
+    && mkdir /usr/bin/transmission-daemon/combustion ; mv combustion-release/* /usr/bin/transmission-daemon/combustion \
     && apt-get install -y openvpn curl ufw \
     && 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 \
@@ -101,6 +104,7 @@ ENV OPENVPN_USERNAME=**None** \
     TRANSMISSION_WATCH_DIR_ENABLED=true \
     TRANSMISSION_HOME=/data/transmission-home \
     ENABLE_UFW=false \
+    ENABLE_COMBUSTION_UI=false \
     PUID=\
     PGID=\
     TRANSMISSION_WEB_HOME=
diff --git a/transmission/environment-variables.tmpl b/transmission/environment-variables.tmpl
index faa88a523..cfe5d1283 100644
--- a/transmission/environment-variables.tmpl
+++ b/transmission/environment-variables.tmpl
@@ -74,6 +74,7 @@ export TRANSMISSION_WATCH_DIR_ENABLED={{ .Env.TRANSMISSION_WATCH_DIR_ENABLED }}
 export OPENVPN_PROVIDER={{ .Env.OPENVPN_PROVIDER }}
 
 export ENABLE_UFW={{ .Env.ENABLE_UFW }}
+export ENABLE_COMBUSTION_UI={{ .Env.ENABLE_COMBUSTION_UI }}
 
 export PUID={{ .Env.PUID }}
 export PGID={{ .Env.PGID }}
diff --git a/transmission/start.sh b/transmission/start.sh
index 237a6c504..59d169bca 100755
--- a/transmission/start.sh
+++ b/transmission/start.sh
@@ -19,6 +19,11 @@ if [ ! -e "/dev/random" ]; then
   ln -s /dev/urandom /dev/random
 fi
 
+if [ "true" = "$ENABLE_UFW" ]; then
+  echo "Using Combustin UI, overriding TRANSMISSION_WEB_HOME"
+  export TRANSMISSION_WEB_HOME=//usr/bin/transmission-daemon/combustion
+fi
+
 . /etc/transmission/userSetup.sh
 
 echo "STARTING TRANSMISSION"