diff --git a/.dockerignore b/.dockerignore
index f64fc5bcf..6bc552f91 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,10 +1,7 @@
 dist/
 node_modules/
-docs/
 .git
 Dockerfile
 .DS_Store
 .gitignore
-README.md
-Packages-react/ohif-viewer/dist/
-Packages-react/ohif-viewer/node_modules/
\ No newline at end of file
+README.md
\ No newline at end of file
diff --git a/docker/docker-compose-publicserver.yml b/docker/docker-compose-publicserver.yml
new file mode 100644
index 000000000..d34e6b5ca
--- /dev/null
+++ b/docker/docker-compose-publicserver.yml
@@ -0,0 +1,11 @@
+version: '3.5'
+
+services:
+
+  Viewer:
+    container_name: ohif-viewer
+    image: ohif/viewer:latest
+    ports:
+      - '80:80'
+    environment:
+      - NODE_ENV=production
\ No newline at end of file
diff --git a/dockerfile b/dockerfile
index 958e6277f..66df84a25 100644
--- a/dockerfile
+++ b/dockerfile
@@ -2,28 +2,30 @@
 # docker build -t ohif/viewer:latest .
 FROM node:11.2.0-slim as builder
 
-RUN apt-get update && apt-get install -y git yarn
+# RUN apt-get update && apt-get install -y git yarn
 RUN mkdir /usr/src/app
 
 WORKDIR /usr/src/app
 
 ENV PATH /usr/src/app/node_modules/.bin:$PATH
+
 COPY package.json /usr/src/app/package.json
 COPY yarn.lock /usr/src/app/yarn.lock
 
 ADD . /usr/src/app/
 RUN yarn install
-RUN yarn run build
-WORKDIR example
-RUN yarn install
 RUN yarn run prepare
-ADD example /usr/src/app/build
 
-# Stage 2: Bundle the built application into a Docker container
-# which runs Nginx using Alpine Linux
+WORKDIR /usr/src/app/example
+
+RUN sed -i "s,http://localhost:5000,http://localhost,g" index.html
+RUN sed -i 's,"routerBasename": "/","routerBasename": "/demo",g' index.html
+
+# # Stage 2: Bundle the built application into a Docker container
+# # which runs Nginx using Alpine Linux
 FROM nginx:1.15.5-alpine
 RUN rm -rf /etc/nginx/conf.d
 COPY conf /etc/nginx
-COPY --from=builder /usr/src/app/build /usr/share/nginx/html
+COPY --from=builder /usr/src/app/example /usr/share/nginx/html
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]