diff --git a/Dockerfile_analytics b/Dockerfile_analytics
index 4bf865f..4d66ca6 100644
--- a/Dockerfile_analytics
+++ b/Dockerfile_analytics
@@ -4,26 +4,16 @@ EXPOSE 8000
 
 VOLUME [ "/var/www/data" ]
 
-COPY . /var/www
+COPY analytics config /var/www
 
 WORKDIR /var/www/analytics
 
-RUN pip install -r requirements.txt
+RUN pip install -r requirements.txt &&
+    apt-get update && apt-get install -y \
+    gnupg \
+    curl \
+    make \
+    g++ \
+    git
 
-RUN apt-get update && apt-get install -y \
-  apt-utils \
-  gnupg \
-  curl \ 
-  python \
-  make \
-  g++ \
-  git
-RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-
-RUN apt-get update && apt-get install -y nodejs
-
-WORKDIR /var/www/server
-
-RUN npm install && npm run build
-
-CMD ["npm", "start"]
+CMD ["python", "server.py"]
diff --git a/Dockerfile_server b/Dockerfile_server
index 44cd632..24024c4 100644
--- a/Dockerfile_server
+++ b/Dockerfile_server
@@ -4,26 +4,20 @@ EXPOSE 8000
 
 VOLUME [ "/var/www/data" ]
 
-COPY . /var/www
-
-WORKDIR /var/www/analytics
-
-RUN pip install -r requirements.txt
-
-RUN apt-get update && apt-get install -y \
-  apt-utils \
-  gnupg \
-  curl \ 
-  python \
-  make \
-  g++ \
-  git
-RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-
-RUN apt-get update && apt-get install -y nodejs
+COPY server config /var/www
 
 WORKDIR /var/www/server
 
-RUN npm install && npm run build
+#RUN apt-get update && apt-get install -y \
+#  gnupg \
+#  curl \
+#  make \
+#  g++
+
+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - &&
+    apt-get update &&
+    apt-get install -y nodejs &&
+    npm install &&
+    npm run build
 
 CMD ["npm", "start"]