diff --git a/Dockerfile b/Dockerfile
index a8ebccd..801d303 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,30 @@
 FROM node AS node
 
-FROM python:3.7
+FROM python:3.7-buster
+
+ENV DEBIAN_FRONTEND noninteractive
 
 COPY --from=node /usr/local /usr/local
 COPY --from=node /opt /opt
+ARG FIREFOX_VERSION=latest
+RUN FIREFOX_DOWNLOAD_URL=$(if [ $FIREFOX_VERSION = "latest" ] || [ $FIREFOX_VERSION = "nightly-latest" ] || [ $FIREFOX_VERSION = "devedition-latest" ]; then echo "https://download.mozilla.org/?product=firefox-$FIREFOX_VERSION-ssl&os=linux64&lang=en-US"; else echo "https://download-installer.cdn.mozilla.net/pub/firefox/releases/$FIREFOX_VERSION/linux-x86_64/en-US/firefox-$FIREFOX_VERSION.tar.bz2"; fi) \
+    && apt-get update -qqy \
+    && apt-get -qqy --no-install-recommends install firefox-esr \
+    && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
+    && wget --no-verbose -O /tmp/firefox.tar.bz2 $FIREFOX_DOWNLOAD_URL \
+    && apt-get -y purge firefox-esr \
+    && rm -rf /opt/firefox \
+    && tar -C /opt -xjf /tmp/firefox.tar.bz2 \
+    && rm /tmp/firefox.tar.bz2 \
+    && mv /opt/firefox /opt/firefox-$FIREFOX_VERSION \
+ && ln -fs /opt/firefox-$FIREFOX_VERSION/firefox /usr/bin/firefox
 COPY . /app
 WORKDIR /app/bot.z_web
-RUN yarn install && yarn build && mkdir -p /app/api/assets && cp -r build/* /app/api/assets/
+RUN yarn install \
+    && yarn build \
+    && mkdir -p /app/api/assets \
+    && cp -r build/* /app/api/assets/ \
+ && rm -r node_modules/
 WORKDIR /app
 RUN python setup.py develop