diff --git a/docker-compose.yml b/docker-compose.yml
index b4d71d0..1dde626 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,16 +5,15 @@ services:
     build: server
     environment:
       HASTIC_API_KEY: ${HASTIC_API_KEY}
-      ZMQ_CONNECTION_STRING: tcp://0.0.0.0:8002
-    network_mode: host
+      ZMQ_CONNECTION_STRING: tcp://analytics:8002
+    ports:
+      - 8000:8000
     volumes:
       - data-volume:/var/www/data
 
   analytics:
     image: hastic/analytics:latest
     build: analytics
-    ports:
-      - 8002:8002
 
 volumes:
   data-volume:
diff --git a/server/Dockerfile b/server/Dockerfile
index f893f61..ff47b00 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -11,12 +11,15 @@ RUN apt-get install curl \
 
 VOLUME [ "/var/www/data" ]
 
-COPY . /var/www/server
-
 WORKDIR /var/www/server
 
-RUN npm install \
- && npm run build
+COPY package.json /var/www/server
+
+RUN npm install
+
+COPY . /var/www/server
+
+RUN npm run build
 
 ENV INSIDE_DOCKER true