diff --git a/elastic-stack/meta/main.yml b/elastic-stack/meta/main.yml
index 4e26d3b6..94d60626 100644
--- a/elastic-stack/meta/main.yml
+++ b/elastic-stack/meta/main.yml
@@ -23,8 +23,4 @@ galaxy_info:
     # NOTE: A tag is limited to a single word comprised of
     # alphanumeric characters. Maximum 20 tags per role.
 
-dependencies:
-  - evogalaxy.elasticsearch
-  - evogalaxy.elasticsearch-plugin-head
-  - evogalaxy.logstash
-  - evogalaxy.kibana
+dependencies: []
diff --git a/elastic-stack/tasks/main.yml b/elastic-stack/tasks/main.yml
index 198a024d..ad01cef0 100644
--- a/elastic-stack/tasks/main.yml
+++ b/elastic-stack/tasks/main.yml
@@ -1,25 +1,13 @@
 ---
 
-- name: APT https transport is enabled
-  apt:
-    name: apt-transport-https
-    state: present
-  tags:
-    - system
-    - packages
+- include_role:
+    name: elasticsearch
 
-- name: Elastic GPG key is installed
-  apt_key:
-    url: https://artifacts.elastic.co/GPG-KEY-elasticsearch
-    state: present
-  tags:
-    - system
-    - packages
+- include_role:
+    name: elasticsearch-plugin-head
 
-- name: Elastic sources list is available
-  apt_repository:
-    repo: "deb https://artifacts.elastic.co/packages/5.x/apt stable main"
-    state: present
-  tags:
-    - system
-    - packages
+- include_role:
+    name: logstash
+
+- include_role:
+    name: kibana