diff --git a/README.md b/README.md
index 4b22612..5702867 100644
--- a/README.md
+++ b/README.md
@@ -300,6 +300,7 @@ A collection of delicious docker recipes.
 - [x] drone/drone
 - [x] drupal
 - [x] elastichq/elasticsearch-hq
+- [x] elasticdump/elasticsearch-dump
 - [x] elk
 - [x] quay.io/coreos/etcd
 - [x] audreyt/ethercalc
diff --git a/elasticdump/README.md b/elasticdump/README.md
new file mode 100644
index 0000000..7c6a523
--- /dev/null
+++ b/elasticdump/README.md
@@ -0,0 +1,8 @@
+elasticdump
+===========
+
+```bash
+$ alias elasticdump='docker run --rm --net host -v $PWD:/data -w /data elasticdump/elasticsearch-dump'
+$ query='{"query": {"query_string": {"query": "+hello:world +foo:bar"}}}'
+$ elasticdump --input=http://127.0.0.1:9200/index_name output=result.json --searchBody="$query"
+```
diff --git a/owntracks/ot-recorder/Dockerfile b/owntracks/ot-recorder/Dockerfile
index b648b01..0ec1744 100644
--- a/owntracks/ot-recorder/Dockerfile
+++ b/owntracks/ot-recorder/Dockerfile
@@ -14,7 +14,7 @@ RUN set -xe \
     && apt-get install -y ot-recorder \
     && rm -rf /var/lib/apt/lists/*
 
-ENV OTR_HOST       iot.eclipse.org
+ENV OTR_HOST       mqtt.eclipse.org
 ENV OTR_PORT       1883
 ENV OTR_HTTPHOST   0.0.0.0
 ENV OTR_HTTPPORT   8083
diff --git a/owntracks/ot-recorder/arm/Dockerfile b/owntracks/ot-recorder/arm/Dockerfile
index 69a3b6c..1a1d5c6 100644
--- a/owntracks/ot-recorder/arm/Dockerfile
+++ b/owntracks/ot-recorder/arm/Dockerfile
@@ -14,7 +14,7 @@ RUN set -xe \
     && apt-get install -y ot-recorder \
     && rm -rf /var/lib/apt/lists/*
 
-ENV OTR_HOST       iot.eclipse.org
+ENV OTR_HOST       mqtt.eclipse.org
 ENV OTR_PORT       1883
 ENV OTR_HTTPHOST   0.0.0.0
 ENV OTR_HTTPPORT   8083
diff --git a/owntracks/ot-recorder/arm/docker-compose.yml b/owntracks/ot-recorder/arm/docker-compose.yml
index 5f0f8ea..930e86e 100644
--- a/owntracks/ot-recorder/arm/docker-compose.yml
+++ b/owntracks/ot-recorder/arm/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 
 services:
 
@@ -9,12 +9,13 @@ services:
     volumes:
       - ./data:/var/spool/owntracks/recorder/store
     environment:
-      - OTR_HOST=iot.eclipse.org
+      - OTR_HOST=mqtt.eclipse.org
       - OTR_PORT=8883
       - OTR_USER=username
       - OTR_PASS=password
       - OTR_TOPICS=owntracks/#
-      # OTR_CAFILE=/etc/ssl/certs/DST_Root_CA_X3.pem
+      - OTR_CAPATH=/etc/ssl/certs/
+      # OTR_BROWSERAPIKEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
       # OTR_OPTIONS=--debug
     restart: unless-stopped
 
@@ -23,6 +24,7 @@ services:
     ports:
       - 8080:80
     environment:
+      - LISTEN_PORT=80
       - SERVER_HOST=recorder
       - SERVER_PORT=8083
     restart: unless-stopped
diff --git a/owntracks/ot-recorder/docker-compose.yml b/owntracks/ot-recorder/docker-compose.yml
index 698b2ad..5ac3dd6 100644
--- a/owntracks/ot-recorder/docker-compose.yml
+++ b/owntracks/ot-recorder/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 
 services:
 
@@ -9,12 +9,12 @@ services:
     volumes:
       - ./data:/var/spool/owntracks/recorder/store
     environment:
-      - OTR_HOST=iot.eclipse.org
-      - OTR_PORT=1883
+      - OTR_HOST=mqtt.eclipse.org
+      - OTR_PORT=8883
       - OTR_USER=username
       - OTR_PASS=password
       - OTR_TOPICS=owntracks/#
-      # OTR_CAFILE=/etc/ssl/certs/DST_Root_CA_X3.pem
+      - OTR_CAPATH=/etc/ssl/certs/
       # OTR_BROWSERAPIKEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
       # OTR_OPTIONS=--debug
     restart: unless-stopped
@@ -24,6 +24,7 @@ services:
     ports:
       - 8080:80
     environment:
+      - LISTEN_PORT=80
       - SERVER_HOST=recorder
       - SERVER_PORT=8083
     restart: unless-stopped