diff --git a/project.wsgi b/project.wsgi
deleted file mode 100644
index f5d7735b..00000000
--- a/project.wsgi
+++ /dev/null
@@ -1,13 +0,0 @@
-import os, sys
-sys.path.append('/home/www/proj')
-
-
-
-#sys.path.append("/home/www/proj/organiser")
-
-#os.environ['DJANGO_SETTINGS_MODULE'] = 'proj.settings'
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "proj.settings")
-
-import django.core.handlers.wsgi
-application = django.core.handlers.wsgi.WSGIHandler()
diff --git a/requirements.txt b/requirements.txt
index 7ed7b70c..3cb5922b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -65,6 +65,7 @@ South==1.0.2
 sqlparse==0.1.11
 suds==0.4
 Unidecode==0.4.16
+uWSGI==2.0.14
 vobject==0.8.2
 wstools==0.4.3
 xlrd==0.9.2
diff --git a/support/apache.conf b/support/apache.conf
deleted file mode 100644
index 80038b2a..00000000
--- a/support/apache.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-<VirtualHost 127.0.0.1:8080>
-    WSGIDaemonProcess www-data display-name=%{GROUP} processes=2 threads=2
-    WSGIProcessGroup www-data
-    WSGIScriptAlias / "/home/www/proj/project.wsgi"
-    ServerName 176.121.11.165
-     <Directory "/home/www/proj/">
-         Order allow,deny
-         Options Indexes FollowSymLinks
-         Allow from all
-         IndexOptions FancyIndexing
-     </Directory>
-
-    Alias /media "/home/www/proj/media/"
-    Alias /static "/home/www/proj/static/"
-
-
-    <Directory "/home/www/proj/media">
-    Order allow,deny
-        Options Indexes FollowSymLinks
-        Allow from all
-        IndexOptions FancyIndexing
-    </Directory>
-    <Directory "/home/www/proj/static">
-    	Order allow,deny
-        Options Indexes FollowSymLinks
-        Allow from all
-        IndexOptions FancyIndexing
-    </Directory>
-
-    ErrorLog /var/log/apache2/expo.error.log
-    CustomLog /var/log/apache2/expo.access.log combined
-</VirtualHost>
diff --git a/support/nginx.conf b/support/nginx.conf
index 6bed0bd5..f700daff 100644
--- a/support/nginx.conf
+++ b/support/nginx.conf
@@ -20,22 +20,8 @@ server {
 
     client_header_timeout 360s;
     location / {
-        proxy_pass http://127.0.0.1:8080/;
-        proxy_redirect     off;
-        proxy_set_header        Host            $host;
-        proxy_set_header        X-Real-IP       $remote_addr;
-        proxy_set_header        X-Forwarded-For $remote_addr;
-        include /etc/nginx/geoip_proxy.conf;
-        client_max_body_size    100m;
-        client_body_buffer_size 128k;
-
-        proxy_connect_timeout   90;
-        proxy_send_timeout      90;
-        proxy_read_timeout      90;
-        proxy_buffer_size       16k;
-        proxy_buffers           256 8k;
-        proxy_busy_buffers_size 2000k;
-        proxy_temp_file_write_size      2048k;
+        include uwsgi_params;
+        uwsgi_pass 127.0.0.1:49000;
     }
 
     location /4885b11a73674eb6d54593c1d7efd758821e5ee79b8132feecaba10560f0123a.html {
diff --git a/support/supervisor.conf b/support/supervisor.conf
new file mode 100644
index 00000000..b0f2489a
--- /dev/null
+++ b/support/supervisor.conf
@@ -0,0 +1,7 @@
+[program:expomap]
+command=/usr/local/bin/uwsgi -s 127.0.0.1:49000 -M -L -R 5000 --env DJANGO_SETTINGS_MODULE=proj.settings -w "django.core.wsgi:get_wsgi_application()" --touch-reload /home/www/expomap/touch_reload --chdir /home/www/expomap
+stopsignal=INT
+stopwaitsecs=60
+autostart=true
+redirect_stderr=true
+user=www-data