diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index cfc9cdca9..56f62f382 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -50,7 +50,7 @@ services:
       - UXBOX_DATABASE_USERNAME="uxbox"
       - UXBOX_DATABASE_PASSWORD="uxbox_postgres_password"
       - UXBOX_DATABASE_NAME="uxbox"
-      - UXBOX_DATABASE_SERVER="uxdb"
+      - UXBOX_DATABASE_SERVER="postgres"
       - UXBOX_DATABASE_PORT=5432
       # Mail setup
       - UXBOX_EMAIL_REPLY_TO="no-reply@uxbox.io"
diff --git a/docker/frontend/nginx/conf.d/default.conf b/docker/frontend/nginx/conf.d/default.conf
index 999f6fb31..9032f7c82 100644
--- a/docker/frontend/nginx/conf.d/default.conf
+++ b/docker/frontend/nginx/conf.d/default.conf
@@ -29,7 +29,7 @@ server {
 
   # Backend
   location /api/ {
-    proxy_pass http://uxbackend:6060/api/;
+    proxy_pass http://backend:6060/api/;
     proxy_http_version 1.1;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection 'upgrade';