diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22acb022..da1e5aa6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ The **patch** part changes incrementally at each release.
 ### Changed
 
 * certbot: install certbot dependencies non-interactively for jessie
+* elasticsearch: set tmpdir before datadir
 * evoacme: upstream release 20.06.1
 * evoacme: read values from environment before defaults file
 * haproxy: deport SSL tuning to Mozilla SSL generator
diff --git a/elasticsearch/tasks/main.yml b/elasticsearch/tasks/main.yml
index 361b15dc..126170a1 100644
--- a/elasticsearch/tasks/main.yml
+++ b/elasticsearch/tasks/main.yml
@@ -6,10 +6,10 @@
 
 - include: bootstrap_checks.yml
 
-- include: datadir.yml
-
 - include: tmpdir.yml
 
+- include: datadir.yml
+
 - include: logs.yml
 
 - include: additional_scripts.yml