diff --git a/ansible/roles/postgres/tasks/main.yml b/ansible/roles/postgres/tasks/main.yml
index 445c02b79..38fad19d8 100644
--- a/ansible/roles/postgres/tasks/main.yml
+++ b/ansible/roles/postgres/tasks/main.yml
@@ -100,6 +100,15 @@
       sudo find /srv/newsblur/docker/volumes/postgres/archive -type f -mmin +180 -delete
   tags: cron
 
+- name: Add postgresql backup cleaner cronjob
+  cron:
+    name: postgres_backup_cleaner
+    minute: "0"
+    hour: "5"
+    job: >-
+      sudo find /srv/newsblur/docker/volumes/postgres/backups -type f -mmin +18000 -delete
+  tags: cron
+
 - name: Add postgres backup log
   become: yes
   file:
diff --git a/docker/haproxy/haproxy.consul.cfg.j2 b/docker/haproxy/haproxy.consul.cfg.j2
index e035b0716..c7d3148c6 100644
--- a/docker/haproxy/haproxy.consul.cfg.j2
+++ b/docker/haproxy/haproxy.consul.cfg.j2
@@ -237,7 +237,10 @@ backend db_redis_pubsub
 
 backend db_elasticsearch
     option httpchk GET /db_check/elasticsearch
-    server db-elasticsearch db-elasticsearch.node.nyc1.consul:5579 check inter 2000ms resolvers consul resolve-opts allow-dup-ip init-addr none
+    default-server check inter 2000ms resolvers consul resolve-prefer ipv4 resolve-opts allow-dup-ip init-addr none
+    {% for host in groups.elasticsearch %}
+        server {{host}} {{host}}.node.nyc1.consul:5579
+    {% endfor %}
 
 backend db_metrics
     balance roundrobin