diff --git a/nginx.conf b/nginx.conf
index 320c424..87c9616 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -4,143 +4,143 @@ events {
 
 http {
   include /etc/nginx/mime.types;
-upstream aiohttp {
-  # fail_timeout=0 means we always retry an upstream even if it failed
-  # to return a good HTTP response
 
-  # Unix domain servers
-  # server unix:/tmp/aiohttp-gisaf-1.sock fail_timeout=0;
+  upstream backend {
+    server gisaf-backend:8898 fail_timeout=0;
+    # fail_timeout=0 means we always retry an upstream even if it failed
+    # to return a good HTTP response
 
-  server 127.0.0.1:5000 fail_timeout=0;
-}
+    # Unix domain servers
+    # server unix:/tmp/backend-gisaf-1.sock fail_timeout=0;
+  }
 
-map $http_upgrade $connection_upgrade {
-    default upgrade;
-    '' close;
-}
+  map $http_upgrade $connection_upgrade {
+      default upgrade;
+      '' close;
+  }
 #
 #upstream websocket {
 #    server localhost:8080;
 #}
 
 
-server {
-    listen 8899;
+  server {
+      listen 8899;
 
-    gzip on;
-    gzip_types      text/plain application/xml;
-    gzip_proxied    no-cache no-store private expired auth;
-    gzip_min_length 1000;
+      gzip on;
+      gzip_types      text/plain application/xml;
+      gzip_proxied    no-cache no-store private expired auth;
+      gzip_min_length 1000;
 
-    server_name localhost;
-    charset utf-8;
+      server_name localhost;
+      charset utf-8;
 
-    client_max_body_size 4G;
+      client_max_body_size 4G;
 
-    root /usr/share/nginx/html;
+      root /usr/share/nginx/html;
 
-    location /tiles/ {
-      # proxy_pass http://localhost:8080/;
-      #proxy_pass http://127.0.0.1:3000/;
-      proxy_pass http://aiohttp;
-    }
+      location /tiles/ {
+        # proxy_pass http://localhost:8080/;
+        #proxy_pass http://127.0.0.1:3000/;
+        proxy_pass http://backend;
+      }
 
-    location /api/ {
-      proxy_set_header Host $http_host;
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_http_version 1.1;
-      proxy_buffering off;
-      proxy_pass http://aiohttp;
-    }
+      location /api/ {
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_http_version 1.1;
+        proxy_buffering off;
+        proxy_pass http://backend;
+      }
 
-    location /gj/live {
-      proxy_pass http://aiohttp;
-      proxy_http_version 1.1;
-      proxy_set_header Upgrade "websocket";
-      proxy_set_header Connection "Upgrade";
-      proxy_buffering off;
-    }
+      location /gj/live {
+        proxy_pass http://backend;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade "websocket";
+        proxy_set_header Connection "Upgrade";
+        proxy_buffering off;
+      }
 
-    location /_sched {
-      proxy_pass http://localhost:8080;
-      proxy_http_version 1.1;
-      proxy_set_header Upgrade "websocket";
-      proxy_set_header Connection "Upgrade";
-      proxy_buffering off;
-    }
+      location /_sched {
+        proxy_pass http://localhost:8080;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade "websocket";
+        proxy_set_header Connection "Upgrade";
+        proxy_buffering off;
+      }
 
-    location /gj/ {
-      proxy_set_header Host $http_host;
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_http_version 1.1;
-      proxy_buffering off;
-      proxy_pass http://aiohttp;
-    }
+      location /gj/ {
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_http_version 1.1;
+        proxy_buffering off;
+        proxy_pass http://backend;
+      }
 
-    location /auth {
-      ## POST requests for JWT
-      proxy_set_header Host $http_host;
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_http_version 1.1;
-      proxy_buffering off;
-      proxy_pass http://aiohttp;
-    }
+      location /auth {
+        ## POST requests for JWT
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_http_version 1.1;
+        proxy_buffering off;
+        proxy_pass http://backend;
+      }
 
 #    location /admin {
 #      proxy_set_header Host $http_host;
 #      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 #      proxy_http_version 1.1;
 #      proxy_buffering off;
-#      proxy_pass http://aiohttp;
+#      proxy_pass http://backend;
 #    }
 
-    location /import/ {
-      proxy_set_header Host $http_host;
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_http_version 1.1;
-      proxy_buffering off;
-      proxy_pass http://aiohttp;
-    }
+      location /import/ {
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_http_version 1.1;
+        proxy_buffering off;
+        proxy_pass http://backend;
+      }
 
-    location /download/ {
-      proxy_set_header Host $http_host;
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_http_version 1.1;
-      proxy_buffering off;
-      proxy_pass http://aiohttp;
-    }
+      location /download/ {
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_http_version 1.1;
+        proxy_buffering off;
+        proxy_pass http://backend;
+      }
 
-    location /upload/ {
-      proxy_set_header Host $http_host;
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_http_version 1.1;
-      proxy_buffering off;
-      proxy_pass http://aiohttp;
-    }
+      location /upload/ {
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_http_version 1.1;
+        proxy_buffering off;
+        proxy_pass http://backend;
+      }
 
-    location /embed/ {
-      proxy_set_header Host $http_host;
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_http_version 1.1;
-      proxy_buffering off;
-      proxy_pass http://aiohttp;
-    }
+      location /embed/ {
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_http_version 1.1;
+        proxy_buffering off;
+        proxy_pass http://backend;
+      }
 
-    location = /index.html {
-        root /usr/share/nginx/html;
-    }
+      location = /index.html {
+          root /usr/share/nginx/html;
+      }
 
-    location / {
-        try_files $uri /index.html;
-    }
+      location / {
+          try_files $uri /index.html;
+      }
 
-    location /dashboard-attachment {
-        alias /home/phil/gisaf_misc/notebooks;
-    }
+      location /dashboard-attachment {
+          alias /home/phil/gisaf_misc/notebooks;
+      }
 
-    location = /favicon.ico {
-        root /usr/share/nginx/html;
-    }
+      location = /favicon.ico {
+          root /usr/share/nginx/html;
+      }
 
 #    location /terrain {
 #        proxy_pass             https://stamen-tiles-a.a.ssl.fastly.net/terrain;
@@ -154,5 +154,5 @@ server {
 #    location "/download/attachment/formidable:trees/Picture/" {
 #    	alias /home/phil/formidable_src/local_data/;
 #    }
-}
+  }
 }