Merge "BugFix - Enable Controlpanel to start even when gateway is Unavailable"
diff --git a/docker-compose/control-panel/config/nginx.conf b/docker-compose/control-panel/config/nginx.conf
index 10f4582..2414bde 100644
--- a/docker-compose/control-panel/config/nginx.conf
+++ b/docker-compose/control-panel/config/nginx.conf
@@ -2,19 +2,19 @@
 
 http {
     include /etc/nginx/mime.types;
-    
+    resolver 127.0.0.11;
     server {
         listen 8080;
         server_name localhost;
         root /usr/share/nginx/html;
         index index.html;
         location /a1-policy/ {
-            set $upstream http://nonrtric-gateway:9090;
-            proxy_pass  $upstream;
+            set $upstream nonrtric-gateway;
+            proxy_pass http://$upstream:9090;
         }
         location /ei-producer/{
-            set $upstream http://nonrtric-gateway:9090;
-            proxy_pass  $upstream;
+            set $upstream nonrtric-gateway;
+            proxy_pass http://$upstream:9090;
         }
         location / {
             try_files $uri $uri/ /index.html;