diff --git a/kibana-proxy-nginx/README.md b/kibana-proxy-nginx/README.md
deleted file mode 100644
index 637497f0..00000000
--- a/kibana-proxy-nginx/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# kibana
-
-Install kibana proxy configurations (with or without SSL) for Nginx.
-
-## Tasks
-
-Everything is in the `tasks/main.yml` file.
-
-## Available variables
-
-The only variables are derived from gathered facts.
-
-By default, Kibana will bind to localhost:5601.
-
-The configurations are installed but not enabled.
diff --git a/kibana-proxy-nginx/meta/main.yml b/kibana-proxy-nginx/meta/main.yml
deleted file mode 100644
index ffa851f0..00000000
--- a/kibana-proxy-nginx/meta/main.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-galaxy_info:
-  author: Evolix
-  description: Install kibana proxy configurations (with or without SSL) for Nginx.
-
-  issue_tracker_url: https://forge.evolix.org/projects/ansible-roles/issues
-
-  license: GPLv2
-
-  min_ansible_version: 2.2
-
-  platforms:
-  - name: Debian
-    versions:
-    - jessie
-
-dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.
diff --git a/kibana/README.md b/kibana/README.md
index feda6871..5d95b5a7 100644
--- a/kibana/README.md
+++ b/kibana/README.md
@@ -8,7 +8,9 @@ Everything is in the `tasks/main.yml` file.
 
 ## Available variables
 
-The only variables are derived from gathered facts.
+* `kibana_proxy_nginx` : configure an Nginx proxy (not enabled) for Kibana (default: `False`) ;
+* `kibana_proxy_domain` : domain to use for the proxy ;
+* `kibana_proxy_ssl_cert` : certificate to use for the proxy ;
+* `kibana_proxy_ssl_key` : private key to use for the proxy ;
 
 By default, Kibana will bind to localhost:5601.
-If Nginx is installed, a typical proxy configuration is copied into `/etc/nginx/sites-available`. It can be tweeked and enabled by hand.
diff --git a/kibana-proxy-nginx/defaults/main.yml b/kibana/defaults/main.yml
similarity index 86%
rename from kibana-proxy-nginx/defaults/main.yml
rename to kibana/defaults/main.yml
index 28477d87..7e7555f1 100644
--- a/kibana-proxy-nginx/defaults/main.yml
+++ b/kibana/defaults/main.yml
@@ -1,4 +1,6 @@
 ---
+kibana_proxy_nginx: False
+
 kibana_proxy_domain: "kibana.{{ ansible_fqdn }}"
 kibana_proxy_ssl_cert: "/etc/ssl/certs/{{ ansible_fqdn }}.crt"
 kibana_proxy_ssl_key: "/etc/ssl/private/{{ ansible_fqdn }}.key"
diff --git a/kibana/tasks/main.yml b/kibana/tasks/main.yml
index f5d20066..9cf74638 100644
--- a/kibana/tasks/main.yml
+++ b/kibana/tasks/main.yml
@@ -78,3 +78,6 @@
     args:
       warn: no
   when: mount.rc == 0 and not mount.stdout_lines.0 | search("rw")
+
+- include: proxy_nginx.yml
+  when: kibana_proxy_nginx
diff --git a/kibana-proxy-nginx/tasks/main.yml b/kibana/tasks/proxy_nginx.yml
similarity index 100%
rename from kibana-proxy-nginx/tasks/main.yml
rename to kibana/tasks/proxy_nginx.yml
diff --git a/kibana-proxy-nginx/templates/nginx_proxy_kibana_nossl.j2 b/kibana/templates/nginx_proxy_kibana_nossl.j2
similarity index 100%
rename from kibana-proxy-nginx/templates/nginx_proxy_kibana_nossl.j2
rename to kibana/templates/nginx_proxy_kibana_nossl.j2
diff --git a/kibana-proxy-nginx/templates/nginx_proxy_kibana_ssl.j2 b/kibana/templates/nginx_proxy_kibana_ssl.j2
similarity index 97%
rename from kibana-proxy-nginx/templates/nginx_proxy_kibana_ssl.j2
rename to kibana/templates/nginx_proxy_kibana_ssl.j2
index 8903ca76..ea2e06c9 100644
--- a/kibana-proxy-nginx/templates/nginx_proxy_kibana_ssl.j2
+++ b/kibana/templates/nginx_proxy_kibana_ssl.j2
@@ -11,7 +11,7 @@ server {
 server {
   charset utf-8;
 
-  listen 443 ssl spdy;
+  listen 443 ssl;
 
   server_name {{ kibana_proxy_domain }};