diff --git a/elastic-source-list/README.md b/elastic-sources-list/README.md
similarity index 100%
rename from elastic-source-list/README.md
rename to elastic-sources-list/README.md
diff --git a/elastic-source-list/tasks/main.yml b/elastic-sources-list/tasks/main.yml
similarity index 100%
rename from elastic-source-list/tasks/main.yml
rename to elastic-sources-list/tasks/main.yml
diff --git a/elasticsearch/meta/main.yml b/elasticsearch/meta/main.yml
new file mode 100644
index 00000000..5c6102f7
--- /dev/null
+++ b/elasticsearch/meta/main.yml
@@ -0,0 +1,4 @@
+---
+dependencies:
+  - { role: java8 }
+  - { role: elastic-sources-list }
diff --git a/filebeat/meta/main.yml b/filebeat/meta/main.yml
new file mode 100644
index 00000000..9051e7fa
--- /dev/null
+++ b/filebeat/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - { role: elastic-sources-list }
diff --git a/java8/meta/main.yml b/java8/meta/main.yml
new file mode 100644
index 00000000..c18ee100
--- /dev/null
+++ b/java8/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - { role: apt-backports }
diff --git a/kibana/meta/main.yml b/kibana/meta/main.yml
new file mode 100644
index 00000000..9051e7fa
--- /dev/null
+++ b/kibana/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - { role: elastic-sources-list }
diff --git a/logstash/meta/main.yml b/logstash/meta/main.yml
new file mode 100644
index 00000000..5c6102f7
--- /dev/null
+++ b/logstash/meta/main.yml
@@ -0,0 +1,4 @@
+---
+dependencies:
+  - { role: java8 }
+  - { role: elastic-sources-list }
diff --git a/vagrant.yml b/vagrant.yml
index a1654cb0..ae36972e 100644
--- a/vagrant.yml
+++ b/vagrant.yml
@@ -6,7 +6,6 @@
   roles:
     # - { role: apt-upgrade, apt_upgrade_mode: safe }
     - apt-upgrade
-    - apt-backports
     # - munin
     # - monit
     # - redis
@@ -21,11 +20,7 @@
     #     nginx_private_htpasswd_absent: ["toto:dsfgdfsdf"]
     #   }
     # - apache
-    - java8
-    # - { role: elasticsearch, elasticsearch_custom_tmpdir: "/var/lib/elasticsearch/tmp" }
-    - elastic-source-list
-    - elasticsearch
-    # - elasticsearch-plugin-head
+    - { role: elasticsearch, elasticsearch_jvm_heap: "256m" }
     - elasticsearch-plugin-head
     - kibana
     - logstash