diff --git a/elasticsearch-curator/README.md b/elasticsearch-curator/README.md
deleted file mode 100644
index 39e3da46..00000000
--- a/elasticsearch-curator/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# elasticsearch-curator
-
-Install Elasticsearch Curtor, for index management.
-
-## Tasks
-
-Everything is in the `tasks/main.yml` file.
-
-## Available variables
diff --git a/elasticsearch-curator/meta/main.yml b/elasticsearch-curator/meta/main.yml
deleted file mode 100644
index 0b48e8c4..00000000
--- a/elasticsearch-curator/meta/main.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-galaxy_info:
-  author: Evolix
-  description: Install Elasticsearch Curtor, for index management.
-
-  issue_tracker_url: https://forge.evolix.org/projects/ansible-roles/issues
-
-  license: GPLv2
-
-  min_ansible_version: 2.2
-
-  platforms:
-  - name: Debian
-    versions:
-    - jessie
-
-  galaxy_tags: []
-    # List tags for your role here, one per line. A tag is
-    # a keyword that describes and categorizes the role.
-    # Users find roles by searching for tags. Be sure to
-    # remove the '[]' above if you add tags to this list.
-    #
-    # NOTE: A tag is limited to a single word comprised of
-    # alphanumeric characters. Maximum 20 tags per role.
-
-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/elasticsearch/README.md b/elasticsearch/README.md
index 113fe4a7..a6fa0b14 100644
--- a/elasticsearch/README.md
+++ b/elasticsearch/README.md
@@ -25,6 +25,12 @@ Tasks are extracted in several files, included in `tasks/main.yml` :
 
 By default, Elasticsearch will listen to the public interfaces (`_site_` cf. https://www.elastic.co/guide/en/elasticsearch/reference/5.0/important-settings.html#network.host), so you will have to secure it, with firewall rules for example.
 
+## Curator
+
+Curator can be installed. :
+
+* `elasticsearch_curator` : enable the package installation (default: `False`) ;
+
 ## Head plugin
 
 The "head" plugin can be installed :
diff --git a/elasticsearch/defaults/main.yml b/elasticsearch/defaults/main.yml
index 8a80c92e..77e36070 100644
--- a/elasticsearch/defaults/main.yml
+++ b/elasticsearch/defaults/main.yml
@@ -9,6 +9,8 @@ elasticsearch_default_tmpdir: /var/lib/elasticsearch/tmp
 elasticsearch_jvm_xms: 2g
 elasticsearch_jvm_xmx: 2g
 
+elasticsearch_curator: False
+
 elasticsearch_plugin_head: False
 elasticsearch_plugin_head_owner: "elasticsearch-head"
 elasticsearch_plugin_head_group: "{{ elasticsearch_plugin_head_owner }}"
diff --git a/elasticsearch-curator/tasks/main.yml b/elasticsearch/tasks/curator.yml
similarity index 51%
rename from elasticsearch-curator/tasks/main.yml
rename to elasticsearch/tasks/curator.yml
index 4fef07b9..c1a10658 100644
--- a/elasticsearch-curator/tasks/main.yml
+++ b/elasticsearch/tasks/curator.yml
@@ -1,30 +1,18 @@
 ---
 
-- name: APT https transport is enabled
-  apt:
-    name: apt-transport-https
-    state: present
-  tags:
-    - system
-    - packages
-
-- name: Elastic GPG key is installed
-  apt_key:
-    url: https://packages.elastic.co/GPG-KEY-elasticsearch
-    state: present
-  tags:
-    - system
-    - packages
-
 - name: Curator sources list is available
   apt_repository:
     repo: "deb http://packages.elastic.co/curator/4/debian stable main"
+    update_cache: yes
     state: present
   tags:
-    - system
+    - curator
     - packages
 
 - name: Curator package is installed
   apt:
     name: elasticsearch-curator
     state: present
+  tags:
+    - curator
+    - packages
diff --git a/elasticsearch/tasks/main.yml b/elasticsearch/tasks/main.yml
index 6cb09943..00be05ed 100644
--- a/elasticsearch/tasks/main.yml
+++ b/elasticsearch/tasks/main.yml
@@ -12,3 +12,6 @@
 
 - include: plugin_head.yml
   when: elasticsearch_plugin_head
+
+- include: curator.yml
+  when: elasticsearch_curator