diff --git a/Dockerfile b/Dockerfile
index ffc56dd..1a97d1c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,16 +4,17 @@ MAINTAINER Andrey Arapov <andrey.arapov@nixaid.com>
 # To avoid problems with Dialog and curses wizards
 ENV DEBIAN_FRONTEND noninteractive
 
-ADD https://atlassian.artifactoryonline.com/atlassian/api/gpg/key/public /tmp/public
+RUN apt-get update
+RUN apt-get -y --no-install-recommends install \
+            ca-certificates apt-transport-https gnupg
 
-RUN apt-get update && \
-    apt-get -y --no-install-recommends install ca-certificates apt-transport-https && \
-    cat /tmp/public | apt-key add - && \
-    echo "deb https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client xenial main" > /etc/apt/sources.list.d/atlassian-hipchat4.list && \
-    apt-get update && \
-    apt-get -y --no-install-recommends install hipchat4 libqt5gui5 && \
-    apt-get -fy --no-install-recommends install && \
-    rm -rf -- /var/lib/apt/lists/*
+ADD https://atlassian.artifactoryonline.com/atlassian/api/gpg/key/public \
+    /tmp/public
+RUN cat /tmp/public | apt-key add - && \
+    echo "deb https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client xenial main" > /etc/apt/sources.list.d/atlassian-hipchat4.list
+RUN apt-get update
+RUN apt-get -y --no-install-recommends install hipchat4 libqt5gui5
+RUN apt-get -fy --no-install-recommends install
 
 RUN useradd -u 1000 -m -d /home/user -s /usr/sbin/nologin -g video user