diff --git a/Dockerfile b/Dockerfile
index 66ab213..0452b4b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:zesty
+FROM ubuntu:bionic
 MAINTAINER Andrey Arapov <andrey.arapov@nixaid.com>
 
 # To avoid problems with Dialog and curses wizards
@@ -36,7 +36,7 @@ RUN echo "enable-shm = no" >> /etc/pulse/client.conf
 
 # Mozilla Firefox
 # Deps: bzip2 libgtk-3-0 libdbus-glib-1-2 libxt6
-ENV FIREFOX_VER 56.0
+ENV FIREFOX_VER 65.0
 ADD https://download-installer.cdn.mozilla.net/pub/firefox/releases/$FIREFOX_VER/linux-x86_64/en-US/firefox-$FIREFOX_VER.tar.bz2 /tmp/firefox.tar.bz2
 RUN cd /tmp && \
     mkdir /opt/mozilla && \
diff --git a/data/.gitignore b/data/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/data/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/docker-compose.yml b/docker-compose.yml
index 791585c..514ad5f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,28 +1,23 @@
-version: '2'
-
-volumes:
-  data: {}
+version: '3.7'
 
 services:
   firefox:
-    image: andrey01/firefox:56.0
-    network_mode: bridge
+    build: .
     devices:
       - /dev/dri
       # - /dev/video0
     volumes:
       - /tmp/.X11-unix:/tmp/.X11-unix:ro
       - $XDG_RUNTIME_DIR/pulse:/run/user/1000/pulse
-      - data:/home/user
       - $HOME/Downloads:/home/user/Downloads
       - /var/run/cups:/var/run/cups:ro
       - /tmp/krb5cc_1000:/tmp/krb5cc_1000:ro
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/machine-id:/etc/machine-id:ro
+      - ./data:/home/user
     environment:
       - DISPLAY=unix$DISPLAY
       - PULSE_SERVER=unix:$XDG_RUNTIME_DIR/pulse/native
-      - TZ=Europe/Amsterdam
-    # Turns off anonymous page swapping
-    mem_swappiness: 0
     cap_add:
       - IPC_LOCK # lock memory to prevent sensitive values from being swapped to disk.
     shm_size: 4G