diff --git a/docker-compose.yml b/docker-compose.yml
index b557d0cf..efb09cdd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,6 +9,9 @@ services:
     ports:
       - "80:80"
       - "443:443"
+    links:
+      - webmail
+      - admin
     volumes:
       - /data/certs:/certs
 
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 8c8beddc..eb700a4e 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -33,15 +33,11 @@ http {
     	}
 
       location / {
-        resolver 127.0.0.11;
-        set $webmail_backend "http://webmail";
-        proxy_pass $webmail_backend;
+        proxy_pass http://webmail;
       }
 
       location /admin {
-        resolver 127.0.0.11;
-        set $admin_backend "http://admin";
-        proxy_pass $admin_backend;
+        proxy_pass http://admin;
       }
     }
 }