diff --git a/.gitmodules b/.gitmodules
index 3a13363..c3db1d7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,11 @@
 [submodule "dashboard-importer"]
 	path = dashboard-importer
 	url = https://github.com/GerritForge/analytics-dashboard-importer.git
+[submodule "elasticsearch"]
+	path = elasticsearch
+	url = https://github.com/GerritForge/analytics-elasticsearch.git
+	branch = master
+[submodule "kibana"]
+	path = kibana
+	url = https://github.com/GerritForge/analytics-kibana.git
+	branch = master
diff --git a/elasticsearch b/elasticsearch
new file mode 160000
index 0000000..2724a6c
--- /dev/null
+++ b/elasticsearch
@@ -0,0 +1 @@
+Subproject commit 2724a6ce99b05784834b9628209b3e9e02fad4f2
diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
deleted file mode 100644
index 42cf0d2..0000000
--- a/elasticsearch/Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:5.5.2
-RUN elasticsearch-plugin remove x-pack
diff --git a/kibana b/kibana
new file mode 160000
index 0000000..374db2f
--- /dev/null
+++ b/kibana
@@ -0,0 +1 @@
+Subproject commit 374db2f3456c8c5780094576f291bd488cd1134e
diff --git a/kibana/Dockerfile b/kibana/Dockerfile
deleted file mode 100644
index 3b6a416..0000000
--- a/kibana/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM docker.elastic.co/kibana/kibana:5.5.2
-RUN kibana-plugin remove x-pack
-RUN /usr/local/bin/kibana-docker 2>&1 | grep -m 1 "Optimization of .* complete"
diff --git a/kibana/organizations-visualizations.json b/kibana/organizations-visualizations.json
deleted file mode 100644
index c6a3752..0000000
--- a/kibana/organizations-visualizations.json
+++ /dev/null
@@ -1,30 +0,0 @@
-[
-  {
-    "_id": "6d3a02f0-8b37-11e7-b340-5faa4252a25c",
-    "_type": "visualization",
-    "_source": {
-      "title": "Organization Pie",
-      "visState": "{\"title\":\"Organization Pie\",\"type\":\"pie\",\"params\":{\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"isDonut\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"organization.keyword\",\"size\":500,\"order\":\"desc\",\"orderBy\":\"1\"}}],\"listeners\":{}}",
-      "uiStateJSON": "{}",
-      "description": "",
-      "version": 1,
-      "kibanaSavedObjectMeta": {
-        "searchSourceJSON": "{\"index\":\"gerrit\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"
-      }
-    }
-  },
-  {
-    "_id": "d0c09180-8b38-11e7-b340-5faa4252a25c",
-    "_type": "visualization",
-    "_source": {
-      "title": "Organization Table",
-      "visState": "{\"title\":\"Organization Table\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"sum\",\"schema\":\"metric\",\"params\":{\"field\":\"num_commits\",\"customLabel\":\"# Commits\"}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"bucket\",\"params\":{\"field\":\"organization.keyword\",\"size\":10,\"order\":\"desc\",\"orderBy\":\"1\"}},{\"id\":\"3\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"project.keyword\",\"customLabel\":\"# Projects\"}},{\"id\":\"4\",\"enabled\":true,\"type\":\"cardinality\",\"schema\":\"metric\",\"params\":{\"field\":\"email.keyword\",\"customLabel\":\"# Authors\"}}],\"listeners\":{}}",
-      "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-      "description": "",
-      "version": 1,
-      "kibanaSavedObjectMeta": {
-        "searchSourceJSON": "{\"index\":\"gerrit\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"
-      }
-    }
-  }
-]
\ No newline at end of file