diff --git a/dockercompose/docker-compose.yml b/dockercompose/docker-compose.yml
index 3567ec4..b79e99b 100644
--- a/dockercompose/docker-compose.yml
+++ b/dockercompose/docker-compose.yml
@@ -12,6 +12,9 @@ services:
       - FLASK_ENV=development
     depends_on:
       - back
+      - db
+      - etherpad
+      - mail
     networks:
       - app-network
 
diff --git a/nginxFront.conf b/nginxFront.conf
index d152c82..d86460e 100644
--- a/nginxFront.conf
+++ b/nginxFront.conf
@@ -1,20 +1,75 @@
+##########################
+## FRONTEND + API
+##########################
 server {
-    location /api/polls {
+    listen 80;
+    listen [::]:80;
+    server_name front.local;
+
+    root /usr/share/nginx/html;
+    index index.html;
+
+    ##########################
+    # Proxy API requests to the back service
+    ##########################
+    location /api/ {
         proxy_pass http://back:8080;
-        proxy_set_header Host $http_host;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header Connection "";
     }
-
+    ##########################
+    # FrontEnd returns
+    ##########################
     location / {
-        root   /usr/share/nginx/html;
-        index  index.html index.htm;
-        try_files $uri $uri/ /index.html?$args;
+        proxy_pass http://front:5080;
+        proxy_http_version 1.1;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header Connection "";
     }
 
     error_page   500 502 503 504  /50x.html;
     location = /50x.html {
         root   /usr/share/nginx/html;
     }
-}
\ No newline at end of file
+}
+
+##
+## BACKEND
+##
+server {
+    listen 80;
+    listen [::]:80;
+    server_name back.local;
+
+    location / {
+        proxy_pass http://back:8080;
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+    }
+}
+
+##
+## ETHERPAD
+##
+server {
+    listen 80;
+    listen [::]:80;
+    server_name etherpad.local;
+
+    location / {
+        proxy_pass http://etherpad:9001;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $remote_addr;
+    }
+}