diff --git a/api/base/settings/defaults.py b/api/base/settings/defaults.py
index d74e744f787f..bedb32cac172 100644
--- a/api/base/settings/defaults.py
+++ b/api/base/settings/defaults.py
@@ -317,7 +317,7 @@
 # django-elasticsearch-metrics
 ELASTICSEARCH_DSL = {
     'default': {
-        'hosts': os.environ.get('ELASTIC6_URI', '127.0.0.1:9201'),
+        'hosts': os.environ.get('ELASTIC6_URI', '192.168.168.167:9201'),
         'retry_on_timeout': True,
     },
 }
diff --git a/conftest.py b/conftest.py
index 1acfabbdbb57..56e5566f05ac 100644
--- a/conftest.py
+++ b/conftest.py
@@ -125,6 +125,7 @@ def _test_speedups_disable(request, settings, _test_speedups):
 @pytest.fixture(scope='session')
 def setup_connections():
     connections.create_connection(hosts=['http://localhost:9201'])
+    connections.create_connection(hosts=['http://192.168.168.167:9201'])
 
 
 @pytest.fixture(scope='function')
diff --git a/docker-compose.yml b/docker-compose.yml
index ce4e3ea06189..50004d4b93a9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -69,7 +69,7 @@ services:
 
   # Temporary: Remove when we've upgraded to ES6
   elasticsearch6:
-    image: docker.elastic.co/elasticsearch/elasticsearch:6.3.1
+    image: quay.io/matt_cos/es6-arm
     ports:
       - 9201:9200
     volumes: