diff --git a/Dockerfile b/Dockerfile
index a402e1c..ec1e642 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:xenial
+FROM ubuntu:zesty
 MAINTAINER Andrey Arapov <andrey.arapov@nixaid.com>
 
 # To avoid problems with Dialog and curses wizards
diff --git a/docker-compose.yml b/docker-compose.yml
index 94ec19d..9db0674 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,12 +1,12 @@
-version: '2.1'
+version: '2'
 
 volumes:
   data: {}
 
 services:
   firefox:
-    # docker build -t andrey01/firefox .
-    image: andrey01/firefox
+    # docker build -t local/firefox .
+    image: local/firefox
     network_mode: bridge
     devices:
       - /dev/dri
@@ -22,10 +22,12 @@ services:
       - DISPLAY=unix$DISPLAY
       - PULSE_SERVER=unix:$XDG_RUNTIME_DIR/pulse/native
       - TZ=Europe/Amsterdam
-    shm_size: 4G
-    mem_limit: 4G
     # 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
+    # mem_limit: 4G
 
 # For versions above: '3.0'
 #    deploy: