diff --git a/Dockerfile b/Dockerfile
index 105dddd..ea962f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,33 @@
-FROM sameersbn/ubuntu:14.04.20170123
+FROM ubuntu:bionic-20180526 AS install-tor-browser
 
-ENV TOR_VERSION=6.5 \
+ENV TOR_VERSION=7.5.6 \
     TOR_FINGERPRINT=0x4E2C6E8793298290
 
-RUN wget -q -O - "https://dl-ssl.google.com/linux/linux_signing_key.pub" | sudo apt-key add - \
- && echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
- && mkdir ~/.gnupg \
- && gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys ${TOR_FINGERPRINT} \
- && gpg --fingerprint ${TOR_FINGERPRINT} | grep -q "Key fingerprint = EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290" \
- && apt-get update \
- && DEBIAN_FRONTEND=noninteractive apt-get install -y xz-utils file locales dbus-x11 pulseaudio dmz-cursor-theme curl \
+RUN apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y gnupg wget xz-utils \
+ && apt-key adv --fetch-keys "https://dl-ssl.google.com/linux/linux_signing_key.pub" \
+ && echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list \
+ && gpg --keyserver hkp://ipv4.pool.sks-keyservers.net --recv-keys ${TOR_FINGERPRINT} \
+ && gpg --fingerprint ${TOR_FINGERPRINT} | grep -q "EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290" \
+ && wget -O /tmp/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz https://www.torproject.org/dist/torbrowser/${TOR_VERSION}/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz \
+ && wget -O /tmp/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz.asc https://www.torproject.org/dist/torbrowser/${TOR_VERSION}/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz.asc \
+ && gpg /tmp/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz.asc \
+ && mkdir -p /usr/lib/tor-browser \
+ && tar -Jvxf /tmp/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz --strip=1 -C /usr/lib/tor-browser
+
+FROM ubuntu:bionic-20180526
+
+LABEL maintainer="sameer@damagehead.com"
+
+COPY --from=install-tor-browser /etc/apt/trusted.gpg /etc/apt/trusted.gpg
+
+COPY --from=install-tor-browser /etc/apt/sources.list /etc/apt/sources.list
+
+COPY --from=install-tor-browser /usr/lib/tor-browser /usr/lib/tor-browser
+
+RUN apt-get update \
+ && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+      xz-utils file locales dbus-x11 pulseaudio dmz-cursor-theme curl \
       fonts-dejavu fonts-liberation hicolor-icon-theme \
       libcanberra-gtk3-0 libcanberra-gtk-module libcanberra-gtk3-module \
       libasound2 libglib2.0 libgtk2.0-0 libdbus-glib-1-2 libxt6 libexif12 \
@@ -17,20 +35,17 @@ RUN wget -q -O - "https://dl-ssl.google.com/linux/linux_signing_key.pub" | sudo
       gstreamer-1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-good \
       gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-libav \
       google-chrome-stable chromium-browser firefox \
- && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
- && mkdir -p /usr/lib/tor-browser \
- && wget -O /tmp/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz  https://www.torproject.org/dist/torbrowser/${TOR_VERSION}/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz \
- && wget -O /tmp/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz.asc https://www.torproject.org/dist/torbrowser/${TOR_VERSION}/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz.asc \
- && gpg /tmp/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz.asc \
- && tar -Jvxf /tmp/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz --strip=1 -C /usr/lib/tor-browser \
+ && chmod +rx /usr/lib/tor-browser/Browser/start-tor-browser \
  && ln -sf /usr/lib/tor-browser/Browser/start-tor-browser /usr/bin/tor-browser \
- && rm -rf /tmp/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz \
- && rm -rf ~/.gnupg \
+ && update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
  && rm -rf /var/lib/apt/lists/*
 
 COPY scripts/ /var/cache/browser-box/
+
 COPY entrypoint.sh /sbin/entrypoint.sh
+
 COPY confs/local.conf /etc/fonts/local.conf
+
 RUN chmod 755 /sbin/entrypoint.sh
 
 ENTRYPOINT ["/sbin/entrypoint.sh"]