diff --git a/Dockerfile b/Dockerfile
index fb53340..f121e66 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,16 @@
-# FROM debian:jessie
-FROM ubuntu:xenial
+FROM ubuntu:trusty
 MAINTAINER Andrey Arapov <andrey.arapov@nixaid.com>
 
 # To avoid problems with Dialog and curses wizards
 ENV DEBIAN_FRONTEND noninteractive
 
-RUN echo 'deb http://downloads.hipchat.com/linux/apt stable main' > /etc/apt/sources.list.d/atlassian-hipchat.list \
-    && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0xAAD4AA21729B5780 \
+RUN apt-get update \
+    && apt-get install -yq apt-transport-https wget \
+    && wget -O - https://atlassian.artifactoryonline.com/atlassian/api/gpg/key/public | apt-key add - \
+    && echo "deb https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client $(lsb_release -c -s) main" > /etc/apt/sources.list.d/atlassian-hipchat4.list \
     && apt-get update \
-    && apt-get install -yq hipchat libcanberra0 libltdl7 libqt5core5a \
-        libqt5dbus5 libqt5gui5 libqt5network5 libqt5opengl5 libqt5qml5 \
-        libqt5quick5 libqt5widgets5 libqt5xml5 libxcomposite1 \
+    && apt-get install -yq hipchat4 libqt5gui5 \
+    && apt-get -fyq install \
     && rm -rf -- /var/lib/apt/lists/*
 
 ENV USER user
@@ -22,4 +22,4 @@ RUN useradd -u $UID -m -d $HOME -s /usr/sbin/nologin -g $GROUPS $USER
 WORKDIR $HOME
 USER user
 VOLUME [ "/tmp" ]
-ENTRYPOINT [ "/usr/bin/hipchat" ]
+ENTRYPOINT [ "/usr/local/bin/hipchat4" ]
diff --git a/README.md b/README.md
index 2d56a79..4eb6a48 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Running HipChat in Docker
+# Running HipChat4 in Docker
 
 * 1. [Install Docker](https://docs.docker.com/engine/installation/)
 * 2. Install [docker-compose](https://docs.docker.com/compose/install/)
diff --git a/docker-compose.yml b/docker-compose.yml
index 67283d3..5af3331 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,8 @@
 version: '2'
 
+volumes:
+  hipchat_data: {}
+
 services:
   hipchat:
     image: andrey01/hipchat
@@ -8,8 +11,9 @@ services:
       - /dev/dri
     volumes:
       - /tmp/.X11-unix:/tmp/.X11-unix
+      - hipchat_data:/home/user
       # - $HOME/.config/Atlassian:/home/user/.config/Atlassian
-      - ./HipChat.ini:/home/user/.config/Atlassian/HipChat.ini
+      # - ./HipChat.ini:/home/user/.config/Atlassian/HipChat.ini
     environment:
       - DISPLAY=unix$DISPLAY
       - TZ=Europe/Amsterdam