diff --git a/deploy/nginx/sites-available/pedasi b/deploy/nginx/sites-available/pedasi
index 13d182189328d6a49a1c3769fd0d22c8d0545429..2b1179951d22e7125a137cfa3bc9ac6fa28d3adc 100644
--- a/deploy/nginx/sites-available/pedasi
+++ b/deploy/nginx/sites-available/pedasi
@@ -1,6 +1,6 @@
 server {
     listen 80;
-    server_name localhost pedasi.* pedasi-dev.* *.iotobservatory.io;
+    server_name _;
 
     merge_slashes off;
 
diff --git a/deploy/nginx/sites-available/pedasi.dev b/deploy/nginx/sites-available/pedasi.dev
deleted file mode 100644
index 2493ef39e0c4af356f3084889badafcbd33a7700..0000000000000000000000000000000000000000
--- a/deploy/nginx/sites-available/pedasi.dev
+++ /dev/null
@@ -1,28 +0,0 @@
-server {
-    listen 80;
-
-    merge_slashes off;
-
-    location = /favicon.ico {
-        alias /var/www/pedasi/static/img/favicon.ico;
-    }
-
-    location /static/ {
-        alias /var/www/pedasi/static/;
-    }
-
-    location = /report.html {
-        alias /var/www/pedasi/report.html;
-        auth_basic "Restricted Content";
-        auth_basic_user_file /etc/nginx/.htpasswd;
-    }
-
-    location = /robots.txt {
-        alias /var/www/pedasi/deploy/robots.txt;
-    }
-
-    location / {
-        include     uwsgi_params;
-        uwsgi_pass  unix:/run/uwsgi/pedasi.sock;
-    }
-}
diff --git a/playbook.yml b/playbook.yml
index 08930f9a830b3efeb4c285dac013d9eb6c9970e1..cba5800b8155ce42ab4bca0a904ad90d7d6ac008 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -78,7 +78,7 @@
 
     - name: Copy settings
       copy:
-        src: '{{ env_file | default("deploy/.env.dev") }}'
+        src: '{{ env_file | default("deploy/.env") }}'
         dest: '{{ project_dir }}/.env'
         owner: www-data
         group: www-data
@@ -155,23 +155,13 @@
         - { src: '{{ project_dir }}/deploy/uwsgi/sites/pedasi.ini', dest: /etc/uwsgi/sites/pedasi.ini }
         - { src: '{{ project_dir }}/deploy/systemd/system/uwsgi.service', dest: /etc/systemd/system/uwsgi.service }
 
-    - name: Copy web config files - dev
-      copy:
-        src: '{{ project_dir }}/deploy/nginx/sites-available/pedasi.dev'
-        dest: /etc/nginx/sites-available/pedasi
-        remote_src: yes
-        # WARNING: this will not update an existing file
-        force: no
-      when: production is not defined
-
-    - name: Copy web config files - production
+    - name: Copy web config files
       copy:
         src: '{{ project_dir }}/deploy/nginx/sites-available/pedasi'
         dest: /etc/nginx/sites-available/pedasi
         remote_src: yes
         # WARNING: this will not update an existing file
         force: no
-      when: production is defined
 
     - name: Activate Nginx site
       file: